From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 01:24:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 09:24:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4027 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060301092433.8D0DB49EF36@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 02:24:29 2006 New Revision: 4027 Log: function mkdirs added Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Mar 1 02:24:29 2006 @@ -987,6 +987,9 @@ return $update_info; } +/** + * This function is used to get the Contact Images with the script for scrolling and the thumbnailview . + */ function getContactImages($parenttab) { @@ -1017,6 +1020,12 @@ return $imagelists; } +/** + * This function is used to get the Product Images for the given Product . + * It accepts the product id as argument and returns the Images with the script for + * rotating the product Images + */ + function getProductImages($id) { global $adb; @@ -1036,6 +1045,12 @@ if($imagename != '') return $script; } + +/** + * This function is used to save the Images . + * It acceps the File lists,modulename,id and the mode as arguments + * It returns the array details of the upload + */ function SaveImage($_FILES,$module,$id,$mode) { @@ -1188,6 +1203,11 @@ } } +/** + * This function is used get the User Count . + * It returns the array which has the total users ,admin users,and the non admin users + */ + function UserCount() { global $adb; @@ -1200,4 +1220,22 @@ return $count; } +/** + * This function is used to create folders recursively . + */ + +function mkdirs($dir, $mode = 0777, $recursive = true) +{ + if( is_null($dir) || $dir === "" ){ + return FALSE; + } + if( is_dir($dir) || $dir === "/" ){ + return TRUE; + } + if( mkdirs(dirname($dir), $mode, $recursive) ){ + return mkdir($dir, $mode); + } + return FALSE; +} + ?> From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 02:02:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:02:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.bd713d7f915d4701e829bb08205932d6@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: change this code: {{{ if($module == "Vendor") { $query = "select crmentity.crmid, vendor.* from vendor inner join crmentity on crmentity.crmid=vendor.vendorid where crmentity.deleted=0"; } if($module == "PriceBook") { $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; } if($module == "Quotes") { $query = "select crmentity.*, quotes.*, quotesbillads.*, quotesshipads.*,potential.potentialname,account.accountname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid where crmentity.deleted=0".$where; } if($module == "Orders") { $query = "select crmentity.*, purchaseorder.*, pobillads.*, poshipads.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid where crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "select crmentity.*, salesorder.*, sobillads.*, soshipads.*,quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid where crmentity.deleted=0".$where; } if($module == "Invoice") { $query = "select crmentity.*, invoice.*, invoicebillads.*, invoiceshipads.*,salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid where crmentity.deleted=0".$where; } }}} with this: {{{ if($module == "Vendor") { $query = "select crmentity.crmid, vendor.*, vendorcf.* from vendor inner join crmentity on crmentity.crmid=vendor.vendorid inner join vendorcf on vendor.vendorid = vendorcf.vendorid where crmentity.deleted=0"; } if($module == "PriceBook") { $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; } if($module == "Quotes") { $query = "select crmentity.*, quotes.*, quotesbillads.*, quotesshipads.*, quotescf.* , potential.potentialname,account.accountname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid inner join quotescf on quotes.quoteid = quotescf.quoteid where crmentity.deleted=0".$where; } if($module == "Orders") { $query = "select crmentity.*, purchaseorder.*, pobillads.*, poshipads.*, purchaseordercf.* ,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid inner join purchaseordercf on purchaseorder.purchaseorderid = purchaseordercf.purchaseorderid where crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "select crmentity.*, salesorder.*, sobillads.*, soshipads.*, salesordercf.* ,quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid inner join salesordercf on salesorder.salesorderid = salesordercf.salesorderid where crmentity.deleted=0".$where; } if($module == "Invoice") { $query = "select crmentity.*, invoice.*, invoicebillads.*, invoiceshipads.*, invoicecf.* ,salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid where crmentity.deleted=0".$where; } }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 02:07:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:07:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.74961106a67e13540de75c02223270af@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: replace this code: {{{ if($module == "Quotes") { $query = "from quotes inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid left join users as usersRel1 on usersRel1.id = quotes.inventorymanager left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityQuotes.deleted=0"; } if($module == "Orders") { $query = "from purchaseorder inner join crmentity as crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid left join users as usersOrders on usersOrders.id = crmentityOrders.smownerid left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid left join contactdetails as contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityOrders.deleted=0"; } if($module == "Invoice") { $query = "from invoice inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityInvoice.deleted=0"; } }}} with this code: {{{ if($module == "Quotes") { $query = "from quotes inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid inner join quotescf on quotes.quoteid = quotescf.quoteid left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid left join users as usersRel1 on usersRel1.id = quotes.inventorymanager left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityQuotes.deleted=0"; } if($module == "Orders") { $query = "from purchaseorder inner join crmentity as crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid inner join purchaseordercf on purchaseorder.purchaseorderid = purchaseordercf.purchaseorderid left join users as usersOrders on usersOrders.id = crmentityOrders.smownerid left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid left join contactdetails as contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityOrders.deleted=0"; } if($module == "Invoice") { $query = "from invoice inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityInvoice.deleted=0"; } }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 02:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.4b9d3313c1554672885231ebc6875cff@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 02:12:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:12:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.e94f9ce50b23b960970d295a3dcb951c@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 03:12:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 11:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4028 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060301111252.B8A1D499E57@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 04:12:47 2006 New Revision: 4028 Log: Changes made for 5 alpha 2 release Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Wed Mar 1 04:12:47 2006 @@ -41,7 +41,7 @@

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 1: Browse through Live Demo: http://www.vtiger.com/products/crm/demo_5alpha

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

Step 3: Post your suggestions & comments at @@ -110,7 +110,7 @@ vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. - URL: Click + URL: Click Here @@ -521,7 +521,7 @@ - - Activity Reminder Notication + Activity Reminder Notification email @@ -553,12 +553,6 @@

  • 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: Release Notes

    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 05:19:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 13:19:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4029 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060301131932.0876349EEE4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 06:19:28 2006 New Revision: 4029 Log: bug fixed in start_end_dates for dashboard Modified: vtigercrm/trunk/include/utils/utils.php Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Wed Mar 1 06:19:28 2006 @@ -1842,7 +1842,7 @@ } else if($period=="tmon") { - $st_date=date("Y-m-d",mktime(0,0,0,date("n"),date("1"),date("Y"))); + /*$st_date=date("Y-m-d",mktime(0,0,0,date("n"),date("1"),date("Y"))); $end_date=date("Y-m-d",mktime(0,0,0,date("n"),date("j")+1,date("Y"))); $period_type="month"; $width="840"; @@ -1851,7 +1851,10 @@ { $st_date=date("Y-m-d",mktime(0,0,0,date("n")-1,date("1"),date("Y"))); $end_date = date("Y-m-d",mktime(0, 0, 1, date("n"), 0,date("Y"))); - } + }*/ + $period_type="month"; + $width="840"; + $st_date = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); $end_date = date("Y-m-t"); } else if($period=="lmon") From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 05:23:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 13:23:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4030 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060301132340.ED64749EF72@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 06:23:37 2006 New Revision: 4030 Log: bug fixed in cachefile name issue Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Mar 1 06:23:37 2006 @@ -348,6 +348,14 @@ { //Checks whether the cached image is present or not + if(file_exists($cahce_file_name) + { + unlink($cache_file_name); + } + if(file_exists($cache_file_name.'.map') + { + unlink($cache_file_name.'.map'); + } if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map')) { //If the Cached image is not present From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 06:45:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 14:45:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2354=3A_T?= =?utf-8?q?ranslate_of_hard_code_by_Summing_columns_in_reports?= Message-ID: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> #54: Translate of hard code by Summing columns in reports -------------------------+-------------------------------------------------- Reporter: Kleo | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -------------------------+-------------------------------------------------- In modules/Reports/ReportRun.php replace the line: {{{ $coltotalhtml .= ""; }}} with this: {{{ $coltotalhtml .= "
    TotalsSUMAVGMINMAX
    "; }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 08:50:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:50:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2353=3A_D?= =?utf-8?q?atabase_schema_constraints?= In-Reply-To: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> References: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> Message-ID: <085.8f16505f91ffc7aabb8d24fbfe7d79eb@vtiger.fosslabs.com> #53: Database schema constraints ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: constraint database schema ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: => 4.2.5 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 08:50:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:50:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.2b1f9b908db41d14acb12d6c2a739144@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: -----------------------------------------------+---------------------------- Changes (by mfedyk): * milestone: => 4.2.4 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 08:56:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:56:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2355=3A_D?= =?utf-8?q?uplicate_Accounts_are_created_during_lead_conversion_when_leads?= =?utf-8?q?_have_same_company_name?= Message-ID: <076.b897bdb9c4e852783f0ea4a5577c5a42@vtiger.fosslabs.com> #55: Duplicate Accounts are created during lead conversion when leads have same company name -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- When converting LeadA and LeadB when both have the same company name there are multiple accounts created. The new contact should be added to the existing account. Please anyone find some reason why there should ever be two accounts with the same name. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 08:58:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:58:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2356=3A_D?= =?utf-8?q?uring_lead_conversion_notes_are_not_associated_with_the_convert?= =?utf-8?q?ed_contact?= Message-ID: <076.5d392144e66a3940d9fd691dc0304bdb@vtiger.fosslabs.com> #56: During lead conversion notes are not associated with the converted contact -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- It is associated with the account. It looks like one field is not being populated during conversion. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 11:47:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 19:47:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2357=3A_U?= =?utf-8?q?se_vtigercrm-5=2E0=2E0alpha2_notation_in_release_notes_and_web_?= =?utf-8?q?links?= Message-ID: <076.a29911f6825ebde1aa3b343ccbed6484@vtiger.fosslabs.com> #57: Use vtigercrm-5.0.0alpha2 notation in release notes and web links -----------------------+---------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: packaging | -----------------------+---------------------------------------------------- Noticing that the vtigercrm team is gearing up for the vtigercrm-5.0.0alpha2 release, I would like to remind the release managers to please use the naming conventions discussed in the forums some months ago, and currently followed by the vtigercrm/branches/4.2 maintainers. changeset:4028 is still using vtiger, crm, _CRM_ and others in inconsistent ways. predictable spelling of all package files are the price of entry for asking distributions to add vtigercrm to their package trees. Most of these packaging systems automate download with an expression, and can't spelling vagaries for the packaged files. predictable spelling of all references to the brand and branded files will help us with marketing, search ranking, etc. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 15:11:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 23:11:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4031 - /vtigercrm/branches/4.2/install/5createTables.php Message-ID: <20060301231134.8D8502BF097@vtiger.fosslabs.com> Author: fathi Date: Wed Mar 1 16:11:12 2006 New Revision: 4031 Log: (empty) Modified: vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Wed Mar 1 16:11:12 2006 @@ -12,6 +12,7 @@ * All Rights Reserved. * Contributor(s): ______________________________________. ********************************************************************************/ + /********************************************************************************* * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/5createTables.php,v 1.58 2005/04/19 16:57:08 ray Exp $ * Description: Executes a step in the installation process. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 23:34:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 07:34:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4032 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060302073454.906EE3F5F37@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 00:34:47 2006 New Revision: 4032 Log: mysql server version check added Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 23:42:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 07:42:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4033 - in /vtigercrm/trunk/Smarty/templates: UserDetailView.tpl UserEditView.tpl UserListView.tpl Message-ID: <20060302074254.206DF2DE745@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 00:42:47 2006 New Revision: 4033 Log: menu added for Users page Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 2 00:42:47 2006 @@ -235,22 +235,4 @@
    {$mod_strings['LBL_COLUMNS']}{$mod_strings['LBL_COLUMNS_SUM']}{$mod_strings['LBL_COLUMNS_AVERAGE']}{$mod_strings['LBL_COLUMNS_LOW_VALUE']}{$mod_strings['LBL_COLUMNS_LARGE_VALUE']}
    {$JAVASCRIPT} - - - - - - - - - - - - - - - - - - - + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Thu Mar 2 00:42:47 2006 @@ -248,21 +248,4 @@ {$JAVASCRIPT} - - - - - - - - - - - - - - - - - - + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Thu Mar 2 00:42:47 2006 @@ -66,3 +66,5 @@ + {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 06:13:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:13:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4034 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060302141311.7EF8F2BF0A9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:13:07 2006 New Revision: 4034 Log: demo data has been included for campaign module Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 06:17:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:17:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4035 - /vtigercrm/trunk/modules/Contacts/contactSeedData.php Message-ID: <20060302141721.38AA53D1903@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:17:16 2006 New Revision: 4035 Log: demo data for campaign module has been included Modified: vtigercrm/trunk/modules/Contacts/contactSeedData.php Modified: vtigercrm/trunk/modules/Contacts/contactSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 06:21:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:21:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4036 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060302142124.4237C43B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:21:19 2006 New Revision: 4036 Log: calenar month view has been integrated Added: vtigercrm/trunk/modules/Calendar/calendar_monthview.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 06:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4037 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060302142238.9586743B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:22:31 2006 New Revision: 4037 Log: weekview has been integrated Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 2 07:22:31 2006 @@ -43,7 +43,7 @@ Modified: vtigercrm/trunk/index.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 08:17:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 16:17:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4041 - in /vtigercrm/trunk/modules/Contacts: ./ imgs/ js/ Message-ID: <20060302161738.A68B62DE745@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 09:17:20 2006 New Revision: 4041 Log: ajax chat integrated Added: vtigercrm/trunk/modules/Contacts/chat.css vtigercrm/trunk/modules/Contacts/chat.php vtigercrm/trunk/modules/Contacts/imgs/ vtigercrm/trunk/modules/Contacts/imgs/box_BL.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_BR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_M.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_ML.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_MR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_T.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_TL.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_TR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_close.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_hide.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_send.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/bx_B.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/close.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/hide.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/icone_chat.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/icone_keyb.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/site_bg.gif (with props) vtigercrm/trunk/modules/Contacts/js/ vtigercrm/trunk/modules/Contacts/js/ajax.js vtigercrm/trunk/modules/Contacts/js/chat.js vtigercrm/trunk/modules/Contacts/js/css-window_p.js vtigercrm/trunk/modules/Contacts/js/dom-drag_p.js vtigercrm/trunk/modules/Contacts/vtchat.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 22:17:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 06:17:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4042 - in /vtigercrm/trunk: Smarty/templates/SettingsMenu.tpl include/js/menu.js themes/blue/style.css Message-ID: <20060303061800.3844936B75F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 23:17:51 2006 New Revision: 4042 Log: slide menu integrated for settings Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/include/js/menu.js vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Mar 2 23:17:51 2006 @@ -3,12 +3,12 @@
    -pref; $ts = mktime(12,0,0,substr($this->t,4,2),substr($this->t,6,2),substr($this->t,0,4)); - $xy=Date("w",$ts); + $xy=Date("w",$ts); /* Back to last Monday or Sunday before ts */ while ( Date("w",$ts) != $this->pref->weekstart ) { @@ -133,87 +134,98 @@ echo " {/if} - +
    "; + echo " +
    + Time filter : + +
    "; + echo "
    "; + echo ""; $day = 0; $col = 1; $dd = new DateTime(); - while ( $day < 8 ) { - if ($day!=7) { - $dd->setDateTimeTS($ts); - $d = $dd->getDate(); - $tref = Date("Ymd",$ts); - $dinfo = GetDaysInfo($ts); - /* Select appointments for this day */ - - $from = new DateTime(); - $to = new DateTime(); - $from->setDateTimeTS($ts - 12 * 3600); - $to->setDateTimeTS($ts - 12 * 3600); - #$to->addDays(7); - $this->pref->callist = array(); - appointment::readCal($this->pref,$from,$to); - - $next = NextDay($ts); - - if ( $col == 1 ) { - echo " \n"; - } - - echo " \n"; - if ( $col == 2 ) { - echo " \n"; - $col = 0; - } - - $day++; - $col++; - $ts = $next; - } else { - echo "\n"; - $day++; - $col++; - } - } + } + + + echo "

    "; + echo "+"; + echo"
    "; + } + } + echo ""; + } + if ( $col == 2 ) { echo " \n"; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 06:24:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:24:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4038 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060302142451.E768043B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:24:48 2006 New Revision: 4038 Log: calendar_monview.php has been included Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Thu Mar 2 07:24:48 2006 @@ -24,7 +24,7 @@ if ($mysel=="") { include "calendar_dayview.php"; } if ($mysel=="day") { include "calendar_dayview.php"; } if ($mysel=="week") { include "calendar_weekview.php"; } - if ($mysel=="month") { include "monthview.php"; } + if ($mysel=="month") { include "calendar_monthview.php"; } if ($mysel=="year") { include "yearview.php"; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 07:58:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 15:58:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4039 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060302155813.698153F5F44@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 08:58:08 2006 New Revision: 4039 Log: chat integrated Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 2 08:58:08 2006 @@ -6984,4 +6984,123 @@
    \n"; - - # DAY-TABLE STARTS - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - //echo " \n"; - echo "
    \n"; - echo $this->pref->menulink($callink ."calendar_day&t=". $tref,$mod_strings['LBL_DAY'. Date("w",$ts)],strftime($mod_strings['LBL_DATE_TITLE'],$ts)); - if ( isset($dinfo[Desc]) ) { - #echo " " . $this->pref->menulink($callink ."app_new&t=". $tref,$d,$mod_strings['LBL_NEW_APPNT_INFO'],$dinfo[popinfo]) ."\n"; - echo " " . $this->pref->menulink($callink ."calendar_day&t=". $tref,$d,strftime($mod_strings['LBL_DATE_TITLE'],$ts),$dinfo[popinfo]) ."\n"; - } else { - #echo " " . $this->pref->menulink($callink ."app_new&t=". $tref,$d,$mod_strings['LBL_NEW_APPNT_INFO']) ."\n"; - echo " " . $this->pref->menulink($callink ."calendar_day&t=". $tref,$d,strftime($mod_strings['LBL_DATE_TITLE'],$ts)) ."\n"; - } - echo "
    \n"; - echo " \n"; - if ( isset($dinfo[Desc]) ) { - //echo "". $dinfo[Desc] ."\n"; - echo "". $dinfo[Desc] ."\n"; - - } - - $hastable = false; - foreach ($this->pref->callist as $idx => $x) { - - /* the correct day */ - if ( ! $this->pref->callist[$idx]->inside($dd) ) { - continue; - } - /*if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { - continue; - }*/ - // Do not show finished tasks - if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { - - continue; - } - if ( !$hastable ) - { - - echo "\n"; - $hastable = true; - } - else - { - echo " \n"; - - } - // Show appointments or task or whatever - $color = ""; - $username=$this->pref->callist[$idx]->creator; - if ($username!="") + for ($row=1;$row<=1;$row++) + { + echo ""; + echo ""; + for ($column=0;$column<=6;$column++) + { + $next = NextDay($ts); + echo ""; + $ts = $next; + } + } + for ($row=1;$row<=24;$row++) + { + echo ""; + for ($column=0;$column<=7;$column++) + { + if ($column==0) + { + echo ""; - } - if ( $hastable ) - { - echo "
     "; + echo strftime($mod_strings['LBL_DATE_TITLE'],$ts); + echo "
    "; + echo $row,"pm"; + } + else + { + $dd->setDateTimeTS($ts); + $d = $dd->getDate(); + $tref = Date("Ymd",$ts); + $dinfo = GetDaysInfo($ts); + + $from = new DateTime(); + $to = new DateTime(); + $from->setDateTimeTS($ts - 12 * 3600); + $to->setDateTimeTS($ts - 12 * 3600); +#$to->addDays(7); + $this->pref->callist = array(); + appointment::readCal($this->pref,$from,$to); + + $next = NextDay($ts); + + echo ""; + + foreach ($this->pref->callist as $idx => $x) { + + //the correct day + if ( ! $this->pref->callist[$idx]->inside($dd) ) { + continue; + } + //if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { + //continue; + //} + // do not show finished tasks + if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx] +->state == 2) ) { + + continue; + } + if ( !$hastable ) + { + + echo "\n"; + $hastable = true; + } + else + { + echo " \n"; + + } + // show appointments or task or whatever + $color = ""; + $username=$this->pref->callist[$idx]->creator; + if ($username!="") { $query="SELECT cal_color FROM users where user_name = '$username'"; @@ -229,35 +241,17 @@ $this->pref->callist[$idx]->formatted(); echo "\n
    \n"; - } - else - { - echo "



    \n"; - } - - # DAY-TABLE ENDS - echo "
    \n"; - - echo "
     
    + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + + chat_from + + + chat_to + + + born + + + + +
    + + + + ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB + + msg + +
    + + + ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB + + msg + +
    + + ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + nick + + Type=InnoDB + session + + + ping + +
    + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 08:08:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 16:08:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4040 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl index.php Message-ID: <20060302160842.D265A43B491@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 09:08:37 2006 New Revision: 4040 Log: chat integrated Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/index.php Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Thu Mar 2 09:08:37 2006 @@ -56,7 +56,8 @@
    		Create {$MODULE}...Search in {$MODULE}...Search in {$MODULE}... Search in {$MODULE}... +
    - - - + Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Thu Mar 2 23:17:51 2006 @@ -1,175 +1,89 @@ // JavaScript Document //Layer Function +/* NEW SCRIPT FOR MENU SLIDE */ -if (document.all) var browser_ie=true -else if (document.layers) var browser_nn4=true -else if (document.layers || (!document.all && document.getElementById)) var browser_nn6=true +var menu_i; +var menu_max; +var closeLimit; +var openLimit = 0; -function getObj(n,d) { - var p,i,x; - if(!d)d=document; - if((p=n.indexOf("?"))>0&&parent.frames.length) {d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);} - if(!(x=d[n])&&d.all)x=d.all[n]; - for(i=0;!x&&isetText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.width=menu_i+"%"; + setTimeout(function() { fnexpanLay(obj,inner); },5); + menu_i=menu_i+1; } - else if (document.layers) {curtop += obj.y;} - return curtop; } -function openPopUp(winInst,currObj,baseURL,winName,width,height,features) { - var left=parseInt(findPosX(currObj)) - var top=parseInt(findPosY(currObj)) - - if (window.navigator.appName!="Opera") top+=parseInt(currObj.offsetHeight) - else top+=(parseInt(currObj.offsetHeight)*2)+10 - if (browser_ie) { - top+=window.screenTop-document.body.scrollTop - left-=document.body.scrollLeft - if (top+height+30>window.screen.height) - top=findPosY(currObj)+window.screenTop-height-30 - if (left+width>window.screen.width) - left=findPosX(currObj)+window.screenLeft-width - } else if (browser_nn4 || browser_nn6) { - top+=(scrY-pgeY) - left+=(scrX-pgeX) - if (top+height+30>window.screen.height) - top=findPosY(currObj)+(scrY-pgeY)-height-30 - if (left+width>window.screen.width) - left=findPosX(currObj)+(scrX-pgeX)-width +function fncloseLay(obj,inner) +{ + if (menu_max >= eval(openLimit)) + { + if (menu_maxsetText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.height=wipe_i+"px"; + setTimeout(function() { fnWipeLay(obj,inner); },5); + wipe_i = wipe_i + 5; + } +} + +function fnUnWipeLay(obj,inner) +{ + if (wipe_max >= eval(openLimit)) + { + if (wipe_max ScrollEffect.closelimit ){closet();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect.lengthcount+'px'; - ScrollEffect.lengthcount=ScrollEffect.lengthcount+10; - if(ScrollEffect.lengthcount < ScrollEffect.limit){setTimeout("just()",25);} - else{ getObj("user").style.display="block";return;} -} - -function closet(){ - ig=getObj("top"); - getObj("user").style.display="none"; - ScrollEffect.lengthcount=ScrollEffect.lengthcount-10; - ig.style.height=ScrollEffect.lengthcount+'px'; - if(ScrollEffect.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet()", 25);} -} - -function just1(){ - ig=getObj("top2"); - if(ScrollEffect1.lengthcount > ScrollEffect1.closelimit1 ){closet1();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect1.lengthcount+'px'; - ScrollEffect1.lengthcount=ScrollEffect1.lengthcount+10; - if(ScrollEffect1.lengthcount < ScrollEffect1.limit1){setTimeout("just1()",25);} - else{ getObj("studio").style.display="block";return;} -} - -function closet1(){ - ig=getObj("top2"); - getObj("studio").style.display="none"; - ScrollEffect1.lengthcount=ScrollEffect1.lengthcount-10; - ig.style.height=ScrollEffect1.lengthcount+'px'; - if(ScrollEffect1.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet1()", 25);} -} - -function just2(){ - ig=getObj("top3"); - if(ScrollEffect2.lengthcount > ScrollEffect2.closelimit2 ){closet2();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect2.lengthcount+'px'; - ScrollEffect2.lengthcount=ScrollEffect2.lengthcount+10; - if(ScrollEffect2.lengthcount < ScrollEffect2.limit2){setTimeout("just2()",25);} - else{ getObj("comm").style.display="block";return;} -} - -function closet2(){ - ig=getObj("top3"); - getObj("comm").style.display="none"; - ScrollEffect2.lengthcount=ScrollEffect2.lengthcount-10; - ig.style.height=ScrollEffect2.lengthcount+'px'; - if(ScrollEffect2.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet2()", 25);} -} - -function just3(){ - ig=getObj("top4"); - if(ScrollEffect3.lengthcount > ScrollEffect3.closelimit3 ){closet3();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect3.lengthcount+'px'; - ScrollEffect3.lengthcount=ScrollEffect3.lengthcount+10; - if(ScrollEffect3.lengthcount < ScrollEffect3.limit3){setTimeout("just3()",25);} - else{ getObj("config").style.display="block";return;} -} - -function closet3(){ - ig=getObj("top4"); - getObj("config").style.display="none"; - ScrollEffect3.lengthcount=ScrollEffect3.lengthcount-10; - ig.style.height=ScrollEffect3.lengthcount+'px'; - if(ScrollEffect3.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet3()", 25);} -} Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 2 23:17:51 2006 @@ -723,10 +723,10 @@ } -#user{position:relative;left:0px;top:0px;width:100%;display:none;} -#studio{position:relative;left:0px;top:0px;width:100%;display:none;} -#comm{position:relative;left:0px;top:0px;width:100%;display:none;} -#config{position:relative;left:0px;top:0px;width:100%;display:none;} +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +#studio{position:relative;left:0px;top:0px;width:100%;display:block;} +#comm{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;} @@ -842,6 +842,11 @@ border:0px; } +#slideMnu{ + background-color:#BBBBBB; + vertical-align:top; +} + #one{ position:relative; display:block; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 22:23:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 06:23:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4043 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060303062340.9B1A33F5EFB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 23:23:35 2006 New Revision: 4043 Log: height added to the menu divs Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Mar 2 23:23:35 2006 @@ -15,7 +15,7 @@
    + Expand/Close Menu
    -
    +
    {$MOD.LBL_USERS} {$MOD.LBL_ROLES} {$MOD.LBL_PROFILES} @@ -31,7 +31,7 @@
    -
    +
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS} {$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING} @@ -41,7 +41,7 @@
    -
    +
    {$MOD.EMAILTEMPLATES} {$MOD.WORDINTEGRATION} {$MOD.NOTIFICATIONSCHEDULERS} @@ -55,7 +55,7 @@
    -
    +
    {$MOD.LBL_ORGANIZATION_DETAILS} {$MOD.LBL_EMAIL_CONFIG} {$MOD.LBL_BACKUP_SERVER_CONFIGURATION} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 23:41:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 07:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4044 - /vtigercrm/trunk/test/user/admin.jpeg Message-ID: <20060303074125.514223EEB51@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 00:41:20 2006 New Revision: 4044 Log: demo image for user added Added: vtigercrm/trunk/test/user/admin.jpeg (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 23:47:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 07:47:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4045 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060303074750.91AAA3F5F21@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 00:47:46 2006 New Revision: 4045 Log: default image and tagcloud added for admin Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 01:09:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 09:09:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4046 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060303090900.B82DB4038E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 02:08:56 2006 New Revision: 4046 Log: demo data productimages has been added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 01:10:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 09:10:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4047 - in /vtigercrm/trunk/test/product: product1.jpeg product10.jpeg product2.jpeg product3.jpeg product4.jpeg product5.jpeg product6.jpeg product7.jpeg product8.jpeg product9.jpeg Message-ID: <20060303091026.C809B2A8265@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 02:10:10 2006 New Revision: 4047 Log: default product images has been added Added: vtigercrm/trunk/test/product/product1.jpeg (with props) vtigercrm/trunk/test/product/product10.jpeg (with props) vtigercrm/trunk/test/product/product2.jpeg (with props) vtigercrm/trunk/test/product/product3.jpeg (with props) vtigercrm/trunk/test/product/product4.jpeg (with props) vtigercrm/trunk/test/product/product5.jpeg (with props) vtigercrm/trunk/test/product/product6.jpeg (with props) vtigercrm/trunk/test/product/product7.jpeg (with props) vtigercrm/trunk/test/product/product8.jpeg (with props) vtigercrm/trunk/test/product/product9.jpeg (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 02:38:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 10:38:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4048 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060303103858.3407E43B463@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 03:38:53 2006 New Revision: 4048 Log: changes made to get link for activity desc and for alignment Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Fri Mar 3 03:38:53 2006 @@ -1409,7 +1409,9 @@ } echo " \n"; - echo " ". $duration ."\n"; + echo "module_name."s.gif\" alt=\"".$this->module_name."\" title=\"".$this->module_name."\" border=\"0\">"; + echo " "; + echo " ". $duration ."\n"; //added from Fredy's patch echo " ". $this->creator ."  \n"; @@ -1482,8 +1484,10 @@ //Added for description $descr = eregi_replace("\n","
    ",$this->descr); if ($descr != "" ) { - echo " module_name."s.gif\" border=\"0\"> ". urlReplace($descr) ." \n"; - //echo " ". $this->creator ." \n"; + //echo " module_name."s.gif\" border=\"0\">  + echo " "; + echo "".$this->getLink(urlReplace($descr))." \n"; + //echo " ". $this->creator ." \n"; } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 02:45:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 10:45:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4049 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060303104533.5E30D3F5F23@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 03:45:26 2006 New Revision: 4049 Log: changes made to get users name Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Fri Mar 3 03:45:26 2006 @@ -1,4 +1,6 @@ @@ -55,15 +59,15 @@ - - + +
    Event starts at
    Set time..
    Set date..
    Set time..
    Set date..
    - - + +
    Event ends on
    Set time..
    Set date..
    Set time..
    Set date..
    @@ -116,13 +120,12 @@ - + ".$userDetails[$i].""; + } + ?> From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 13:29:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 03 Mar 2006 21:29:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.3f7b136eff191b7fedc2feedd3a91970@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Any comments about this one...please? Or maybe I'm missing something here? -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 21:08:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 05:08:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.4b525f05fb443107a10befa629afad80@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by anonymous): WARNING: If you change the values that are set in the database, you have to change where the values are tested in the code or strange things will happen. OK, you have been warned. The fact is that as of 4.2.4rc2 the code isn't fully translation ready. There are plans to change that though, like using gettext instead of a big php array for translation identifier difinitions. The code will have to be changed so that database values are translated before shown to the user, and after a value has been selected by the user. You are invited to participate in helping to fix this problem or support the ones who are putting in the work. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 21:13:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 05:13:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.b6f996e3c1fdf018e90eb7a4c8cc645d@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by mfedyk): Didn't realize I wasn't logged in when posting that message. The previous comment was from me. :) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 22:51:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 04 Mar 2006 06:51:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4050 - in /vtigercrm/branches/4.2: dbmonitor.php test/dbmonitor.php Message-ID: <20060304065130.F20964011C7@vtiger.fosslabs.com> Author: mfedyk Date: Fri Mar 3 23:51:28 2006 New Revision: 4050 Log: break dbmonitor.php (it has to be in the base directory for it to work) until security checks are added Added: vtigercrm/branches/4.2/test/dbmonitor.php - copied unchanged from r3969, vtigercrm/branches/4.2/dbmonitor.php Removed: vtigercrm/branches/4.2/dbmonitor.php From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 22:59:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 06:59:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch_pre_vtigercrm-4=2E2=2E4_-?= =?utf-8?q?_make_a_dash_for_it?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.d936aba898a332b66cd0db1c7b10e74b@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch pre vtigercrm-4.2.4 - make a dash for it ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 23:00:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 07:00:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c19bfa0358628cb810eb2a631e87ba9@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Changes (by mfedyk): * summary: Add postgresql support to 4.2 branch pre vtigercrm-4.2.4 - make a dash for it => Add postgresql support to 4.2 branch Comment: A branch will be created for this once 4.2.4 is released to work on this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 03:37:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 11:37:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.add2be261fb7613f7afd72e9928c96aa@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Ok, thanks, but I'm already aware of this problem so IMHO this warning should go in the same place where you can change the pick values, so to warn all users _before_ they change any. Or don't let the user change those values at all, until the code is fully translation ready. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 11:14:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 19:14:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.2b0b7897a1bceb84d2fa804e077ab106@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Changes (by mfedyk): * priority: major => critical Comment: Sorry, I didn't realize that this was editable from the web interface. There are a few pick lists like "meeting" and "call" in Activities that shouldn't be edited. But this is editable from the web interface and tested in the code. That is bad. Thanks for reporting this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 14:26:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 22:26:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?= =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?= Message-ID: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com> #58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm -----------------------+---------------------------------------------------- Reporter: fathi | Owner: developer Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: | -----------------------+---------------------------------------------------- Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm because of licensing issue. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 14:28:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 22:28:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2359=3A_r?= =?utf-8?q?eplace_jpgraph_by_Image=5Fgraph?= Message-ID: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com> #59: replace jpgraph by Image_graph -----------------------+---------------------------------------------------- Reporter: fathi | Owner: developer Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: | -----------------------+---------------------------------------------------- Replace jpgraph using Image_php: http://pear.php.net/package/Image_Graph related to #58 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 4 19:48:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 05 Mar 2006 03:48:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4051 - in /vtigercrm/branches/4.2/modules: Emails/ Products/ Settings/ Users/ uploads/ Message-ID: <20060305034845.8692B498306@vtiger.fosslabs.com> Author: mfedyk Date: Sat Mar 4 20:48:41 2006 New Revision: 4051 Log: Remove hard coded upload limits Modified: vtigercrm/branches/4.2/modules/Emails/upload.php vtigercrm/branches/4.2/modules/Products/EditView.html vtigercrm/branches/4.2/modules/Products/EditView.php vtigercrm/branches/4.2/modules/Products/upload.php vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php vtigercrm/branches/4.2/modules/Users/upload.php vtigercrm/branches/4.2/modules/uploads/add.php vtigercrm/branches/4.2/modules/uploads/upload.php Modified: vtigercrm/branches/4.2/modules/Emails/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/upload.php (original) +++ vtigercrm/branches/4.2/modules/Emails/upload.php Sat Mar 4 20:48:41 2006 @@ -24,7 +24,7 @@

    - + Modified: vtigercrm/branches/4.2/modules/Products/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Products/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Products/EditView.html Sat Mar 4 20:48:41 2006 @@ -31,7 +31,7 @@ - + Modified: vtigercrm/branches/4.2/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/EditView.php (original) +++ vtigercrm/branches/4.2/modules/Products/EditView.php Sat Mar 4 20:48:41 2006 @@ -142,6 +142,7 @@ if(isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']); if(isset($_REQUEST['return_action'])) $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']); +if(isset($upload_maxsize)) $xtpl->assign("MAX_FILE_SIZE", $upload_maxsize); if(isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']); if(isset($_REQUEST['activity_mode'])) $xtpl->assign("ACTIVITYMODE", $_REQUEST['activity_mode']); $xtpl->assign("THEME", $theme); Modified: vtigercrm/branches/4.2/modules/Products/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/upload.php (original) +++ vtigercrm/branches/4.2/modules/Products/upload.php Sat Mar 4 20:48:41 2006 @@ -22,7 +22,7 @@

    - +
    Modified: vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html (original) +++ vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html Sat Mar 4 20:48:41 2006 @@ -49,7 +49,7 @@ - +
    {MOD.LBL_ORGANIZATION_LOGO}: [{ORGANIZATIONLOGONAME}]
    Modified: vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php (original) +++ vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php Sat Mar 4 20:48:41 2006 @@ -74,6 +74,8 @@ $xtpl->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); +if (isset($upload_maxsize)) + $xtpl->assign("MAX_FILE_SIZE",$upload_maxsize); if (isset($organization_logoname)) $xtpl->assign("ORGANIZATIONLOGONAME",$organization_logoname); Modified: vtigercrm/branches/4.2/modules/Users/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/upload.php (original) +++ vtigercrm/branches/4.2/modules/Users/upload.php Sat Mar 4 20:48:41 2006 @@ -22,7 +22,7 @@ ?>
    - + Modified: vtigercrm/branches/4.2/modules/uploads/add.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add.php Sat Mar 4 20:48:41 2006 @@ -37,7 +37,7 @@ - +
    Modified: vtigercrm/branches/4.2/modules/uploads/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/upload.php (original) +++ vtigercrm/branches/4.2/modules/uploads/upload.php Sat Mar 4 20:48:41 2006 @@ -11,7 +11,7 @@ -
    - + From vtiger-tickets at vtiger.fosslabs.com Sun Mar 5 03:53:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 05 Mar 2006 11:53:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2343=3A_m?= =?utf-8?q?ysql5_support_for_4=2E2?= In-Reply-To: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com> References: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com> Message-ID: <085.295a028f2d2f2790c96b101cf67e1a90@vtiger.fosslabs.com> #43: mysql5 support for 4.2 --------------------------+------------------------------------------------- Reporter: fathi | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: mysql --------------------------+------------------------------------------------- Comment (by fathi): From Michel JACQUEMES: Pursuing my efforts on database compatibility, find joined somme patches allowing support of MySQL 5.0. Something remarqable to notice is that most of the changes have the same origin than those for mssql or postgres support. It also lights up some defects in vtiger database schema, that could help to solve some issues in current versions. These patches are made to keep compatibility with previous versions of MySQL. They have been tested with MySQL 4.1.16 (limited test according to the time I have). * Requirements : * upgrade to last version of AXMLS package (1.0.2 include MySQL 5 support) in adodb directory * patch to adodb-datadict.inc.php to solve MySQL 5.0 bug with default value of TIMESTAMP fields. * CONFIG : * PHP 5.1.2 * MySQL 5.0.18 ABSTRACT * DatabaseSchema : * ON DELETE CASCADE -> ON DELETE NO ACTION (already documented) * change cvcolumnlist index (primary key not unique) * change selectcolumn index (primary key not unique) * change relcriteria index (primary key not unique) * change faqcomments add DEFTIMESTAMP to column createdtime (missing default value) * change ticketcomments add DEFTIMESTAMP to column createdtime (missing default value) * Utils : * getDBInsertDateValue change empty date ('--') -> '0000-00-00' * replace contact list query joins according to SQL standards * CRMEntity, LoginHistory, PopulateComboValues, PopulateReports: * replace default field value from "''" to "DEFAULT" * Security : * replace default field value from "''" to "NULL" in Tab INSERT query COMMENTS Database schema, primary key not unique CREATE of cvcolumnlist : {{{
    columnindexType=InnoDB
    }}} is changed to : {{{ cvidcolumnindex columnindexType=InnoDB
    }}} cvid is not unique, several columns for same customview TIMESTAMP default values There is probably a bug in MySQL 5.0. CREATE TABLE DATETIME NOT NULL is supposed to default to CURRENT_TIMESTAMP but it doesn't. DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP and DATETIME DEFAULT CURRENT_TIMESTAMP are not accepted That is the reason of the patch in adodb-datadict.inc.php, it generates : DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' which is accepted. Note : I have probably forgotten some clauses in XML schema. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Mar 5 19:20:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 06 Mar 2006 03:20:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2360=3A_A?= =?utf-8?q?dded_product_on_the_fly=2E_Use_mult=2E_products_to_make_on_prod?= =?utf-8?q?uct=2E?= Message-ID: <076.5aaf5e79322517a5f8d39924ef3aa6b4@vtiger.fosslabs.com> #60: Added product on the fly. Use mult. products to make on product. -----------------------+---------------------------------------------------- Reporter: Cybrac | Owner: developer Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: products | -----------------------+---------------------------------------------------- To be able to make product the same time you make a quote, invoice, etc.. Use inventory or non inventory product to make a new product for quote, invoice, etc.. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 01:16:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:16:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4052 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060306091606.50D8D4ACEF4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:16:02 2006 New Revision: 4052 Log: alert for mysql version check changed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 01:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4053 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060306091856.28C424ACEF4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:18:52 2006 New Revision: 4053 Log: mysql version check removed Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 01:25:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:25:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4054 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060306092516.162BF4AD23D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:25:12 2006 New Revision: 4054 Log: search icon removed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Mar 6 02:25:12 2006 @@ -56,7 +56,7 @@ Create {$MODULE}... {/if} Search in {$MODULE}... - Search in {$MODULE}... Search in {$MODULE}... + Search in {$MODULE}... From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 02:15:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 10:15:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4055 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060306101500.33FC62CA860@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 6 03:14:58 2006 New Revision: 4055 Log: add wrapper for adodb UpdateBlobFile Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Mon Mar 6 03:14:58 2006 @@ -251,6 +251,15 @@ $this->checkConnection(); $result = $this->database->UpdateBlob($tablename, $colname, $data, $id); $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result); + return $result; + } + + function updateBlobFile($tablename, $colname, $id, $filename) + { + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); + $this->checkConnection(); + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 02:20:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 10:20:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4056 - /vtigercrm/branches/4.2/modules/uploads/add2db.php Message-ID: <20060306102011.E5B804AD224@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 6 03:20:09 2006 New Revision: 4056 Log: clean up error checking during upload Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add2db.php Mon Mar 6 03:20:09 2006 @@ -85,22 +85,36 @@ if($errorCode == 4) { include('themes/'.$theme.'/header.php'); - $errormessage = "Kindly give a valid file for upload!
    " ; + $errormessage = "Please give a valid file for upload.
    " ; echo $errormessage; include "upload.php"; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
    "; + $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than $upload_maxsize bytes
    "; include('themes/'.$theme.'/header.php'); echo $errormessage; include "upload.php"; //echo $errorCode; } - else if($errorCode == 3 || $errorcode == '') + else if($errorCode == 1) + { + $errormessage = "Sorry, the uploaded file exceeds the upload_max_filesize directive in php.ini
    "; + include('themes/'.$theme.'/header.php'); + echo $errormessage; + include "upload.php"; + //echo $errorCode; + } + else if($errorCode == 3) { include('themes/'.$theme.'/header.php'); - echo "Problems in file upload. Please try again!
    "; + echo "The uploaded file was only partially received. Please try again.
    "; + include "upload.php"; + } + else if($errorcode == '') + { + include('themes/'.$theme.'/header.php'); + echo "Error while receiving file. Check post_max_size in php.ini
    "; include "upload.php"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 05:20:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 13:20:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4057 - in /vtigercrm/branches/4.2: config.template.php install/2setConfig.php Message-ID: <20060306132045.86D974AD3EF@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 06:20:40 2006 New Revision: 4057 Log: changes made to support multiple packaging Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Mon Mar 6 06:20:40 2006 @@ -1,180 +1,189 @@ -'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); - -// default_module default value = Home -$default_module = 'Home'; - -// default_action default value = index -$default_action = 'index'; - -// set default theme -// default_theme default value = blue -$default_theme = 'blue'; - -// show or hide time to compose each page -// calculate_response_time default value = true -$calculate_response_time = true; - -// default text that is placed initially in the login form for user name -// no default_user_name default value -$default_user_name = ''; - -// default text that is placed initially in the login form for password -// no default_password default value -$default_password = ''; - -// create user with default username and password -// create_default_user default value = false -$create_default_user = false; -// default_user_is_admin default value = false -$default_user_is_admin = false; - -// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown -// disable_persistent_connections default value = false -$disable_persistent_connections = false; - -// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) -// languages default value = en_us=>US English -$languages = Array('en_us'=>'US English',); - -// default charset -// default charset default value = ISO-8859-1 -$default_charset = 'ISO-8859-1'; - -// default language -// default_language default value = en_us -$default_language = 'en_us'; - -// add the language pack name to every translation string in the display. -// translation_string_prefix default value = false -$translation_string_prefix = false; - -?> +'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + + // default_module default value = Home + $default_module = 'Home'; + + // default_action default value = index + $default_action = 'index'; + + // set default theme + // default_theme default value = blue + $default_theme = 'blue'; + + // show or hide time to compose each page + // calculate_response_time default value = true + $calculate_response_time = true; + + // default text that is placed initially in the login form for user name + // no default_user_name default value + $default_user_name = ''; + + // default text that is placed initially in the login form for password + // no default_password default value + $default_password = ''; + + // create user with default username and password + // create_default_user default value = false + $create_default_user = false; + // default_user_is_admin default value = false + $default_user_is_admin = false; + + // if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown + // disable_persistent_connections default value = false + $disable_persistent_connections = false; + + // defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) + // languages default value = en_us=>US English + $languages = Array('en_us'=>'US English',); + + // default charset + // default charset default value = ISO-8859-1 + $default_charset = 'ISO-8859-1'; + + // default language + // default_language default value = en_us + $default_language = 'en_us'; + + // add the language pack name to every translation string in the display. + // translation_string_prefix default value = false + $translation_string_prefix = false; +?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Mon Mar 6 06:20:40 2006 @@ -35,7 +35,7 @@ $cache_dir = "cache/"; if (is_file("config.php") && is_file("config.inc.php")) { - require_once("config.php"); + require_once("config.template.php"); session_start(); if(isset($upload_maxsize)) @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm'; + $db_name = 'vtigercrm4_2_4'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']; From vtiger-tickets at vtiger.fosslabs.com Mon Mar 6 09:41:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 06 Mar 2006 17:41:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?= =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?= =?utf-8?q?associations?= In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> Message-ID: <085.a8b2b86a615709fd4830f368cf303089@vtiger.fosslabs.com> #48: Sales Orders Created from Quote are not saved and do not retain associations -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: order -----------------------------------------------+---------------------------- Changes (by onwealdandy ): * owner: onwealdandy => developer -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 00:03:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:03:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4058 - /vtigercrm/branches/4.2/modules/uploads/add2db.php Message-ID: <20060307080337.2E26E4AD42B@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:03:35 2006 New Revision: 4058 Log: reduce memory usage in lead attachment upload code Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add2db.php Tue Mar 7 01:03:35 2006 @@ -31,7 +31,6 @@ if(move_uploaded_file($_FILES["binFile"]["tmp_name"],$uploaddir.$_FILES["binFile"]["name"])) { - $binFile = $_FILES['binFile']['name']; $filename = basename($binFile); $filetype= $_FILES['binFile']['type']; $filesize = $_FILES['binFile']['size']; @@ -43,8 +42,13 @@ $description = addslashes($desc); $date_var = date('YmdHis'); - $data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize)); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); + $filenameBase64 = $filename.".base64"; + $rfh = fopen($uploaddir.$filename, "r"); + $wfh = fopen($uploaddir.$filenameBase64, "w"); + //FIXME: find a way to stream data to base64_encode() to reduce memory usage -mikefedyk + fwrite($wfh,base64_encode(fread($rfh, $filesize))); + deleteFile($uploaddir,$filename); $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')"; @@ -54,9 +58,10 @@ $sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$filesize."','".$adb->getEmptyBlob()."')"; $result = $adb->query($sql); + //FIXME: adodb reads entire file into memory instead of streaming to DB -mikefedyk if($result!=false) - $result = $adb->updateBlob('attachments','attachmentcontents',"attachmentsid='".$current_id."' and name='".$filename."'",$data); - + $result = $adb->updateBlobFile('attachments','attachmentcontents',"attachmentsid='".$current_id."' and name='".$filename."'",$uploaddir.$filenameBase64); + deleteFile($uploaddir,$filenameBase64); $crmid = $_REQUEST['return_id']; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 00:05:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:05:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4059 - /vtigercrm/branches/4.2/adodb/adodb.inc.php Message-ID: <20060307080545.2E6624AD4A1@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:05:43 2006 New Revision: 4059 Log: reduce adodb memory usage to enable larger BLOB uploads Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Tue Mar 7 01:05:43 2006 @@ -801,6 +801,8 @@ $element0 = reset($inputarr); # is_object check because oci8 descriptors can be passed in $array_2d = is_array($element0) && !is_object(reset($element0)); + //remove extra memory copy of input -mikefedyk + unset($element0); if (!is_array($sql) && !$this->_bindInputArray) { $sqlarr = explode('?',$sql); @@ -808,12 +810,14 @@ if (!$array_2d) $inputarr = array($inputarr); foreach($inputarr as $arr) { $sql = ''; $i = 0; - foreach($arr as $v) { + //Use each() instead of foreach to reduce memory usage -mikefedyk + while(list(, $v) = each($arr)) { $sql .= $sqlarr[$i]; // from Ron Baldwin // Only quote string types $typ = gettype($v); if ($typ == 'string') + //New memory copy of input created here -mikefedyk $sql .= $this->qstr($v); else if ($typ == 'double') $sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1 @@ -892,6 +896,7 @@ $rs->connection = &$this; // Pablo suggestion $rs->Init(); if (is_array($sql)) $rs->sql = $sql[0]; + //New memory copy of input created here -mikefedyk else $rs->sql = $sql; if ($rs->_numOfRows <= 0) { global $ADODB_COUNTRECS; From vtiger-tickets at vtiger.fosslabs.com Tue Mar 7 00:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 07 Mar 2006 08:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2361=3A_R?= =?utf-8?q?eference_data_instead_of_pass_copies_more_in_adodb?= Message-ID: <076.caa7cd5a234dcb529ee8d9efe8613c5c@vtiger.fosslabs.com> #61: Reference data instead of pass copies more in adodb -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- Even with the changes in r4058 & r4059 attachment uploads are limited to 2MB when the memory limit is 16MB. I have found that only 4MB memory is used until calling adodb so the memory usage problem is there. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 00:23:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:23:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4060 - in /vtigercrm/branches/4.2: config.template.php install/2setConfig.php Message-ID: <20060307082329.C3F3A4AD43D@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:23:27 2006 New Revision: 4060 Log: revert broken installer changes Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Tue Mar 7 01:23:27 2006 @@ -1,189 +1,180 @@ -'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); - - // default_module default value = Home - $default_module = 'Home'; - - // default_action default value = index - $default_action = 'index'; - - // set default theme - // default_theme default value = blue - $default_theme = 'blue'; - - // show or hide time to compose each page - // calculate_response_time default value = true - $calculate_response_time = true; - - // default text that is placed initially in the login form for user name - // no default_user_name default value - $default_user_name = ''; - - // default text that is placed initially in the login form for password - // no default_password default value - $default_password = ''; - - // create user with default username and password - // create_default_user default value = false - $create_default_user = false; - // default_user_is_admin default value = false - $default_user_is_admin = false; - - // if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown - // disable_persistent_connections default value = false - $disable_persistent_connections = false; - - // defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) - // languages default value = en_us=>US English - $languages = Array('en_us'=>'US English',); - - // default charset - // default charset default value = ISO-8859-1 - $default_charset = 'ISO-8859-1'; - - // default language - // default_language default value = en_us - $default_language = 'en_us'; - - // add the language pack name to every translation string in the display. - // translation_string_prefix default value = false - $translation_string_prefix = false; -?> +'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + +// default_module default value = Home +$default_module = 'Home'; + +// default_action default value = index +$default_action = 'index'; + +// set default theme +// default_theme default value = blue +$default_theme = 'blue'; + +// show or hide time to compose each page +// calculate_response_time default value = true +$calculate_response_time = true; + +// default text that is placed initially in the login form for user name +// no default_user_name default value +$default_user_name = ''; + +// default text that is placed initially in the login form for password +// no default_password default value +$default_password = ''; + +// create user with default username and password +// create_default_user default value = false +$create_default_user = false; +// default_user_is_admin default value = false +$default_user_is_admin = false; + +// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown +// disable_persistent_connections default value = false +$disable_persistent_connections = false; + +// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) +// languages default value = en_us=>US English +$languages = Array('en_us'=>'US English',); + +// default charset +// default charset default value = ISO-8859-1 +$default_charset = 'ISO-8859-1'; + +// default language +// default_language default value = en_us +$default_language = 'en_us'; + +// add the language pack name to every translation string in the display. +// translation_string_prefix default value = false +$translation_string_prefix = false; + +?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Tue Mar 7 01:23:27 2006 @@ -35,7 +35,7 @@ $cache_dir = "cache/"; if (is_file("config.php") && is_file("config.inc.php")) { - require_once("config.template.php"); + require_once("config.php"); session_start(); if(isset($upload_maxsize)) @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') + elseif (isset($dbconfig['db_name'])) $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm4_2_4'; + $db_name = 'vtigercrm'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $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']; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 00:26:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:26:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4061 - in /vtigercrm/branches/4.2: config.template.php install/config.template Message-ID: <20060307082631.4BF834AD483@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:26:29 2006 New Revision: 4061 Log: move & rename template file for config to reduce confusion. It is not a php file, but a text file that happens to be formatted like php code. The keywords are to be replaced *at install time* and those changes are to be in config.inc.php Added: vtigercrm/branches/4.2/install/config.template - copied unchanged from r4060, vtigercrm/branches/4.2/config.template.php Removed: vtigercrm/branches/4.2/config.template.php From vtiger-tickets at vtiger.fosslabs.com Tue Mar 7 02:58:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 07 Mar 2006 10:58:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.6d8b117b6cd9dca74eb4cafebebac98c@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Thank you mfedyk for taking this issue into consideration. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:42:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:42:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4062 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060307114228.998F24ACEE8@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:42:24 2006 New Revision: 4062 Log: changes made to display the events in weekview Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Tue Mar 7 04:42:24 2006 @@ -23,20 +23,25 @@ ?> + + + + + "; $ts = $next; } - } - for ($row=1;$row<=24;$row++) + echo ""; + } + for ($row=0;$row<24;$row++) { echo ""; for ($column=0;$column<=7;$column++) { + $next = NextDay($ts); if ($column==0) { echo ""; } else { @@ -191,10 +202,9 @@ $this->pref->callist = array(); appointment::readCal($this->pref,$from,$to); - $next = NextDay($ts); - - echo "\n"; } - // show appointments or task or whatever - $color = ""; - $username=$this->pref->callist[$idx]->creator; - if ($username!="") - { - $query="SELECT cal_color FROM users where user_name = '$username'"; - - $result=$adb->query($query); - if($adb->getRowCount($result)!=0) - { - $res = $adb->fetchByAssoc($result, -1, false); - $usercolor = $res['cal_color']; - $color="style=\"background: ".$usercolor.";\""; - } + $this->pref->callist[$idx]->formatted(); + } - echo "\n"; - + if ( $hastable ) { + echo "
    - + - + - +
     DayDay  WeekWeek  MonthMonth    
    @@ -161,20 +166,26 @@ { $next = NextDay($ts); echo ""; - echo strftime($mod_strings['LBL_DATE_TITLE'],$ts); + echo strftime("%d - %a",$ts); echo "
    "; - echo $row,"pm"; + if($row==0) echo "12am"; + if($row>0 && $row<12) echo $row."am"; + if($row == 12) echo $row."pm"; + if($row>12 && $row<24) echo ($row-12)."pm"; + echo ""; - + echo ""; + + $hastable = false; foreach ($this->pref->callist as $idx => $x) { //the correct day @@ -222,32 +232,18 @@ lank.gif\" width=\"100%\" height=\"1\">
    \n"; - $this->pref->callist[$idx]->formatted(); - echo "\n
    \n"; } - echo "

    "; echo "+"; echo"
    "; } + $ts=$next; } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:50:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:50:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4063 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060307115048.B9B994AD22F@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:50:44 2006 New Revision: 4063 Log: t value has been parsed in the link Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Tue Mar 7 04:50:44 2006 @@ -36,11 +36,11 @@ - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:55:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:55:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4064 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060307115516.5B46D4AD352@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:55:09 2006 New Revision: 4064 Log: t value has been parsed in the link Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Tue Mar 7 04:55:09 2006 @@ -21,11 +21,11 @@
     DayDay  WeekWeek  MonthMonth    
    - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 05:34:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 13:34:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4065 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060307133438.B5EFA4AD483@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 06:34:34 2006 New Revision: 4065 Log: changes made to display events in weekview of calendar Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Tue Mar 7 06:34:34 2006 @@ -113,7 +113,6 @@ $last_week = Date("Ymd",$ts - 7 * 86400); $next_week = Date("Ymd",$ts + 7 * 86400); - if ($mn_name == $m_name) { $mn_name =""; @@ -158,6 +157,7 @@ $day = 0; $col = 1; $dd = new DateTime(); + $tempts=$ts; for ($row=1;$row<=1;$row++) { echo ""; @@ -174,6 +174,7 @@ } for ($row=0;$row<24;$row++) { + $ts=$tempts; echo ""; for ($column=0;$column<=7;$column++) { @@ -242,8 +243,8 @@ echo "

    "; echo "+"; echo"
    "; + $ts=$next; } - $ts=$next; } echo ""; } @@ -257,6 +258,36 @@ $this->addHidden("t", $this->t); echo $this->getHidden(); echo "\n"; + echo ""; + echo " + + +
     DayDay  WeekWeek  MonthMonth    
    + + + + + + + +
    +
    + + + + + + + + + +
    + + + + + + "; } /** * naviagte From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 08:04:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:04:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4066 - in /vtigercrm/trunk: Smarty/templates/ include/js/ include/utils/ modules/Accounts/ modules/Activities/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Vendors/ themes/blue/ Message-ID: <20060307160429.03B2E4AD4A4@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:03:44 2006 New Revision: 4066 Log: freetagintegrated for all modules Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/include/js/dtlviewajax.js vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Accounts/AccountsAjax.php vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Contacts/ContactsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Leads/LeadsAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 7 09:03:44 2006 @@ -93,13 +93,12 @@ -
    +
    - - [ {$ID} ] {$NAME} - {$SINGLE_MOD} Information  
    - {$UPDATEINFO} + +
    -
    + [ {$ID} ] {$NAME} - {$SINGLE_MOD} Information   
    {$UPDATEINFO} {$APP.LBL_TAG_FIELDS}   
    @@ -437,6 +436,10 @@
    +

    + + +
    @@ -459,4 +462,17 @@ {/if} + + Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Mar 7 09:03:44 2006 @@ -80,7 +80,8 @@ function dtlViewAjaxResponse(response) { var item = response.responseText; - if(item.indexOf(":#:FAILURE")>-1) + alert(response.responseText) + if(item.indexOf(":#:FAILURE")>-1) { alert("Error while Editing"); } @@ -166,3 +167,21 @@ showHide(dtlView,editArea); //show,hide itsonview=false; } + + +function dtlViewAjaxTagResponse(response) +{ + var item = response.responseText; + getObj('tagfields').innerHTML = item; + hide("vtbusy_info"); +} + +function SaveTag(txtBox,crmId,module) +{ + var tagValue = document.getElementById(txtBox).value; + var data = "module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue; + + var ajaxObj = new Ajax(dtlViewAjaxTagResponse); + ajaxObj.process("index.php?",data); + show("vtbusy_info"); +} Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 09:03:44 2006 @@ -285,6 +285,10 @@ } break; endswitch; + global $current_user; + require_once('include/freetag/freetag.class.php'); + $freetag=new freetag(); + $freetag->delete_all_object_tags_for_user($current_user->id,$record); if($return_module == $module) { $focus->mark_deleted($record); Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Tue Mar 7 09:03:44 2006 @@ -46,4 +46,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Faq/FaqAjax.php ============================================================================== --- vtigercrm/trunk/modules/Faq/FaqAjax.php (original) +++ vtigercrm/trunk/modules/Faq/FaqAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Invoice/InvoiceAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/InvoiceAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Tue Mar 7 09:03:44 2006 @@ -46,4 +46,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Quotes/QuotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/QuotesAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/QuotesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Vendors/VendorsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/VendorsAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/VendorsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue Mar 7 09:03:44 2006 @@ -980,3 +980,14 @@ color:#000000; } +a.tagLink{ + color:#333333; + text-decoration:none; + font-family:arial, Helvetica, sans-serif; +} + +a.tagLink:Hover{ + color:#000000; + text-decoration:underline; +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 08:08:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:08:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4067 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060307160800.7D4124ADC51@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:07:56 2006 New Revision: 4067 Log: show hide tab changed on mouseover Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue Mar 7 09:07:56 2006 @@ -48,9 +48,9 @@ - - - + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 08:51:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:51:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4068 - in /vtigercrm/trunk/include/freetag: ./ freetag.class.php license.txt Message-ID: <20060307165118.EEC544AD42B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:51:12 2006 New Revision: 4068 Log: added free tag Added: vtigercrm/trunk/include/freetag/ vtigercrm/trunk/include/freetag/freetag.class.php vtigercrm/trunk/include/freetag/license.txt From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 09:30:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 17:30:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4069 - in /vtigercrm/trunk: include/utils/DeleteUtils.php modules/Rss/Rss.php Message-ID: <20060307173012.58FC14AD449@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 10:30:04 2006 New Revision: 4069 Log: CRUD operation integrated for rss Modified: vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 10:30:04 2006 @@ -284,12 +284,17 @@ } break; + case Rss: + $del_query = "delete from rss where rssid=".$record; + $adb->query($del_query); + break; endswitch; global $current_user; require_once('include/freetag/freetag.class.php'); $freetag=new freetag(); $freetag->delete_all_object_tags_for_user($current_user->id,$record); - if($return_module == $module) + + if($return_module == $module && $return_module !='Rss') { $focus->mark_deleted($record); } Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Tue Mar 7 10:30:04 2006 @@ -155,7 +155,7 @@ $shtml .= " "; $shtml .= "".substr($allrssrow['rsstitle'],0,15)."..."; +\" class=\"rssTitle\">".substr($allrssrow['rsstitle'],0,15)."..."; $shtml .= ""; } return $shtml; @@ -184,7 +184,7 @@ } $shtml .= "".$allrssrow[rsstitle].""; - $shtml .= ""; + $shtml .= ""; } return $shtml; @@ -210,7 +210,7 @@ $shtml .= " "; } - $shtml .= "".$allrssrow[rsstitle].""; + $shtml .= "".$allrssrow[rsstitle].""; $shtml .= ""; } @@ -428,8 +428,7 @@ $shtml .= ""; $shtml .= " "; - $shtml .= "".$allrssrow[rsstitle].""; + $shtml .= "".$allrssrow[rsstitle].""; $shtml .= ""; } return $shtml; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 10:24:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 18:24:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4070 - in /vtigercrm/trunk: Smarty/templates/Portal.tpl include/utils/DeleteUtils.php modules/Portal/Delete.php modules/Portal/ListView.php modules/Rss/Delete.php Message-ID: <20060307182424.3A6274AD23A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 11:24:14 2006 New Revision: 4070 Log: CRUD Operation added for Portal module Added: vtigercrm/trunk/modules/Portal/Delete.php (with props) vtigercrm/trunk/modules/Rss/Delete.php (with props) Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Portal/ListView.php Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Portal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Portal.tpl Tue Mar 7 11:24:14 2006 @@ -21,9 +21,9 @@ Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 11:24:14 2006 @@ -288,13 +288,17 @@ $del_query = "delete from rss where rssid=".$record; $adb->query($del_query); break; + case Portal: + $del_query = "delete from portal where portalid=".$record; + $adb->query($del_query); + break; endswitch; global $current_user; require_once('include/freetag/freetag.class.php'); $freetag=new freetag(); $freetag->delete_all_object_tags_for_user($current_user->id,$record); - if($return_module == $module && $return_module !='Rss') + if($return_module == $module && $return_module !='Rss' && $return_module !='Portal') { $focus->mark_deleted($record); } Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Mar 7 11:24:14 2006 @@ -28,6 +28,7 @@ { $portalname = $adb->query_result($result,$i,'portalname'); $portalurl = $adb->query_result($result,$i,'portalurl'); + $portal_array['portalid'] = $adb->query_result($result,$i,'portalid'); $portal_array['portalname'] = $portalname; $portal_array['portalurl'] = $portalurl; $portal_info[]=$portal_array; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 22:19:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 06:19:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4071 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060308061955.1C4274AD1F6@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 23:19:46 2006 New Revision: 4071 Log: parse error has been fixed Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Mar 7 23:19:46 2006 @@ -348,11 +348,11 @@ { //Checks whether the cached image is present or not - if(file_exists($cahce_file_name) + if(file_exists($cahce_file_name)) { unlink($cache_file_name); } - if(file_exists($cache_file_name.'.map') + if(file_exists($cache_file_name.'.map')) { unlink($cache_file_name.'.map'); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 02:26:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 10:26:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4072 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060308102652.8DBA94AD49A@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 03:26:47 2006 New Revision: 4072 Log: Added the onMouseOver functionality for Create New User & Edit User Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Mar 8 03:26:47 2006 @@ -46,9 +46,9 @@ - - - + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 04:04:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 12:04:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4073 - in /vtigercrm/branches/4.2: config.template.php install/config.template Message-ID: <20060308120436.958A94ADFD9@vtiger.fosslabs.com> Author: fathi Date: Wed Mar 8 05:04:31 2006 New Revision: 4073 Log: please let it like that. There isn't confusion just need to learn how to use it Added: vtigercrm/branches/4.2/config.template.php - copied unchanged from r4072, vtigercrm/branches/4.2/install/config.template Removed: vtigercrm/branches/4.2/install/config.template From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 04:11:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 12:11:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4074 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060308121106.69D7B49E342@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 05:11:02 2006 New Revision: 4074 Log: freetag integrated Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Wed Mar 8 05:11:02 2006 @@ -7001,7 +7001,7 @@ - + @@ -7103,4 +7103,59 @@ + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + + tagg_id + + + tagger_id + + + object_id + + + + + +
    + From vtiger-tickets at vtiger.fosslabs.com Wed Mar 8 04:29:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 08 Mar 2006 12:29:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.ebc2be1f9b519070aef6185428b49574@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by pieter.vanmeerbeek at able.be): Hi, My company is searching for an open-source CRM packet. I'm very interested in the postgress integration in vTiger as we already use a postgres back- end for all other internal applications. Can anyone tell me what the state of the postgres integration currently is? From the release notes I noticed that postgress is supported in the 4.2 versions, however only 4.2.3 is downloadable and not the 4.2.4 or 4.2.5 of which you speak in this thread. I suppose it is not advised to use the 4.2.3 branch and postgres? And if not when will 4.2.4 or 4.2.5 be available? kind regards, Pieter Able -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 05:26:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 13:26:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4075 - in /vtigercrm/trunk/modules/Webmails: ./ images/ js/ language/ src/ src/modules/ src/modules/User/ templates/ tmp/ tmp/1/ Message-ID: <20060308132629.3D8183F33CD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 06:25:14 2006 New Revision: 4075 Log: * intial version webmails Added: vtigercrm/trunk/modules/Webmails/ vtigercrm/trunk/modules/Webmails/CallRelatedList.php vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/EditView.php vtigercrm/trunk/modules/Webmails/EditView.php.orig vtigercrm/trunk/modules/Webmails/Forms.php vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/ListView.php.orig vtigercrm/trunk/modules/Webmails/MailParse.php vtigercrm/trunk/modules/Webmails/PopupRelationChooser.php vtigercrm/trunk/modules/Webmails/Save.php vtigercrm/trunk/modules/Webmails/TODO vtigercrm/trunk/modules/Webmails/Webmail.php vtigercrm/trunk/modules/Webmails/Webmails.js vtigercrm/trunk/modules/Webmails/body.php vtigercrm/trunk/modules/Webmails/class.phpmailer.php vtigercrm/trunk/modules/Webmails/class.smtp.php vtigercrm/trunk/modules/Webmails/dlAttachments.php vtigercrm/trunk/modules/Webmails/images/ vtigercrm/trunk/modules/Webmails/images/delitem.png (with props) vtigercrm/trunk/modules/Webmails/images/down_pointer.png (with props) vtigercrm/trunk/modules/Webmails/images/draft.png (with props) vtigercrm/trunk/modules/Webmails/images/flag.png (with props) vtigercrm/trunk/modules/Webmails/images/folder.png (with props) vtigercrm/trunk/modules/Webmails/images/gnome-fs-trash-empty.png (with props) vtigercrm/trunk/modules/Webmails/images/gnome-fs-trash-full.png (with props) vtigercrm/trunk/modules/Webmails/images/inbox.png (with props) vtigercrm/trunk/modules/Webmails/images/index.php vtigercrm/trunk/modules/Webmails/images/mail_reply.png (with props) vtigercrm/trunk/modules/Webmails/images/minus.png (with props) vtigercrm/trunk/modules/Webmails/images/plus.gif (with props) vtigercrm/trunk/modules/Webmails/images/plus.png (with props) vtigercrm/trunk/modules/Webmails/images/sec_remove_eng.png (with props) vtigercrm/trunk/modules/Webmails/images/senti.png (with props) vtigercrm/trunk/modules/Webmails/images/sm_logo.png (with props) vtigercrm/trunk/modules/Webmails/images/sort_none.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_attach.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_macro-jump-back.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-flag-for-followup-done.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-flag-for-followup.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-forward.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-hide-read.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-open.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-priority-high.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-read.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-replied.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-reply.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-unread.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_trash_full.png (with props) vtigercrm/trunk/modules/Webmails/images/trashcan_empty.png (with props) vtigercrm/trunk/modules/Webmails/images/up_pointer.png (with props) vtigercrm/trunk/modules/Webmails/index.php vtigercrm/trunk/modules/Webmails/index.php.orig.php vtigercrm/trunk/modules/Webmails/js/ vtigercrm/trunk/modules/Webmails/js/ajax_connection.js vtigercrm/trunk/modules/Webmails/js/script.js vtigercrm/trunk/modules/Webmails/language/ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php vtigercrm/trunk/modules/Webmails/sendmail.php vtigercrm/trunk/modules/Webmails/showOverviewUI.php vtigercrm/trunk/modules/Webmails/src/ vtigercrm/trunk/modules/Webmails/src/EmailTemplateSubjectField.zip (with props) vtigercrm/trunk/modules/Webmails/src/modules/ vtigercrm/trunk/modules/Webmails/src/modules/User/ vtigercrm/trunk/modules/Webmails/src/modules/User/TemplateMerge.php vtigercrm/trunk/modules/Webmails/src/modules/User/populatetemplate.php vtigercrm/trunk/modules/Webmails/templates/ vtigercrm/trunk/modules/Webmails/templates/Accept Order vtigercrm/trunk/modules/Webmails/templates/Acceptance Proposal vtigercrm/trunk/modules/Webmails/templates/Address Change vtigercrm/trunk/modules/Webmails/templates/Announcement for Release vtigercrm/trunk/modules/Webmails/templates/Default FOSS Template vtigercrm/trunk/modules/Webmails/templates/Distributor Annoucement (Contacts) vtigercrm/trunk/modules/Webmails/templates/FOSS Quote vtigercrm/trunk/modules/Webmails/templates/Follow Up vtigercrm/trunk/modules/Webmails/templates/Good received acknowledgement vtigercrm/trunk/modules/Webmails/templates/Invoice Due vtigercrm/trunk/modules/Webmails/templates/Marketing Campaign vtigercrm/trunk/modules/Webmails/templates/Pending Invoices vtigercrm/trunk/modules/Webmails/templates/Test Announcement vtigercrm/trunk/modules/Webmails/templates/Thanks Note vtigercrm/trunk/modules/Webmails/templates/testemailtemplateusage.php vtigercrm/trunk/modules/Webmails/templates/todel.txt vtigercrm/trunk/modules/Webmails/testview.php vtigercrm/trunk/modules/Webmails/tmp/ vtigercrm/trunk/modules/Webmails/tmp/1/ vtigercrm/trunk/modules/Webmails/tmp/1/callme.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 06:18:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 14:18:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4076 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060308141834.247124ACEDF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 07:18:27 2006 New Revision: 4076 Log: changes made to avoid duplicate display of events in dayview Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Wed Mar 8 07:18:27 2006 @@ -117,7 +117,7 @@ } } } - echo " + echo "
    @@ -281,9 +281,8 @@ } } } - $maxcol = 1; for ($i = -1 ; $i < 24 ; $i++ ) { - $maxcol = max($maxcol,count($table[$i])); + $maxcol[$i] = max($maxcol[$i],count($table[$i])); } //New UI-integrated by minnie echo "
    "; @@ -311,13 +310,13 @@ for ($i = 0; $i <24 ; $i++ ) { if($i == 0) - $this->getHourList('12am',$maxcol,$table,12); + $this->getHourList('12am',$maxcol[$i],$table,$i); if($i>0 && $i<12) - $this->getHourList($i.'am',$maxcol,$table,$i); + $this->getHourList($i.'am',$maxcol[$i],$table,$i); if($i == 12) - $this->getHourList('12pm',$maxcol,$table,12); + $this->getHourList('12pm',$maxcol[$i],$table,$i); if($i>12 && $i<24) - $this->getHourList(($i - 12).'pm',$maxcol,$table,$i); + $this->getHourList(($i - 12).'pm',$maxcol[$i],$table,$i); } echo ""; echo "
    \n"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 06:53:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 14:53:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4077 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060308145355.48E244AD2E6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 07:53:50 2006 New Revision: 4077 Log: changes made to get events in week view Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Wed Mar 8 07:53:50 2006 @@ -165,6 +165,94 @@ for ($column=0;$column<=6;$column++) { $next = NextDay($ts); + $dd->setDateTimeTS($next); + $d = $dd->getDate(); + $tref = Date("Ymd",$next); + $dinfo = GetDaysInfo($next); + + $from = new DateTime(); + $to = new DateTime(); + $from->setDateTimeTS($next - 12 * 3600); + $to->setDateTimeTS($next - 12 * 3600); + $this->pref->callist = array(); + appointment::readCal($this->pref,$from,$to); + //start + + for ($i = -1 ; $i < 24 ; $i++ ) { + $table[$column][$i] = array(); + } + foreach ($this->pref->callist as $idx => $xx) { + if ( ! $this->pref->callist[$idx]->inside($from)) { + continue; + } + if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "note" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "watchlist" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "task" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "reminder" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->t_ignore == 1) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( ($this->pref->callist[$idx]->s_out == 1) && ($this->pref->callist[$idx]->e_out == 1) ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + $x1 = Date("G",$this->pref->callist[$idx]->start->getTimeStamp()); + $x2 = Date("G",$this->pref->callist[$idx]->end->getTimeStamp()); + + if ( $this->pref->callist[$idx]->s_out == 1 ) { + $x1 = 0; + } + if ( $this->pref->callist[$idx]->e_out == 1 ) { + $x2 = 23; + } +# find a free position + $pos = -1; + $found = false; + while ( $found == false ) { + $found = true; + $pos ++; + for ( $i = $x1; $i <= $x2 ; $i++ ) { + if (isset($table[$column][$i][$pos]) ) { + $found = false; + continue; + } + } + } + for ( $i = $x1; $i <= $x2 ; $i++ ) { + if ( $i == $x1 ) { + $table[$column][$i][$pos] = &$this->pref->callist[$idx]; + $rowspan[$column][$i][$pos] = ($x2 - $x1 +1); + } else { + $table[$column][$i][$pos] = -1; + } + } + } + for ($i = -1 ; $i < 24 ; $i++ ) { + $maxcol[$i] = max($maxcol[$i],count($table[$column][$i])); + } + //end echo ""; echo strftime("%d - %a",$ts); echo ""; @@ -176,10 +264,8 @@ { $ts=$tempts; echo ""; - for ($column=0;$column<=7;$column++) - { - $next = NextDay($ts); - if ($column==0) + $next = NextDay($ts); + for ($column=1;$column<=1;$column++) { echo ""; if($row==0) echo "12am"; @@ -188,63 +274,38 @@ if($row>12 && $row<24) echo ($row-12)."pm"; echo ""; } - else + for ($column=0;$column<=6;$column++) { - $dd->setDateTimeTS($ts); - $d = $dd->getDate(); - $tref = Date("Ymd",$ts); - $dinfo = GetDaysInfo($ts); - - $from = new DateTime(); - $to = new DateTime(); - $from->setDateTimeTS($ts - 12 * 3600); - $to->setDateTimeTS($ts - 12 * 3600); -#$to->addDays(7); - $this->pref->callist = array(); - appointment::readCal($this->pref,$from,$to); - echo ""; - $hastable = false; - foreach ($this->pref->callist as $idx => $x) { - - //the correct day - if ( ! $this->pref->callist[$idx]->inside($dd) ) { - continue; - } - //if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { - //continue; - //} - // do not show finished tasks - if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx] -->state == 2) ) { - - continue; - } - if ( !$hastable ) - { - - echo "\n"; - $hastable = true; - } - else - { - echo " \n"; - - } - $this->pref->callist[$idx]->formatted(); - - } - if ( $hastable ) { - echo "
    \n"; - } - - echo "

    "; + for ($c = 0 ; $c < $maxcol[$row] ; $c++ ) { + if ( isset ( $table[$column][$row][$c] ) ) { + if ( is_object ( $table[$column][$row][$c] ) ) { + $color = ""; + $username=$table[$column][$row][$c]->creator; + if ($username!=""){ + $query="SELECT cal_color FROM users where user_name = '$username'"; + + $result=$adb->query($query); + if($adb->getRowCount($result)!=0){ + $res = $adb->fetchByAssoc($result, -1, false); + $usercolor = $res['cal_color']; + $color="style=\"background: ".$usercolor.";\""; + } + } + echo "\n"; + echo $table[$column][$row][$c]->formatted(); + echo "
    ";//\n"; + } else if ( $table[$column][$row][$c] = -1 ) { + # SKIP occupied by rowspan + } + } + } + + echo "

    "; echo "+"; echo"
    "; $ts=$next; - } } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:34:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:34:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4078 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060308153456.A7DCB4AE109@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:34:51 2006 New Revision: 4078 Log: Added new field 'defhomeview varchar(100)' in the users table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Wed Mar 8 08:34:51 2006 @@ -74,6 +74,7 @@ + Type=InnoDB user_name From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:37:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:37:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4079 - in /vtigercrm/branches/4.2: index.php install/4createConfigFile.php Message-ID: <20060308153738.B44094AE228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:37:33 2006 New Revision: 4079 Log: changes made to point to install.php after installation Modified: vtigercrm/branches/4.2/index.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/index.php ============================================================================== --- vtigercrm/branches/4.2/index.php (original) +++ vtigercrm/branches/4.2/index.php Wed Mar 8 08:37:33 2006 @@ -356,7 +356,7 @@ } require_once('config.inc.php'); -if (!isset($dbconfig['db_hostname'])) { +if (!isset($dbconfig['db_hostname']) || $dbconfig['db_status']=='_DB_STAT_') { header("Location: install.php"); exit(); } Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Wed Mar 8 08:37:33 2006 @@ -158,6 +158,7 @@ $buffer = str_replace( "_MAIL_SERVER_", $mail_server, $buffer); $buffer = str_replace( "_MAIL_USERNAME_", $mail_server_username, $buffer); $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); + $buffer = str_replace( "_DB_STAT_", "true", $buffer); fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:40:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:40:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4080 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060308154051.498413ED55C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:40:47 2006 New Revision: 4080 Log: Added new function DefHomeView in commonutils Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Mar 8 08:40:47 2006 @@ -1236,6 +1236,12 @@ return mkdir($dir, $mode); } return FALSE; -} - + +} +function DefHomeView() +{ + global $adb; + global $current_user; + $query="select defhomeview from users where id = ".$current_user->id; + $result=$adb->query($query); $defaultview=$adb->query_result($result,0,'defhomeview'); return $defaultview; } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:42:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:42:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4081 - /vtigercrm/branches/4.2/config.template.php Message-ID: <20060308154222.8819F3ED55C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:42:19 2006 New Revision: 4081 Log: parameter added to check database population Modified: vtigercrm/branches/4.2/config.template.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Wed Mar 8 08:42:19 2006 @@ -47,6 +47,7 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; +$dbconfig['db_status'] = '_DBC_STAT_'; // TODO: test if port is empty // TODO: set db_hostname dependending on db_type From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:46:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:46:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4082 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060308154635.DB8C04AD228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:46:32 2006 New Revision: 4082 Log: Added Campaigns, Faq, Portal module name in the language file for JUMPTO Menu functionality Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:50:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:50:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4083 - /vtigercrm/trunk/include/js/menu.js Message-ID: <20060308155037.F25BC4AD497@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:50:33 2006 New Revision: 4083 Log: Added 3 function related to Jumpto Slide menu Modified: vtigercrm/trunk/include/js/menu.js Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Wed Mar 8 08:50:33 2006 @@ -87,3 +87,40 @@ } + +function fnSlide1(obj,inner) +{ + var buff = document.getElementById(obj).width; + closeLimit = buff.substring(0,buff.length); + menu_max = eval(closeLimit); + var tagName = document.getElementById(inner); + document.getElementById(obj).style.width=0 + "px"; menu_i=0; + if (tagName.style.display == 'none') + fnexpanLay1(obj,inner); + else + fncloseLay1(obj,inner); + } + +function fnexpanLay1(obj,inner) +{ + document.getElementById(obj).style.display = 'block'; + var setText = eval(closeLimit) - 1; + if (menu_i<=eval(closeLimit)) + { + if (menu_i>setText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.width=menu_i + "px"; + setTimeout(function() { fnexpanLay1(obj,inner); },5); + menu_i=menu_i+14; + } +} + + function fncloseLay1(obj,inner) +{ + if (menu_max >= eval(openLimit)) + { + if (menu_max Author: saraj Date: Wed Mar 8 08:58:15 2006 New Revision: 4084 Log: Style added for new homepage design Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Mar 8 08:58:15 2006 @@ -989,5 +989,201 @@ a.tagLink:Hover{ color:#000000; text-decoration:underline; -} - + +} + + +/*slide menu css*/ + +#mnuSlide{ + position:absolute; + left:0px; + top:100px; + width:110px; + } + + a.submenu { + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + background-color:#CCCCCC; + 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; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + 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; + } + + + /* New Home Page Css */ + + .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; + } + + a.imageTab{ + background-color:#F5F5F5; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + padding-top:3px; + } + + a.imageTab:Hover{ + background-color:#BFBFFF; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + opacity:.5; + } + + .mnuTabH{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; + } + + .mnuTabH tr td{ + border-bottom:1px solid #EBEBEB; + 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:Verdana, 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:Verdana, 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; + } + + .padTab1{ + border-bottom:15px solid #EBEBEB; + border-left:15px solid #EBEBEB; + border-top:15px solid #EBEBEB; + vertical-align:top; + padding:5px; + } + + .frmSelect{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + border:1px #EBEBEB; + } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:02:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:02:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4085 - /vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Message-ID: <20060308160219.94BC44AE228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:02:15 2006 New Revision: 4085 Log: Replaced the invoice gif with quotes Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Wed Mar 8 09:02:15 2006 @@ -123,7 +123,7 @@ } - $title=array('myTopInvoices.gif',$current_module_strings['LBL_MY_TOP_QUOTE'],'home_mytopinv'); + $title=array('TopOpenQuotes.gif',$current_module_strings['LBL_MY_TOP_QUOTE'],'home_mytopquote'); //Retreive the List View Table Header $listview_header = getListViewHeader($focus,"Quotes",$url_string,$sorder,$order_by,"HomePage",$oCustomView); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:04:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4086 - /vtigercrm/trunk/modules/Activities/OpenListView.php Message-ID: <20060308160456.46A6D4AE266@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:04:52 2006 New Revision: 4086 Log: commented upcoming date Modified: vtigercrm/trunk/modules/Activities/OpenListView.php Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:08:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:08:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4087 - /vtigercrm/branches/4.2/config.template.php Message-ID: <20060308160833.D99B84AE46E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:08:29 2006 New Revision: 4087 Log: prameter name modified Modified: vtigercrm/branches/4.2/config.template.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Wed Mar 8 09:08:29 2006 @@ -47,7 +47,7 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; -$dbconfig['db_status'] = '_DBC_STAT_'; +$dbconfig['db_status'] = '_DB_STAT_'; // TODO: test if port is empty // TODO: set db_hostname dependending on db_type From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:09:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:09:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4088 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060308160940.7D2152BF2CF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:09:36 2006 New Revision: 4088 Log: Added ->assign(MODULELISTS, ['moduleList']); in header file Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Wed Mar 8 09:09:36 2006 @@ -64,6 +64,8 @@ $smarty->assign("MODULE_NAME", $currentModule); +$smarty->assign("MODULELISTS", $app_list_strings['moduleList']); + $smarty->assign("DATE", getDisplayDate(date("Y-m-d H:i"))); if ($current_user->first_name != '') $smarty->assign("CURRENT_USER", $current_user->first_name); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:15:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:15:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4089 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060308161509.E2B3D49A36F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:15:05 2006 New Revision: 4089 Log: Added the JUMPTO slide menu in header tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Mar 8 09:15:05 2006 @@ -117,3 +117,25 @@ {rdelim} setInterval("Announcement_rss()",5000) + +{* Begining of Slide Menu *} + +
    + + + + + +
    + + +
    J
    U
    M
    P

    T
    O
    +
    +
    + +{* End *} + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:29:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:29:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4090 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060308162953.865BC4AD5F6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:29:49 2006 New Revision: 4090 Log: New Homepage tpl written Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed Mar 8 09:29:49 2006 @@ -1,5 +1,32 @@ + + + + {**} @@ -57,57 +84,83 @@ - - - - - From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:11:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:11:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4105 - /vtigercrm/trunk/include/js/clock.js Message-ID: <20060309091113.F006D4AD1F7@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:11:09 2006 New Revision: 4105 Log: js added for clock Added: vtigercrm/trunk/include/js/clock.js From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:13:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:13:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4106 - /vtigercrm/trunk/themes/blue/images/Home_15.gif Message-ID: <20060309091327.9C4384AD1F7@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:13:22 2006 New Revision: 4106 Log: Added Home_15.gif in images folder Added: vtigercrm/trunk/themes/blue/images/Home_15.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:23:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:23:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4107 - in /vtigercrm/trunk: Smarty/templates/Header.tpl include/calculator/Calc.php themes/blue/header.php Message-ID: <20060309092308.120DF4AE0CC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:23:00 2006 New Revision: 4107 Log: calculator and clock integrated Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/include/calculator/Calc.php vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 02:23:00 2006 @@ -103,6 +103,152 @@
    -
    - - - "; $shtml .= ""; - $shtml .= ""; $shtml .= ""; } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 23:10:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:10:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4095 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060309071033.7EE964ACEDF@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:10:29 2006 New Revision: 4095 Log: changes made to enable webmail Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Thu Mar 9 00:10:29 2006 @@ -28,17 +28,19 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=squirrelmail-1.4.4&action=redirect'); -$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=squirrelmail-1.4.4&action=redirect'=>'Emails'); +$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmails&action=index&parenttab=My Home Page'); + +$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=Webmails&action=index&parenttab=parenttab=My Home Page'=>'Emails'); echo '
    '; + ?> - + '.$mod_strings[$label].''; + echo ''; $listView = $filename; $classname = "tabOff"; } elseif(stristr($label,$_REQUEST['smodule'])) { - echo ''; + echo ''; $listView = $filename; $classname = "tabOff"; } else { - echo ''; + echo ''; } $classname = "tabOff"; } - }*/ + } ?> - +
    Author: saraj Date: Thu Mar 9 00:13:42 2006 New Revision: 4096 Log: Included menu.js file Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 00:13:42 2006 @@ -12,6 +12,7 @@ +
    -
    - - {foreach key=table item=tabledetail from=$HOMEDETAILS} - {if $tabledetail ne ''} - - - - - + +
    - {if $tabledetail.Title[3] ne ''} - -
    +{* Main Contents Start Here *} + + + + - + + + + + + + + + + + +
    + + + + + + + + + + - - {if $tabledetail.Title[3] ne ''} - - {/if} -
    + +
    + + + + + {* {foreach item=hometab from=$HOMEDETAILS} + {if $hometab.Title.3 neq ''} + {/if} -
    My Home - At a Glance + + + + {$hometab.Title.3} +
    - + {/foreach} *} + + + +
    +
    +
     
    + + + - - -
    + + {foreach item=hometab from=$HOMEDETAILS} + {if $hometab neq ''} + {if $hometab.Title.2 eq $HOMEDEFAULTVIEW} + + + + + + {else} + + + + + {/if} + {/if} + {/foreach} +
    {$hometab.Title.1}
    {$hometab.Title.1}
    +     		+ + {foreach item=tabledetail from=$HOMEDETAILS} + {if $tabledetail neq ''} + {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} +
    -
    - - + + + {foreach key=header item=headerdetail from=$tabledetail.Header} @@ -125,25 +178,31 @@ {/foreach} - -
    {$tabledetail.Title.1} (Mark as Default View)
     
    + +
    +{/if} +{/foreach}
    -

    - {/if} - {/foreach} - -
    -     		- Pipeline chart comes here..

    - - + + +
     

    + +
    YOUR SHOUT!!!Minimize / Maximize
     
    @@ -209,6 +268,8 @@
    + +
    + + + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:40:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:40:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4091 - /vtigercrm/trunk/themes/blue/images/HomeBtm.gif Message-ID: <20060308164040.A6A583DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:40:35 2006 New Revision: 4091 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/HomeBtm.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:40:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:40:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4092 - /vtigercrm/trunk/themes/blue/images/hometop.gif Message-ID: <20060308164055.D54A53DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:40:51 2006 New Revision: 4092 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/hometop.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:41:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:41:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4093 - /vtigercrm/trunk/themes/blue/images/tabRht.gif Message-ID: <20060308164112.29E363DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:41:08 2006 New Revision: 4093 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/tabRht.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 22:11:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 06:11:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4094 - /vtigercrm/trunk/modules/Rss/Rss.php Message-ID: <20060309061128.A9F7E49A492@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 23:11:24 2006 New Revision: 4094 Log: Added width=10% in the function getStarredRssFolder for aligning Delete Image Modified: vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Wed Mar 8 23:11:24 2006 @@ -154,7 +154,7 @@ $shtml .= "
    ".substr($allrssrow['rsstitle'],0,15)."...
       '.$mod_strings[$label].'   '.$mod_strings[$label].''.$mod_strings[$label].''.$mod_strings[$label].''.$mod_strings[$label].'
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 23:20:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:20:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4097 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060309072020.C21CE4AD557@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:20:15 2006 New Revision: 4097 Log: changes made to display event in corresponding day of the week Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 9 00:20:15 2006 @@ -160,10 +160,16 @@ $tempts=$ts; for ($row=1;$row<=1;$row++) { - echo ""; - echo ""; - for ($column=0;$column<=6;$column++) + for ($column=0;$column<=7;$column++) { + if($column==0) + { + echo ""; + echo ""; + } + else + { + $next = NextDay($ts); $dd->setDateTimeTS($next); $d = $dd->getDate(); @@ -187,36 +193,6 @@ } if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { continue; - } - if ( $this->pref->callist[$idx]->gettype() == "note" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "watchlist" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "task" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "reminder" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->t_ignore == 1) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( ($this->pref->callist[$idx]->s_out == 1) && ($this->pref->callist[$idx]->e_out == 1) ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; } $x1 = Date("G",$this->pref->callist[$idx]->start->getTimeStamp()); $x2 = Date("G",$this->pref->callist[$idx]->end->getTimeStamp()); @@ -257,6 +233,7 @@ echo strftime("%d - %a",$ts); echo ""; $ts = $next; + } } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 23:24:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:24:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4098 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060309072412.55D4C4AD5F6@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:24:08 2006 New Revision: 4098 Log: Included commonutils file & assigned defhomeview function Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Thu Mar 9 00:24:08 2006 @@ -26,6 +26,7 @@ require_once($theme_path.'layout_utils.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); +require_once('include/utils/CommonUtils.php'); global $app_strings; global $app_list_strings; global $mod_strings; @@ -164,6 +165,7 @@ $t=Date("Ymd"); $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("HOMEDETAILS",$home_values); +$smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->display("HomePage.tpl"); function getLoginHistory() From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 23:50:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:50:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4099 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060309075017.8790B4ADD2A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:50:11 2006 New Revision: 4099 Log: Included global variable app_list_strings Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 00:50:11 2006 @@ -47,7 +47,7 @@ global $currentModule; - +global $app_list_strings; global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -87,4 +87,4 @@ global $module_menu; $smarty->display("Header.tpl"); -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 23:54:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:54:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4100 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060309075424.77F1B4AE227@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:54:20 2006 New Revision: 4100 Log: style added for the homepage Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 9 00:54:20 2006 @@ -996,194 +996,193 @@ /*slide menu css*/ #mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; - } - - a.submenu { - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - width:100px; - height:20px; - padding-top:3px; - padding-left:10px; - border-bottom:1px solid #ECECEC; - background-color:#CCCCCC; - 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; - width:100px; - height:20px; - padding-top:3px; - padding-left:10px; - border-bottom:1px solid #ECECEC; - 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; - } - - - /* New Home Page Css */ - - .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; - } - - a.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - padding-top:3px; - } - - a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; - } - - .mnuTabH{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; - } - - .mnuTabH tr td{ - border-bottom:1px solid #EBEBEB; - 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:Verdana, 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:Verdana, 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; - } - - .padTab1{ - border-bottom:15px solid #EBEBEB; - border-left:15px solid #EBEBEB; - border-top:15px solid #EBEBEB; - vertical-align:top; - padding:5px; - } - - .frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; - } + position:absolute; + left:0px; + top:100px; +} + +a.submenu { + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + background-color:#CCCCCC; + 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; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + 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; +} + + +/* New Home Page Css */ + +.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; +} + +a.imageTab{ + background-color:#F5F5F5; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + padding-top:3px; +} + +a.imageTab:Hover{ + background-color:#BFBFFF; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + opacity:.5; +} + +.mnuTabH{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTabH tr td{ + border-bottom:1px solid #EBEBEB; + 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:Verdana, 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:Verdana, 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; +} + +.padTab1{ + border-bottom:15px solid #EBEBEB; + border-left:15px solid #EBEBEB; + border-top:15px solid #EBEBEB; + vertical-align:top; + padding:5px; +} + +.frmSelect{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + border:1px #EBEBEB; +} } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 00:00:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:00:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4101 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060309080001.E2F344AF3B4@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:59:57 2006 New Revision: 4101 Log: Added defhomeview field in users table Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 00:04:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:04:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4102 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060309080402.9D23B4AF3CE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 01:03:58 2006 New Revision: 4102 Log: Added field defhomeview in User.php file Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Mar 9 01:03:58 2006 @@ -90,6 +90,7 @@ var $lead_view; var $tagcloud; var $imagename; + var $defhomeview; var $column_fields = Array("id" ,"user_name" ,"user_password" @@ -130,6 +131,7 @@ ,"lead_view" ,"tagcloud" ,"imagename" + ,"defhomeview" ); var $encodeFields = Array("first_name", "last_name", "description"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 00:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4103 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060309081000.EEDF32CA2A2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 01:09:57 2006 New Revision: 4103 Log: Added function DefHomeView in commonutils Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Mar 9 01:09:57 2006 @@ -1236,12 +1236,17 @@ return mkdir($dir, $mode); } return FALSE; - -} +} + function DefHomeView() { global $adb; global $current_user; $query="select defhomeview from users where id = ".$current_user->id; - $result=$adb->query($query); $defaultview=$adb->query_result($result,0,'defhomeview'); return $defaultview; } + $result=$adb->query($query); + $defaultview=$adb->query_result($result,0,'defhomeview'); + return $defaultview; + +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:10:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:10:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4104 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060309091011.2E0BE2CA66A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:10:05 2006 New Revision: 4104 Log: Image Path given to home_15.gif Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 9 02:10:05 2006 @@ -195,7 +195,7 @@ - +
    vtiger CRM
     
     
      
    + + + +
    + + + + + + + +
    +
    +
    + + +
    +
    + + +
    3
    +
    4
    +
    5
    +
    6
    +
    7
    +
    8
    +
    9
    +
    10
    +
    11
    +
    12
    +
    1
    +
    2
    +
    +
    + - - - - - - - - - -
    @@ -29,31 +23,16 @@ -
    - - - - - - - - - -
    @@ -99,13 +78,7 @@
    EOQ; Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 02:23:00 2006 @@ -44,10 +44,12 @@ require_once("include/utils/utils.php"); +require_once("include/calculator/Calc.php"); + global $currentModule; -global $app_list_strings; + global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -64,8 +66,6 @@ $smarty->assign("MODULE_NAME", $currentModule); -$smarty->assign("MODULELISTS", $app_list_strings['moduleList']); - $smarty->assign("DATE", getDisplayDate(date("Y-m-d H:i"))); if ($current_user->first_name != '') $smarty->assign("CURRENT_USER", $current_user->first_name); @@ -75,6 +75,7 @@ $smarty->assign("CURRENT_USER_ID", $current_user->id); $smarty->assign("CATEGORY",getParentTab()); +$smarty->assign("CALC",get_calc($image_path)); if (is_admin($current_user)) $smarty->assign("ADMIN_LINK", "".$app_strings['LBL_SETTINGS'].""); @@ -87,4 +88,4 @@ global $module_menu; $smarty->display("Header.tpl"); -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:31:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:31:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4108 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl DetailView.tpl HomePage.tpl ListView.tpl salesEditView.tpl Message-ID: <20060309093131.6687C4AF3CD@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:31:24 2006 New Revision: 4108 Log: clock and calculator has been integrated Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Thu Mar 9 02:31:24 2006 @@ -69,8 +69,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Mar 9 02:31:24 2006 @@ -52,8 +52,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 9 02:31:24 2006 @@ -55,7 +55,7 @@ - +
    Search in Accounts... 
    @@ -64,8 +64,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Thu Mar 9 02:31:24 2006 @@ -67,8 +67,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Thu Mar 9 02:31:24 2006 @@ -66,8 +66,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:53:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:53:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4109 - in /vtigercrm/branches/4.2/pkg: ./ apache/ apache/bin/ apache/conf/ bin/ license/ php/ Message-ID: <20060309095326.E67094AE071@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:53:06 2006 New Revision: 4109 Log: added to generate build from svn Added: vtigercrm/branches/4.2/pkg/ vtigercrm/branches/4.2/pkg/apache/ vtigercrm/branches/4.2/pkg/apache/bin/ vtigercrm/branches/4.2/pkg/apache/bin/ShutdownApache.exe (with props) vtigercrm/branches/4.2/pkg/apache/conf/ vtigercrm/branches/4.2/pkg/apache/conf/lin_httpd.conf (with props) vtigercrm/branches/4.2/pkg/apache/conf/win_httpd.conf vtigercrm/branches/4.2/pkg/bin/ vtigercrm/branches/4.2/pkg/bin/datamigration.bat vtigercrm/branches/4.2/pkg/bin/datamigration.sh vtigercrm/branches/4.2/pkg/bin/find_replace.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.sh vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat vtigercrm/branches/4.2/pkg/bin/stopvTiger.sh vtigercrm/branches/4.2/pkg/bin/uninstallvtiger.sh vtigercrm/branches/4.2/pkg/license/ vtigercrm/branches/4.2/pkg/license/License_linux.txt vtigercrm/branches/4.2/pkg/license/License_windows.txt vtigercrm/branches/4.2/pkg/php/ vtigercrm/branches/4.2/pkg/php/php.ini From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:06:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:06:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4110 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060309100640.7D91B4AF5CB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:06:36 2006 New Revision: 4110 Log: issue in jumpto has been fixed Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 03:06:36 2006 @@ -49,7 +49,7 @@ global $currentModule; - +global $app_list_strings; global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -73,7 +73,7 @@ else $smarty->assign("CURRENT_USER", $current_user->user_name); $smarty->assign("CURRENT_USER_ID", $current_user->id); - +$smarty->assign("MODULELISTS",$app_list_strings['moduleList']); $smarty->assign("CATEGORY",getParentTab()); $smarty->assign("CALC",get_calc($image_path)); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:12:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:12:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4111 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060309101207.3E4B14AD1D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:12:03 2006 New Revision: 4111 Log: style sheet added for calculator and clock Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 9 03:12:03 2006 @@ -1185,4 +1185,139 @@ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; border:1px #EBEBEB; -} } +} + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} + +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +#wclock{ + position:absolute; + left:100px; + top:100px; + visibility:hidden; + display:block; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + +/* Calculator */ +.calcBg { + background: url(images/cal_bg.gif); + border: 1px solid #009900; +} +.calcResult { + width: 100%; + height: 25; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10; + text-align: right; +} +.calcMem { + width: 100%; + height: 25; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + width: 10; + height: 20; + font-size: 11px; + color: #FFF; + text-align:left; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:22:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:22:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4112 - /vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Message-ID: <20060309102240.CF8AD4AD557@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:22:36 2006 New Revision: 4112 Log: Clock and calc integrated for related lists Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Thu Mar 9 03:22:36 2006 @@ -33,8 +33,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:28:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:28:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4113 - /vtigercrm/trunk/include/calculator/Calc.php Message-ID: <20060309102859.F37664AF262@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:28:55 2006 New Revision: 4113 Log: border for the calculator has been removed Modified: vtigercrm/trunk/include/calculator/Calc.php Modified: vtigercrm/trunk/include/calculator/Calc.php ============================================================================== --- vtigercrm/trunk/include/calculator/Calc.php (original) +++ vtigercrm/trunk/include/calculator/Calc.php Thu Mar 9 03:28:55 2006 @@ -15,7 +15,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 03:14:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 11:14:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4114 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060309111422.39B9C4AD1D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 04:14:15 2006 New Revision: 4114 Log: issue in creating freetagged_object table has been fixed Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 9 04:14:15 2006 @@ -7139,7 +7139,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:07:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:07:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4115 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060309120717.C3E624AF59D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:07:12 2006 New Revision: 4115 Log: Slide menu heading changed to Go To & effect is changed to onclick Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 05:07:12 2006 @@ -277,8 +277,8 @@ {/foreach} -
    -
    J
    U
    M
    P

    T
    O
    +     		+

    G
    O

    T
    O
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:20:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:20:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4116 - in /vtigercrm/branches/4.2/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat Message-ID: <20060309122032.1B0C24AE159@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:20:24 2006 New Revision: 4116 Log: changes made for 424rc2 Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.sh vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/4.2/pkg/bin/startvTiger.bat Thu Mar 9 05:20:24 2006 @@ -47,12 +47,12 @@ bin\apache -k uninstall -n vtigercrm4_2 echo "" echo "" -echo "installing vtigercrm4_2 apache service" +echo "installing vtigercrm4_2_4rc2 apache service" echo "" echo "" bin\apache -k install -n vtigercrm4_2 -f conf\httpd.conf echo "" -echo "Starting vtigercrm4_2 apache service" +echo "Starting vtigercrm4_2_4rc2 apache service" echo "" bin\apache -n vtigercrm4_2 -k start IF ERRORLEVEL 1 goto stopservice @@ -112,27 +112,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm4_2 database already exists" +echo "check to see if vtigercrm4_2_4 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm4_2'" | "%WINDIR%\system32\find.exe" "vtigercrm4_2" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm4_2_4'" | "%WINDIR%\system32\find.exe" "vtigercrm4_2_4" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm4_2 database exists" +ECHO "vtigercrm4_2_4 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm4_2 database does not exist" +ECHO "vtigercrm4_2_4 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm4_2 and populate the same" +echo "Proceeding to create database vtigercrm4_2_4 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm4_2" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm4_2_4" echo "" -echo "vtigercrm4_2 database created" +echo "vtigercrm4_2_4 database created" echo "" goto end Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/4.2/pkg/bin/startvTiger.sh Thu Mar 9 05:20:24 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm4_2 database already exists" +echo "Checking if the vtigercrm4_2_4 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm4_2 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm4_2_4 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm4_2 does not exist. Creating database vtigercrm4_2" + echo "Database vtigercrm4_2_4 does not exist. Creating database vtigercrm4_2_4" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm4_2" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm4_2_4" fi host=`hostname` Modified: vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat Thu Mar 9 05:20:24 2006 @@ -32,11 +32,11 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm4_2 apache service" +echo "stopping vtigercrm4_2_4rc2 apache service" echo "" bin\apache -n vtigercrm4_2 -k stop echo "" -echo "uninstalling vtigercrm4_2 apache service" +echo "uninstalling vtigercrm4_2_4rc2 apache service" echo "" bin\apache -k uninstall -n vtigercrm4_2 rem .\bin\ShutdownApache.exe logs\httpd.pid From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:36:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:36:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4117 - /vtigercrm/branches/4.2/install/2setConfig.php Message-ID: <20060309123623.779594B0310@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:36:19 2006 New Revision: 4117 Log: database name changed for 424rc2 release Modified: vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Thu Mar 9 05:36:19 2006 @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm'; + $db_name = 'vtigercrm4_2_4'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4118 - in /vtigercrm/trunk/include/js: effectspack.js prototype_fade.js Message-ID: <20060309132744.895D4438959@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:27:26 2006 New Revision: 4118 Log: files added for fade effect Added: vtigercrm/trunk/include/js/effectspack.js vtigercrm/trunk/include/js/prototype_fade.js From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:28:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4119 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309132840.5D07C40113B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:28:25 2006 New Revision: 4119 Log: fade effect integrated Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 06:28:25 2006 @@ -2,6 +2,8 @@ + + @@ -42,194 +44,205 @@ -
     
    + +
    +
    + - - -
    - + - - - - + + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    -
    - - - -
     
    - - - - - - - - - + + - - - -
    {$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    +
    + + + -
     
    + + + + + + + + + {if $MODE eq 'edit'} - - - - - + + + + + {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_MORE_INFN}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    -
    -
    -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} -
     
    -
    -
    - -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    -
    -
    -
     
    -
    - -
    -
    +
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    + + +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} +
     
    +
    +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    +
    +
    + + + +   + + +
    + +
    + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:33:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:33:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4120 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309133340.9900C4B0326@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:33:34 2006 New Revision: 4120 Log: table heading changed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 06:33:34 2006 @@ -55,7 +55,7 @@   {$UMOD.LBL_USER_LOGIN_ROLE} - {$UMOD.LBL_USER_MORE_INFN} + {$UMOD.LBL_USER_MORE_INFN} {$UMOD.LBL_USER_ADDR_INFN}   @@ -70,7 +70,7 @@ - + @@ -128,7 +128,7 @@
    {$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME}
    - + @@ -184,7 +184,7 @@
    {$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_MORE_INFN}
    {$UMOD.LBL_TITLE}
    - + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 06:45:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 14:45:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4121 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060309144538.148674AD496@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 07:45:33 2006 New Revision: 4121 Log: slider added Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 06:47:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 14:47:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4122 - /vtigercrm/trunk/themes/images/scaler_slider_track.gif Message-ID: <20060309144742.E87D54AD496@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 07:47:38 2006 New Revision: 4122 Log: slider image added Added: vtigercrm/trunk/themes/images/scaler_slider_track.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 07:01:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 15:01:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4123 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309150149.C64224AF3CC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 08:01:46 2006 New Revision: 4123 Log: default position assigned to the slider for image resize Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 08:01:46 2006 @@ -234,6 +234,8 @@ {ldelim} contents[i].style.display = 'none'; {rdelim} +//to set the slider to the default size +document.getElementById('handle1').style.left='45px'; From vtiger-tickets at vtiger.fosslabs.com Thu Mar 9 10:03:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 09 Mar 2006 18:03:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.5fdc98124a14605d3eaf2082810f2ca1@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by anonymous): Hi Pieter, As soon as 4.2.4 releases we will make a branch to coordinate the postgres support. As of 4.2.4 it will take a bit of work for postgres support. As for how much work it will be, I'll leave for others to say. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 22:37:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 06:37:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4124 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060310063712.BB2334B4D47@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 23:37:07 2006 New Revision: 4124 Log: colum name changed from tagg_id to tag_id Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 9 23:37:07 2006 @@ -7120,7 +7120,7 @@
    {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_ADDRESS}
    - + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 02:11:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 10:11:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4125 - in /vtigercrm/trunk: Smarty/templates/UserListView.tpl include/utils/utils.php modules/Users/ListView.php Message-ID: <20060310101155.C7B214B048A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 03:11:46 2006 New Revision: 4125 Log: fade images added for userlistview Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Fri Mar 10 03:11:46 2006 @@ -12,12 +12,25 @@ + -{$NAVIGATION} - + -
    +{if $USER_IMAGES neq ''} + + +
    +[X] Close +
    +{foreach item=imagename from=$USER_IMAGES} + {$imagename} +{/foreach} +
    +
    +{/if} +    		 {$RECORD_COUNTS}{$NAVIGATION}
     
    +
    Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Fri Mar 10 03:11:46 2006 @@ -1943,4 +1943,22 @@ } +function getUserImageNames() +{ + global $adb; + global $log; + $query = "select imagename from users where deleted=0"; + $result = $adb->query($query); + $image_name=array(); + for($i=0;$i<$adb->num_rows($result);$i++) + { + if($adb->query_result($result,$i,"imagename")!='') + $image_name[] = $adb->query_result($result,$i,"imagename"); + } + $log->debug("Inside getUserImageNames."); + if(count($image_name) > 0) + return $image_name; +} + + ?> Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 02:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 10:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4126 - in /vtigercrm/trunk: include/js/xfade2.js modules/Users/fade.css Message-ID: <20060310101303.3F4A74B048A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 03:12:51 2006 New Revision: 4126 Log: files added for fade effect Added: vtigercrm/trunk/include/js/xfade2.js vtigercrm/trunk/modules/Users/fade.css From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 05:35:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 13:35:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4127 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060310133533.6940D4B5F00@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 06:35:27 2006 New Revision: 4127 Log: Demo data populated for all the modules Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 05:40:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 13:40:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4128 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060310134001.4CF5549A48D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 06:39:57 2006 New Revision: 4128 Log: Added demo feeds for RSS & Portal Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Mar 10 06:39:57 2006 @@ -2145,9 +2145,19 @@ (7,27,2), (7,8,3)"); - $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); - - } + //portal feeds + $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); + $this->db->query("insert into portal values(2,'Zoho','http://www.zoho.com/',1)"); + $this->db->query("insert into portal values(3,'Search','http://www.lycos.com/',2)"); + $this->db->query("insert into portal values(4,'Yahoo Finance','http://finance.yahoo.com/',3)"); + + //rss feeds + + $this->db->query("insert into rss values(1,'http://finance.yahoo.com/rss/headline?s=IBM','IBM Finblog',0,1,'IBM Finance')"); + $this->db->query("insert into rss values(2,'http://finance.yahoo.com/rss/headline?s=HPQ','HP Blog',0,1,'HP Finance')"); + $this->db->query("insert into rss values(3,'http://finance.yahoo.com/rss/headline?s=GM','GM blog',0,0,'GM Finance')"); + + } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 14:32:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 22:32:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4129 - in /vtigercrm/trunk/modules/Settings: AddMailAccount.html AddMailAccount.php SaveMailAccount.php Message-ID: <20060310223242.A87A54C3308@vtiger.fosslabs.com> Author: mmbrich Date: Fri Mar 10 15:32:40 2006 New Revision: 4129 Log: added new email options to the settings page. Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.html vtigercrm/trunk/modules/Settings/AddMailAccount.php vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.html ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.html (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.html Fri Mar 10 15:32:40 2006 @@ -60,7 +60,29 @@ - + + + + + + + + + + + + @@ -78,22 +100,40 @@ -
    {MOD.LBL_MAIL_SERVER_INFO}
    {MOD.LBL_MAIL_PROTOCOL}:  {MOD.LBL_POP} {MOD.LBL_IMAP} +  {MOD.LBL_IMAP} +  {MOD.LBL_POP} +  IMAP2 +  IMAP4 +  IMAP4-rev1 +
    SSL Options: No TLS +   TLS +
    Certificate Validations Validate SSL Cert +  Don't Validate SSL Cert +
    Show Body in "Quick View" Yes (slower and marks all emails as "Seen") +  No

    - +
    +

    @@ -104,7 +144,7 @@
    {JAVASCRIPT} -{MOD.LBL_LIST_MAIL_ACCOUNT} + Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Fri Mar 10 15:32:40 2006 @@ -29,7 +29,6 @@ $xtpl=new XTemplate ('modules/Settings/AddMailAccount.html'); $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); -$xtpl->assign("POP_SELECT", "CHECKED"); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { @@ -48,29 +47,42 @@ $xtpl->assign("SERVERPASSWORD", $temprow['mail_password']); $xtpl->assign("SERVERNAME", $temprow['mail_servername']); $xtpl->assign("RECORD_ID", $temprow['account_id']); + $xtpl->assign("BOX_REFRESH", $temprow['box_refresh']); + $xtpl->assign("MAILS_PER_PAGE", $temprow['mails_per_page']); $xtpl->assign("EDIT", "TRUE"); + + if(strtolower($temprow['mail_protocol']) == "imap") + $xtpl->assign("IMAP", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap2") + $xtpl->assign("IMAP2", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap4") + $xtpl->assign("IMAP4", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap4rev1") + $xtpl->assign("IMAP4R1", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "pop3") + $xtpl->assign("POP3", "CHECKED"); + + if(strtolower($temprow['ssltype']) == "notls") + $xtpl->assign("NOTLS", "CHECKED"); + if(strtolower($temprow['ssltype']) == "tls") + $xtpl->assign("TLS", "CHECKED"); + + if(strtolower($temprow['sslmeth']) == "validate-cert") + $xtpl->assign("VALIDATECERT", "CHECKED"); + if(strtolower($temprow['sslmeth']) == "novalidate-cert") + $xtpl->assign("NOVALIDATECERT", "CHECKED"); + + if(strtolower($temprow['showbody']) == "yes") + $xtpl->assign("SHOWBODY", "CHECKED"); + if(strtolower($temprow['showbody']) == "no") + $xtpl->assign("NOSHOWBODY", "CHECKED"); } } } -/*$sql="select * from systems where server_type = 'email'"; -$result = $adb->query($sql); -$mail_server = $adb->query_result($result,0,'server'); -$mail_server_username = $adb->query_result($result,0,'server_username'); -$mail_server_password = $adb->query_result($result,0,'server_password'); -*/ - $xtpl->assign("RETURN_MODULE","Settings"); $xtpl->assign("RETURN_ACTION","index"); $xtpl->assign("JAVASCRIPT", get_validate_record_js()); -/*if (isset($mail_server)) - $xtpl->assign("MAILSERVER",$mail_server); -if (isset($mail_server_username)) - $xtpl->assign("USERNAME",$mail_server_username); -if (isset($mail_server_password)) - $xtpl->assign("PASSWORD",$mail_server_password); -*/ $xtpl->parse("main"); $xtpl->out("main"); - ?> Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Fri Mar 10 15:32:40 2006 @@ -19,6 +19,11 @@ $server_username = $_REQUEST['server_username']; $server_password = $_REQUEST['server_password']; $mail_servername = $_REQUEST['mail_servername']; +$box_refresh = $_REQUEST['box_refresh']; +$mails_per_page = $_REQUEST['mails_per_page']; +$ssltype = $_REQUEST["ssltype"]; +$sslmeth = $_REQUEST["sslmeth"]; +$showbody = $_REQUEST["showbody"]; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { @@ -29,12 +34,12 @@ if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='') { - $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."' where account_id = ".$id; + $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='".$showbody."' where account_id = '".$id."'"; } else { $account_id = $adb->getUniqueID("mail_accounts"); - $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0)"; + $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0,'".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."')"; } $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 14:33:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 22:33:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4130 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060310223326.9FAB74C330E@vtiger.fosslabs.com> Author: mmbrich Date: Fri Mar 10 15:33:25 2006 New Revision: 4130 Log: added new email settings to database. Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Fri Mar 10 15:33:25 2006 @@ -4474,6 +4474,16 @@ + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 12 13:49:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 12 Mar 2006 21:49:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4131 - in /vtigercrm/trunk/modules/Webmails: src/ templates/ tmp/ Message-ID: <20060312214927.E9CC54C3319@vtiger.fosslabs.com> Author: mmbrich Date: Sun Mar 12 14:49:25 2006 New Revision: 4131 Log: Removed tmp/, this will be dynamically created by the scripts for incoming attachements. Removed the FOSS Labs specific templates, sorry, should have cleaned those out earlier. Removed temporary src/ directory since it isn't needed This line, and those below, will be ignored-- D Webmails/src D Webmails/templates/Marketing Campaign D Webmails/templates/Distributor Annoucement (Contacts) D Webmails/templates/FOSS Quote D Webmails/templates/Invoice Due D Webmails/templates/Accept Order D Webmails/templates/Acceptance Proposal D Webmails/templates/Default FOSS Template D Webmails/templates/Thanks Note D Webmails/tmp Removed: vtigercrm/trunk/modules/Webmails/src/ vtigercrm/trunk/modules/Webmails/templates/Accept Order vtigercrm/trunk/modules/Webmails/templates/Acceptance Proposal vtigercrm/trunk/modules/Webmails/templates/Default FOSS Template vtigercrm/trunk/modules/Webmails/templates/Distributor Annoucement (Contacts) vtigercrm/trunk/modules/Webmails/templates/FOSS Quote vtigercrm/trunk/modules/Webmails/templates/Invoice Due vtigercrm/trunk/modules/Webmails/templates/Marketing Campaign vtigercrm/trunk/modules/Webmails/templates/Thanks Note vtigercrm/trunk/modules/Webmails/tmp/ From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 00:11:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 08:11:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4132 - /vtigercrm/trunk/modules/Settings/SaveMailAccount.php Message-ID: <20060313081127.4E3F34D8E29@vtiger.fosslabs.com> Author: mmbrich Date: Mon Mar 13 01:11:25 2006 New Revision: 4132 Log: correctly save the mail account info Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Mon Mar 13 01:11:25 2006 @@ -39,7 +39,7 @@ else { $account_id = $adb->getUniqueID("mail_accounts"); - $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0,'".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."')"; + $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."','1','0')"; } $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 01:28:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:28:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4133 - /vtigercrm/trunk/install/2setConfig.php Message-ID: <20060313092815.4364D4099CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:28:11 2006 New Revision: 4133 Log: databasename changed to 5beta Modified: vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 01:29:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:29:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4134 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060313092917.45DCD4099DF@vtiger.fosslabs.com> Author: richie Date: Mon Mar 13 02:29:13 2006 New Revision: 4134 Log: Stating that vtigercrm can run on a system having lamp/wamp setup Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 01:34:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:34:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4135 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060313093400.5A4A7409A16@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:33:56 2006 New Revision: 4135 Log: Removed the More Information Tab from Potential Detail View Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Mar 13 02:33:56 2006 @@ -120,7 +120,7 @@ - {if $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Potentials' || $MODULE eq 'Products'} + {if $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Products'} From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 01:46:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:46:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4136 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060313094608.47FCA409A6F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:46:04 2006 New Revision: 4136 Log: http conf path modifed for 5 beta Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Mon Mar 13 02:46:04 2006 @@ -25,8 +25,8 @@ # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "VTIGERCRM/vtigerCRM5_alpha1/apache" will be interpreted by the -# server as "VTIGERCRM/vtigerCRM5_alpha1/apache/logs/foo.log". +# with ServerRoot set to "VTIGERCRM/vtigerCRM5_beta/apache" will be interpreted by the +# server as "VTIGERCRM/vtigerCRM5_beta/apache/logs/foo.log". # ### Section 1: Global Environment @@ -47,7 +47,7 @@ # # Do NOT add a slash at the end of the directory path. # -ServerRoot "VTIGERCRM/vtigerCRM5_alpha1/apache" +ServerRoot "VTIGERCRM/vtigerCRM5_beta/apache" # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. @@ -305,7 +305,7 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # -DocumentRoot "VTIGERCRM/vtigerCRM5_alpha1/apache/htdocs/vtigerCRM" +DocumentRoot "VTIGERCRM/vtigerCRM5_beta/apache/htdocs/vtigerCRM" # # Each directory to which Apache has access can be configured with respect @@ -330,7 +330,7 @@ # # This should be changed to whatever you set DocumentRoot to. # - + # # Possible values for the Options directive are "None", "All", @@ -548,9 +548,9 @@ # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # -Alias /icons/ "VTIGERCRM/vtigerCRM5_alpha1/apache/icons/" - - +Alias /icons/ "VTIGERCRM/vtigerCRM5_beta/apache/icons/" + + Options Indexes MultiViews AllowOverride None Order allow,deny @@ -562,9 +562,9 @@ # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/vtigerCRM5_alpha1/apache/manual$1" - - +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/vtigerCRM5_beta/apache/manual$1" + + Options Indexes AllowOverride None Order allow,deny @@ -586,7 +586,7 @@ # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # -ScriptAlias /cgi-bin/ "VTIGERCRM/vtigerCRM5_alpha1/apache/cgi-bin/" +ScriptAlias /cgi-bin/ "VTIGERCRM/vtigerCRM5_beta/apache/cgi-bin/" # @@ -597,10 +597,10 @@ # -# "VTIGERCRM/vtigerCRM5_alpha1/apache/cgi-bin" should be changed to whatever your ScriptAliased +# "VTIGERCRM/vtigerCRM5_beta/apache/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. # - + AllowOverride None Options None Order allow,deny @@ -916,7 +916,7 @@ # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the -# VTIGERCRM/vtigerCRM5_alpha1/apache/error/include/ files and copying them to /your/include/path/, +# VTIGERCRM/vtigerCRM5_beta/apache/error/include/ files and copying them to /your/include/path/, # even on a per-VirtualHost basis. The default include files will display # your Apache version number and your ServerAdmin email address regardless # of the setting of ServerSignature. @@ -924,9 +924,9 @@ # The internationalized error documents require mod_alias, mod_include # and mod_negotiation. To activate them, uncomment the following 30 lines. -# Alias /error/ "VTIGERCRM/vtigerCRM5_alpha1/apache/error/" -# -# +# Alias /error/ "VTIGERCRM/vtigerCRM5_beta/apache/error/" +# +# # AllowOverride None # Options IncludesNoExec # AddOutputFilter Includes html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 02:33:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:33:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4137 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060313103332.BEE9B409B75@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:33:27 2006 New Revision: 4137 Log: phpdoc has been included for getHourList() method and call to getCalendarHeader() has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Mon Mar 13 03:33:27 2006 @@ -8,6 +8,7 @@ * @module calendar_day */ require_once('modules/Users/User.php'); + require_once('modules/Calendar/CalendarCommon.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; @@ -25,34 +26,9 @@ echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'], true); echo "\n
    \n"; $t=Date("Ymd"); -?> -
     Basic Information More Information  
    - - - - - - - - - -
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - "; + } + $cnt_total=array_sum($mod_tot_cnt_array); + $mod_cnt_table.="
    - tablename = $calobj->table_name; } - - //for new UI + /** + * Function to get UI&Activities for each hour + * @param $hour -- hour(in am/pm) :: Type string + * @param $maxcol -- no. of events in particular hour :: Type integer + * @param $table -- events in array format :: Type Array + * @param $i -- count :: Type integer + * Constructs UI for each hour in html table format and calls formatted() to get activities for that hour + * returns the html table in string format + */ function getHourList($hour,$maxcol,$table,$i) { //echo '
    ';print_r($table);echo '
    '; @@ -285,23 +268,8 @@ $maxcol[$i] = max($maxcol[$i],count($table[$i])); } //New UI-integrated by minnie - echo ""; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($last_day,$next_day,"day",$from->ts,$this->pref); + echo $calendarheader; echo " From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 06:07:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:07:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4433 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060324140800.211934EBF6F@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:07:55 2006 New Revision: 4433 Log: MaxClients 100 has been removed at line no 98 Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 24 07:07:55 2006 @@ -98,7 +98,6 @@ # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 -MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 06:21:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:21:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4434 - in /vtigercrm/trunk/pkg/apache/conf: lin_httpd.conf win_httpd.conf Message-ID: <20060324142151.F13704EBF8F@vtiger.fosslabs.com> Author: richie Date: Fri Mar 24 07:21:46 2006 New Revision: 4434 Log: parameter values changed windows version has lots of changes done as typical entries were missing Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 24 07:21:46 2006 @@ -116,8 +116,8 @@ # MaxRequestsPerChild: maximum number of requests a server process serves StartServers 5 -MinSpareServers 5 -MaxSpareServers 10 +MinSpareServers 10 +MaxSpareServers 15 MaxClients 150 MaxRequestsPerChild 0 @@ -130,12 +130,12 @@ # ThreadsPerChild: constant number of worker threads in each server process # MaxRequestsPerChild: maximum number of requests a server process serves -StartServers 2 +StartServers 10 MaxClients 150 MinSpareThreads 25 MaxSpareThreads 75 ThreadsPerChild 25 -MaxRequestsPerChild 0 +MaxRequestsPerChild 20 # perchild MPM Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Fri Mar 24 07:21:46 2006 @@ -100,12 +100,101 @@ ## Server-Pool Size Regulation (MPM specific) ## +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 5 +MinSpareServers 10 +MaxSpareServers 15 +MaxClients 150 +MaxRequestsPerChild 0 + + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 10 +MaxClients 150 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 20 + + +# perchild MPM +# NumServers: constant number of server processes +# StartThreads: initial number of worker threads in each server process +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# MaxThreadsPerChild: maximum number of worker threads in each server process +# MaxRequestsPerChild: maximum number of connections per server process + +NumServers 5 +StartThreads 5 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxThreadsPerChild 20 +MaxRequestsPerChild 0 + + # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 MaxRequestsPerChild 0 + + +# BeOS MPM +# StartThreads: how many threads do we initially spawn? +# MaxClients: max number of threads we can have (1 thread == 1 client) +# MaxRequestsPerThread: maximum number of requests each thread will process + +StartThreads 10 +MaxClients 50 +MaxRequestsPerThread 10000 + + +# NetWare MPM +# ThreadStackSize: Stack size allocated for each worker thread +# StartThreads: Number of worker threads launched at server startup +# MinSpareThreads: Minimum number of idle threads, to handle request spikes +# MaxSpareThreads: Maximum number of idle threads +# MaxThreads: Maximum number of worker threads alive at the same time +# MaxRequestsPerChild: Maximum number of requests a thread serves. It is +# recommended that the default value of 0 be set for this +# directive on NetWare. This will allow the thread to +# continue to service requests indefinitely. + +ThreadStackSize 65536 +StartThreads 250 +MinSpareThreads 25 +MaxSpareThreads 250 +MaxThreads 1000 +MaxRequestsPerChild 0 +MaxMemFree 100 + + +# OS/2 MPM +# StartServers: Number of server processes to maintain +# MinSpareThreads: Minimum number of idle threads per process, +# to handle request spikes +# MaxSpareThreads: Maximum number of idle threads per process +# MaxRequestsPerChild: Maximum number of connections per server process + +StartServers 2 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxRequestsPerChild 0 # From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 06:21:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:21:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4435 - /vtigercrm/trunk/include/CustomFieldUtil.php Message-ID: <20060324142157.28E004EBF8F@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:21:52 2006 New Revision: 4435 Log: changes made for customfield edit Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Fri Mar 24 07:21:52 2006 @@ -65,6 +65,10 @@ elseif($uitype == 21) { $fldname = 'Text Area'; + } + elseif($uitype == 33) + { + $fldname = 'Multi-Select Combo Box'; } return $fldname; } @@ -394,4 +398,71 @@ } } +function getCustomFieldData($tab,$id,$datatype) +{ + global $adb; + $query = "select * from field where tabid=".$tab." and fieldid=".$id; + $result = $adb->query($query); + $return_data=$adb->fetch_array($result); + return $return_data[$datatype]; +} + +function getFldTypeandLengthValue($label,$typeofdata) +{ + if($label == 'Text') + { + $types = explode("~",$typeofdata); + $data_array=array('0',$types[3]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Number') + { + $types = explode("~",$typeofdata); + $data_decimal = explode(",",$types[2]); + $data_array=array('1',$data_decimal[0],$data_decimal[1]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Percent') + { + $types = explode("~",$typeofdata); + $data_array=array('2','5',$types[3]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Currency') + { + $types = explode("~",$typeofdata); + $data_decimal = explode(",",$types[2]); + $data_array=array('3',$data_decimal); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Date') + { + $fieldtype = '4'; + } + elseif($label == 'Email') + { + $fieldtype = '5'; + } + elseif($label == 'Phone') + { + $fieldtype = '6'; + } + elseif($label == 'PickList') + { + $fieldtype = '7'; + } + elseif($label == 'Url') + { + $fieldtype = '8'; + } + elseif($label == 'Checkbox') + { + $fieldtype = '9'; + } + elseif($label == 'Text Area') + { + $fieldtype = '10'; + } + return $fieldtype; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 21:00:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 05:00:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4436 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327050033.6A6B94FF723@vtiger.fosslabs.com> Author: richie Date: Sun Mar 26 22:00:27 2006 New Revision: 4436 Log: fixed MaxClients parameter entry Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Sun Mar 26 22:00:27 2006 @@ -89,7 +89,6 @@ # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 -MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. From vtiger-tickets at vtiger.fosslabs.com Sun Mar 26 22:06:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:06:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= Message-ID: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> #71: Sorting columns in listview fails -----------------------+---------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: postgres | -----------------------+---------------------------------------------------- {{{ Warning: pg_exec() [function.pg-exec]: Query failed: ERROR: SELECT DISTINCT ON expressions must match initial ORDER BY expressions in /home/allan/code/vtiger/4.2_postgresql_integration/adodb/drivers/adodb- postgres64.inc.php on line 766 (postgres7): select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ORDER BY subject ASC -1: ERROR: SELECT DISTINCT ON expressions must match initial ORDER BY expressions adodb_postgres7._execute( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde..., false) % line 857, file: adodb.inc.php adodb_postgres7.execute( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde...) % line 240, file: PearDatabase.php peardatabase.query( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde...) % line 303, file: ListView.php include(/home/allan/code/vtiger/4.2_postgresql_integration/modules/Activities/ListView.php) % line 27, file: index.php include(/home/allan/code/vtiger/4.2_postgresql_integration/modules/Activities/index.php) % line 777, file: index.php }}} Sorting the activity listview columns by subject (or other view/columns) creates the above database error. Blocks ticket #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 22:15:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 06:15:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4437 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060327061511.914C84FF7AE@vtiger.fosslabs.com> Author: saraj Date: Sun Mar 26 23:15:04 2006 New Revision: 4437 Log: Removed the default portal feeds Ahmed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Sun Mar 26 23:15:04 2006 @@ -2147,12 +2147,6 @@ (7,27,2), (7,8,3)"); - //portal feeds - $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); - $this->db->query("insert into portal values(2,'Zoho','http://www.zoho.com/',1)"); - $this->db->query("insert into portal values(3,'Search','http://www.lycos.com/',2)"); - $this->db->query("insert into portal values(4,'Yahoo Finance','http://finance.yahoo.com/',3)"); - //rss feeds $this->db->query("insert into rss values(1,'http://finance.yahoo.com/rss/headline?s=IBM','IBM Finblog',0,1,'IBM Finance')"); From vtiger-tickets at vtiger.fosslabs.com Sun Mar 26 22:20:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:20:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= In-Reply-To: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> References: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> Message-ID: <085.04eb0983f4b5e7ba1a610df890eef5db@vtiger.fosslabs.com> #71: Sorting columns in listview fails ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- Comment (by allanbush): This is a limitation of the distinct on method of postgres used as a work around for the strict behavior of the group by clause. The simple patch is to add the order by expressions into the distinct on list, this hides the underlining issue which is we are querying an indetermined set of our data. The preferred solution would be to rewrite the queries to avoid selecting columns we don't need. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Mar 26 22:59:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:59:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= In-Reply-To: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> References: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> Message-ID: <085.4ed37056dcf39abd6f424b592d455fce@vtiger.fosslabs.com> #71: Sorting columns in listview fails ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: postgres ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [4438]) Added order by expression to the begining of the disinstct on expression to prevent postgres query error when sorting columns. Closes #71. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 22:59:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 06:59:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4438 - /vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Message-ID: <20060327065915.3F0474FF805@vtiger.fosslabs.com> Author: allanbush Date: Sun Mar 26 23:59:11 2006 New Revision: 4438 Log: Added order by expression to the begining of the disinstct on expression to prevent postgres query error when sorting columns. Closes #71. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Sun Mar 26 23:59:11 2006 @@ -236,7 +236,13 @@ //Retreive the list from Database //<<<<<<<<>>>>>>>> -$distincton = $adb->isPostgres() ? 'crmid' : ''; +$distincton = ''; +if($adb->isPostgres()) { + if(isset($order_by) && $order_by != '') { + $distincton = $order_by . ', '; + } + $distincton .= 'crmid'; +} if($viewid != "0") { $listquery = getListQuery("Activities", '', $distincton); From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 23:18:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:18:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4439 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Import/UsersLastImport.php Leads/Lead.php Message-ID: <20060327071812.E03104FF826@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:18:08 2006 New Revision: 4439 Log: Proper aliasing for some import and export queries. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php Mon Mar 27 00:18:08 2006 @@ -173,7 +173,7 @@ AND accounts.deleted=0 AND users.status='ACTIVE'";*/ $query = "SELECT distinct account.*, accountbillads.city, - users.user_name assigned_user_name, + users.user_name AS assigned_user_name, crmid, smownerid FROM account inner join crmentity on crmentity.crmid=account.accountid @@ -215,9 +215,9 @@ AND users.status='ACTIVE'";*/ $query = "SELECT distinct - account.accountid account_id, - account.accountname account_name, - users.user_name assigned_user_name, + account.accountid AS account_id, + account.accountname AS account_name, + users.user_name AS assigned_user_name, crmentity.crmid, smownerid, potential.* FROM potential @@ -236,7 +236,7 @@ else if($this->bean_type == 'Leads') { $query = "SELECT distinct leaddetails.*, crmentity.crmid, leadaddress.phone,leadsubdetails.website, - users.user_name assigned_user_name, + users.user_name AS assigned_user_name, smownerid FROM leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php Mon Mar 27 00:18:08 2006 @@ -211,7 +211,7 @@ { $query = $this->constructCustomQueryAddendum() . ", - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city AS city, leadaddress.state AS state,leadaddress.code AS code,leadaddress.country AS country, leadaddress.phone AS phone, users.user_name, users.status AS user_status FROM ".$this->entity_table." INNER JOIN leaddetails ON crmentity.crmid=leaddetails.leadid @@ -228,7 +228,7 @@ else { $query = "SELECT - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status AS user_status FROM ".$this->entity_table." INNER JOIN leaddetails ON crmentity.crmid=leaddetails.leadid LEFT JOIN leadsubdetails From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 23:26:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:26:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4440 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Message-ID: <20060327072609.EFF9B4FF84A@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:26:03 2006 New Revision: 4440 Log: Pervent attempt to update the status of a lead using an empty string as the id. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Mon Mar 27 00:26:03 2006 @@ -21,6 +21,7 @@ global $adb; $storearray = explode(";",$idlist); +$storearray = array_filter($storearray); $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 23:48:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:48:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4441 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Message-ID: <20060327074817.530374FF867@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:48:13 2006 New Revision: 4441 Log: Fixed lead update problems by checking that groupname is given before trying to update database with a potential null value. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Mon Mar 27 00:48:13 2006 @@ -425,6 +425,7 @@ global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); } @@ -442,6 +443,7 @@ function insertUsers2GroupMapping($groupname,$userid) { global $adb; + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); } @@ -527,6 +529,7 @@ function insert2LeadGroupRelation($leadid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); @@ -536,6 +539,7 @@ global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); @@ -545,6 +549,7 @@ global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); @@ -553,6 +558,7 @@ function insert2ActivityGroupRelation($activityid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); @@ -561,6 +567,7 @@ function insert2TicketGroupRelation($ticketid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 26 23:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4442 - /vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Message-ID: <20060327075416.E03BF4FF87B@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:54:14 2006 New Revision: 4442 Log: Removed extra set of quotes in query. Ref #17 Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Mon Mar 27 00:54:14 2006 @@ -279,7 +279,7 @@ $adb->query($sql_insert_contact); -$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')"; +$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")"; $adb->query($sql_insert_contactsubdetails); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:24:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:24:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4443 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060327092405.91E5E4FF91F@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 27 02:24:02 2006 New Revision: 4443 Log: expand lead street field to match street maxlen in contacts Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Mon Mar 27 02:24:02 2006 @@ -676,7 +676,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:42:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:42:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4444 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060327094226.047C24FF94E@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:42:21 2006 New Revision: 4444 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:46:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:46:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4445 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060327094610.130964FF959@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:46:05 2006 New Revision: 4445 Log: property changed Modified: vtigercrm/trunk/modules/Activities/Event.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:47:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:47:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4446 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060327094744.A9A794FF959@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:47:40 2006 New Revision: 4446 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Mon Mar 27 02:47:40 2006 @@ -95,51 +95,6 @@ return "$this->name"; } - function create_list_query(&$order_by, &$where) - { - $contact_required = ereg("contacts", $where); - - if($contact_required) - { - $query = "SELECT task.taskid, tasks.assigned_user_id, task.status, task.name, task.parent_type, tasks.parent_id, tasks.contact_id, tasks.datedue, contactdetails.firstname, contactdetails.lastname ,task.priority,task.description FROM contactdetails, task "; - $where_auto = "task.contact_id = contactdetails.contactid AND task.deleted=0 AND contact.deleted=0"; - } - else - { - $query = 'SELECT taskid, smcreatorid, task.status, duedate ,priority FROM task inner join crmentity on crmentity.crmid=task.taskid '; - $where_auto = " AND deleted=0"; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY $order_by"; - else - //$query .= " ORDER BY name"; - return $query; - - } - - function create_export_query(&$order_by, &$where) - { - $contact_required = ereg("contacts", $where); - - if($contact_required) - { - $query = "SELECT task.*, contactdetailss.firstname, contactdetails.lastname FROM task inner join seactivityrel on seactivityrel.activityid=task.taskid inner join crmentity on crmentity.crmid=task.taskid and crmentity.deleted=0"; - } - else - { - $query = 'SELECT * FROM task inner join seactivityrel on seactivityrel.activityid=task.taskid inner join crmentity on crmentity.crmid=task.taskid and crmentity.deleted=0'; - } - return $query; - - } - - function fill_in_additional_list_fields() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:07:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:07:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4447 - /vtigercrm/trunk/data/Tracker.php Message-ID: <20060327100740.7207C4FF984@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:07:35 2006 New Revision: 4447 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/data/Tracker.php (contents, props changed) Modified: vtigercrm/trunk/data/Tracker.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:09:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:09:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4448 - /vtigercrm/trunk/data/Tracker.php Message-ID: <20060327100927.9DDAA4FF985@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:09:23 2006 New Revision: 4448 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/data/Tracker.php Modified: vtigercrm/trunk/data/Tracker.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4449 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327101000.77FEA4FF978@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 03:09:55 2006 New Revision: 4449 Log: reverted the changes back Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Mon Mar 27 03:09:55 2006 @@ -99,101 +99,12 @@ ## Server-Pool Size Regulation (MPM specific) ## -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# MaxClients: maximum number of server processes allowed to start -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 5 -MinSpareServers 10 -MaxSpareServers 15 -MaxClients 150 -MaxRequestsPerChild 0 - - -# worker MPM -# StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# ThreadsPerChild: constant number of worker threads in each server process -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 10 -MaxClients 150 -MinSpareThreads 25 -MaxSpareThreads 75 -ThreadsPerChild 25 -MaxRequestsPerChild 20 - - -# perchild MPM -# NumServers: constant number of server processes -# StartThreads: initial number of worker threads in each server process -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# MaxThreadsPerChild: maximum number of worker threads in each server process -# MaxRequestsPerChild: maximum number of connections per server process - -NumServers 5 -StartThreads 5 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxThreadsPerChild 20 -MaxRequestsPerChild 0 - - # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 MaxRequestsPerChild 0 - - -# BeOS MPM -# StartThreads: how many threads do we initially spawn? -# MaxClients: max number of threads we can have (1 thread == 1 client) -# MaxRequestsPerThread: maximum number of requests each thread will process - -StartThreads 10 -MaxClients 50 -MaxRequestsPerThread 10000 - - -# NetWare MPM -# ThreadStackSize: Stack size allocated for each worker thread -# StartThreads: Number of worker threads launched at server startup -# MinSpareThreads: Minimum number of idle threads, to handle request spikes -# MaxSpareThreads: Maximum number of idle threads -# MaxThreads: Maximum number of worker threads alive at the same time -# MaxRequestsPerChild: Maximum number of requests a thread serves. It is -# recommended that the default value of 0 be set for this -# directive on NetWare. This will allow the thread to -# continue to service requests indefinitely. - -ThreadStackSize 65536 -StartThreads 250 -MinSpareThreads 25 -MaxSpareThreads 250 -MaxThreads 1000 -MaxRequestsPerChild 0 -MaxMemFree 100 - - -# OS/2 MPM -# StartServers: Number of server processes to maintain -# MinSpareThreads: Minimum number of idle threads per process, -# to handle request spikes -# MaxSpareThreads: Maximum number of idle threads per process -# MaxRequestsPerChild: Maximum number of connections per server process - -StartServers 2 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxRequestsPerChild 0 # From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:31:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:31:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4450 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060327103159.369354FF9BE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:31:55 2006 New Revision: 4450 Log: Functions not in use removed Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 03:04:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 11:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4451 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060327110457.417344FF9CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 04:04:51 2006 New Revision: 4451 Log: Unused function removed Modified: vtigercrm/trunk/data/SugarBean.php (contents, props changed) Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:14:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:14:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4452 - /vtigercrm/trunk/include/listview.php Message-ID: <20060327121407.833574FFA81@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:14:03 2006 New Revision: 4452 Log: File not in use Removed: vtigercrm/trunk/include/listview.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:25:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:25:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4453 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060327122534.1F9EA4FFAA9@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:25:30 2006 New Revision: 4453 Log: echo in related lists has been removed Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Mar 27 05:25:30 2006 @@ -858,9 +858,7 @@ for($i=0; $i<$num_row; $i++) { $rel_tab_id = $adb->query_result($result,$i,"related_tabid"); - echo '
    '.$rel_tab_id.'
    '; - $funtion_name = $adb->query_result($result,$i,"name"); - echo '
    '.$funtion_name.'
    '; + $function_name = $adb->query_result($result,$i,"name"); $label = $adb->query_result($result,$i,"label"); if($rel_tab_id != 0) { @@ -869,13 +867,13 @@ { if($profileActionPermission[$rel_tab_id][3] == 0) { - $focus_list[$label] = $focus->$funtion_name($focus->id); + $focus_list[$label] = $focus->$function_name($focus->id); } } } else { - $focus_list[$label] = $focus->$funtion_name($focus->id); + $focus_list[$label] = $focus->$function_name($focus->id); } } return $focus_list; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:41:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:41:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4454 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060327124133.3CABA4FFAC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:41:28 2006 New Revision: 4454 Log: Removed the unused create_tables() & drop_tables() function as part of code cleanup Ahmed Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:42:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:42:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4455 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060327124229.7E4294FFAC8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:42:25 2006 New Revision: 4455 Log: Removed the unused create_tables() & drop_tables() function as part of code cleanup Ahmed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon Mar 27 05:42:25 2006 @@ -152,13 +152,6 @@ $this->column_fields = getColumnFields('Leads'); } - function create_tables () { - - } - - function drop_tables () { - } - function get_summary_text() { return "$this->firstname $this->lastname"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 05:38:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 13:38:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4456 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060327133828.82BEF4FFB03@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 06:38:23 2006 New Revision: 4456 Log: Unwanted function removed Modified: vtigercrm/trunk/data/SugarBean.php Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 06:01:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:01:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4457 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060327140109.9E3DA4FFB11@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 07:01:03 2006 New Revision: 4457 Log: Junk Code Removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 06:28:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:28:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4458 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060327142846.6D94D4FFB4D@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 07:28:36 2006 New Revision: 4458 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 06:31:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:31:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4459 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327143115.D105D4FFB7D@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 07:31:09 2006 New Revision: 4459 Log: added php5module for loading Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Mon Mar 27 07:31:09 2006 @@ -169,7 +169,7 @@ #LoadModule usertrack_module modules/mod_usertrack.so #LoadModule vhost_alias_module modules/mod_vhost_alias.so #LoadModule ssl_module modules/mod_ssl.so - +LoadModule php5_module "VTIGER_HOME/php/php5apache2.dll" # # ExtendedStatus controls whether Apache will generate "full" status # information (ExtendedStatus On) or just basic information (ExtendedStatus From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 06:32:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:32:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4460 - /vtigercrm/trunk/modules/SalesOrder/DetailView.php Message-ID: <20060327143257.DE68B4FFB7C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 07:32:53 2006 New Revision: 4460 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/DetailView.php Mon Mar 27 07:32:53 2006 @@ -26,8 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; +global $mod_strings,$app_strings,$theme; $focus = new SalesOrder(); @@ -41,7 +40,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:18:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:18:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4461 - /vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Message-ID: <20060327151826.1221E4FFBDC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:18:22 2006 New Revision: 4461 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Mar 27 08:18:22 2006 @@ -3,13 +3,7 @@ require_once('modules/Orders/SalesOrder.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings,$products_per_page; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -17,11 +11,9 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new SalesOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder"); @@ -133,8 +125,6 @@ } // addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') // Default will place vtiger in the top left corner function addImage( $logo_name, $location=array('10','10','0','0') ) { if($logo_name)//error checking just in case, by OpenCRM @@ -175,38 +165,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -343,11 +306,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -377,14 +338,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -563,7 +516,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:19:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:19:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4462 - in /vtigercrm/trunk/install: 3confirmConfig.php 5createTables.inc.php 5createTables.php Message-ID: <20060327151910.9D7F44FFBDC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:19:04 2006 New Revision: 4462 Log: junk code removed Modified: vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/5createTables.inc.php vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Mon Mar 27 08:19:04 2006 @@ -24,7 +24,6 @@ require_once('include/logging.php'); require_once('modules/Leads/Lead.php'); require_once('modules/Settings/FileStorage.php'); -//require_once('modules/imports/Headers.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Accounts/Account.php'); require_once('modules/Potentials/Opportunity.php'); @@ -32,7 +31,6 @@ require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Users/User.php'); -require_once('modules/Import/SugarFile.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/TabMenu.php'); @@ -59,79 +57,6 @@ echo $msg; } } - -/* -function createSchemaTable() { - global $log; - - // create the schema tables - $query = "CREATE TABLE modules (id int(11) NOT NULL auto_increment, name text,PRIMARY KEY ( ID ))"; - - $this->query($query); -} - -function createObjectTable() { - global $log; - - // create the object tables - $query = "CREATE TABLE objects (module_id int(11), name text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -function createAttributesTable() { - global $log; - - // create the attributes tables - $query = "CREATE TABLE attributes (module_id int(11), object_name text, name text, PRIMARY KEY ( module_id, object_name ))"; - // fk module_id, object_name -> object table. - - $this->query($query); -} - -function createLabelsTable() { - global $log; - - // create the translation tables - $query = "CREATE TABLE labels (module_id int(11), name text, value text, value_long text, value_popup text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -// drop old tables if table exists and told to drop it -function drop_table_install(&$focus) { - global $log, $db; - - $result = $db->requireSingleResult("SHOW TABLES LIKE '".$focus->table_name."'"); - - if (!empty($result)) { - $focus->drop_tables(); - $log->info("Dropped old ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Did not need to drop old ".$focus->table_name." table. It doesn't exist."); - return 0; - } -} - -// create new tables if they don't exist. -function create_table_install(&$focus) { - global $log, $db; - - $result = $db->query("SHOW TABLES LIKE '".$focus->table_name."'"); - - if ($db->getRowCount($result) == 0) { - $focus->create_tables(); - $log->info("Created ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Table ".$focus->table_name." already exists."); - return 0; - } -} -*/ function create_default_users() { global $log, $db; @@ -201,27 +126,6 @@ $startTime = microtime(); -$modules = array( - "Contact" - ,"Account" - ,"potential" - ,"Lead" - ,"Tab" - ,"Security" - ,"LoginHistory" - ,"FileStorage" - ,"User" - ,"Tracker" - ,"Activity" - ,"Note" - ,"Email" - ,"SugarFile" - ,"ImportMap" - ,"UsersLastImport" -); - -$focus = 0; - // tables creation eecho("Creating Core tables: "); $success = $db->createTables("schema/DatabaseSchema.xml"); @@ -234,56 +138,12 @@ else eecho("Tables Successfully created.\n"); -eecho ("Creating tables for module: "); -foreach ( $modules as $module ) { - $focus = new $module(); - - /* - if ($db_drop_tables == true ) { - $existed = drop_table_install($focus); - - if ($existed) - echo "Dropped existing ".$focus->table_name." table
    \n"; - else - echo "Table ".$focus->table_name." does not exist
    \n"; - } - - $success = create_table_install($focus); - - if ( $success) { - echo "Created new ".$focus->table_name." table
    \n"; - - if ( $module == "User") - $new_tables = 1; - } - else - echo "Table ".$focus->table_name." already exists
    \n"; - */ - - eecho ("$module"); - $focus->create_tables(); // inserts only rows - eecho (", "); -} -eecho ("Done."); - -/* -if ($new_tables) - create_default_users(); -*/ - -/* -if($success==2) { -*/ - create_default_users(); -//} +create_default_users(); // populate users table $uid = $db->getUniqueID("users"); $sql_stmt1 = "insert into users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')"; $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - -//$sql_stmt1 = "insert into user2role values(1,1)"; -//$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); $role_query = "select roleid from role where rolename='standard_user'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); @@ -309,7 +169,6 @@ require_once('modules/CustomView/PopulateCustomView.php'); // create and Populate PHPBB tables and data -//require_once('include/PopulatePhpBBtables.php'); //create_populate_phpbb(); // populate the db with seed data @@ -321,23 +180,12 @@ // populate forums data global $log, $db; -/* -$db->query("update phpbb_config set config_value='".$admin_email."' where config_name='board_email'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard/images/smiles' where config_name='smilies_path'"); -$db->query("update phpbb_config set config_value='".$server_name."' where config_name='server_name'"); -$db->query("update phpbb_config set config_value='".$server_port."' where config_name='server_port'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard' where config_name='script_path'"); -$curr_time=time(); -$db->query("insert phpbb_config values('board_startdate','".$curr_time."')"); -$db->query("insert phpbb_config values('default_lang', 'english')"); -*/ $endTime = microtime(); $deltaTime = microtime_diff($startTime, $endTime); // populate calendar data -//include("modules/Calendar/admin/scheme.php"); //eecho ("total time: $deltaTime seconds.\n"); ?> Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:21:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:21:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4463 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060327152114.F2B694FFBEB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:21:10 2006 New Revision: 4463 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon Mar 27 08:21:10 2006 @@ -30,10 +30,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $log->debug("Inside Sales Order EditView"); @@ -160,7 +157,6 @@ } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:22:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:22:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4464 - /vtigercrm/trunk/modules/SalesOrder/index.php Message-ID: <20060327152215.6F2424FFBE6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:22:11 2006 New Revision: 4464 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/index.php Modified: vtigercrm/trunk/modules/SalesOrder/index.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/index.php (original) +++ vtigercrm/trunk/modules/SalesOrder/index.php Mon Mar 27 08:22:11 2006 @@ -50,8 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/SalesOrder/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:24:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:24:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4465 - /vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Message-ID: <20060327152441.00DA94FFBEA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:24:37 2006 New Revision: 4465 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Mon Mar 27 08:24:37 2006 @@ -23,22 +23,10 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $current_language,$current_user,$list_max_entries_per_page,$theme,$adb; $current_module_strings = return_module_language($current_language, 'SalesOrder'); - global $list_max_entries_per_page; - global $urlPrefix; - $log = LoggerManager::getLogger('so_list'); - - global $currentModule; - global $theme; - global $adb; - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -56,7 +44,6 @@ } $focus = new SalesOrder(); - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:27:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:27:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4466 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060327152712.4432A4FFBFB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:27:07 2006 New Revision: 4466 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon Mar 27 08:27:07 2006 @@ -16,12 +16,7 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; -global $list_max_entries_per_page; - -global $currentModule; -global $theme; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:28:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:28:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4467 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Message-ID: <20060327152812.53E994FFBFB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:28:06 2006 New Revision: 4467 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Mon Mar 27 08:28:06 2006 @@ -317,8 +317,6 @@ var fldId = getOpenerObj("salesorder_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.salesorder_name.value = product_name; - //window.opener.document.EditView.salesorder_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_so_val'; window.opener.document.EditView.submit(); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:30:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:30:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4468 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060327153040.01BB04FFC08@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:30:36 2006 New Revision: 4468 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Mon Mar 27 08:30:36 2006 @@ -116,18 +116,6 @@ $this->column_fields = getColumnFields('SalesOrder'); } - function create_tables () { - /* - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - */ - - } - - function drop_tables () { - /* - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - } /** Function to get summary text * This function returns name property(ie.,summary text) of the SalesOrder class. @@ -149,13 +137,7 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id; - - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status !='Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:31:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:31:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4469 - /vtigercrm/trunk/modules/SalesOrder/SearchForm.html Message-ID: <20060327153144.390EB4FFC07@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:31:39 2006 New Revision: 4469 Log: unwanted file has been removed Removed: vtigercrm/trunk/modules/SalesOrder/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 17:29:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 01:29:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4470 - /vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Message-ID: <20060328012923.385AC4E9B3B@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 18:29:19 2006 New Revision: 4470 Log: Fixed date formatting. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Mon Mar 27 18:29:19 2006 @@ -59,7 +59,7 @@ $contactnotesdescription = $_POST['ContactNotesdescription']; -$date_var = date('YmdHis'); +$date_var = $adb->formatDate(date('YmdHis')); if(($acctname != '') && ($lastname != '')) { @@ -67,7 +67,7 @@ $account_id = $adb->getUniqueID("crmentity"); $idholderaccount = $account_id; - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$account_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Accounts','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$account_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Accounts','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertacct = "insert into account(accountid,accountname,phone,website) values(".$account_id.",'".$acctname."','".$acctphone."','".$acctwebsite ."')"; @@ -84,7 +84,7 @@ { $accountnote_id = $adb->getUniqueID("crmentity"); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$accountnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$accountnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertnote = "insert into notes(notesid,title,notecontent) values(".$accountnote_id.",'".$acctnotesname."','".$acctnotesdescription ."')"; @@ -102,7 +102,7 @@ $contact_id = $adb->getUniqueID("crmentity"); $idholdercontact = $contact_id; - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contact_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Contacts','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contact_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Contacts','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); @@ -113,7 +113,7 @@ $adb->query("insert into contactaddress (contactaddressid, mailingstreet, otherstreet, mailingcity, othercity, mailingstate, otherstate, mailingzip, otherzip, mailingcountry, othercountry) values(".$contact_id.", '', '', '".$mailingcity."', '', '".$mailingstate."', '', '".$mailingcode."', '', '".$mailingcountry."', '')"); - $adb->query("insert into contactsubdetails (contactsubscriptionid, homephone, leadsource, otherphone, birthday, assistant, assistantphone) values(".$contact_id.", '', '--None--', '', '', '', '')"); + $adb->query("insert into contactsubdetails (contactsubscriptionid, leadsource) values(".$contact_id.", '--None--')"); $adb->query("insert into contactscf (contactid) values(".$contact_id.")"); @@ -121,7 +121,7 @@ { $contactnote_id = $adb->getUniqueID("crmentity"); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contactnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contactnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertnote = "insert into notes(notesid,contact_id,title,notecontent) values(".$contactnote_id.",".$contact_id.",'".$contactnotesname."','".$contactnotesdescription ."')"; @@ -230,7 +230,7 @@ $id = $adb->getUniqueID("crmentity"); $type = $_POST['appointment']; - $sql= "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Activities','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql= "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Activities','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:01:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:01:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4471 - /vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Message-ID: <20060328030124.937644E8FFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:01:20 2006 New Revision: 4471 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Mar 27 20:01:20 2006 @@ -3,13 +3,7 @@ require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -21,7 +15,6 @@ $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new Order(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); @@ -175,38 +168,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -343,11 +309,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -377,14 +341,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -562,7 +518,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:03:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:03:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4472 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060328030316.1D04E4E8FFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:03:12 2006 New Revision: 4472 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Mon Mar 27 20:03:12 2006 @@ -26,8 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; +global $mod_strings,$app_strings,$theme,$profile_id; $focus = new Order(); @@ -41,7 +40,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -79,7 +77,6 @@ $smarty->assign("DELETE","permitted"); //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 19:05:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:05:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.5e6d937f73bafdb44025a0e7f2c23c53@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4473]) all fields go blank on mysql 4.1, reverting r4395. refs #63, reopen #63 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:05:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:05:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4473 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060328030547.5C8294E978E@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 27 20:05:45 2006 New Revision: 4473 Log: all fields go blank on mysql 4.1, reverting r4395. refs #63, reopen #63 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Mar 27 20:05:45 2006 @@ -439,18 +439,7 @@ } $tabid= getTabid($module); - // MWC -- Fix hidden field saving issue - // $sql = "select * from field where tabid=" . $tabid . " and tablename='" . $table_name . "' and displaytype in (1,3)"; - $sql = "select * from field - inner join profile2field on profile2field.fieldid=field.fieldid - inner join def_org_field on def_org_field.fieldid=field.fieldid - where field.tabid=" . $tabid . " - and field.tablename='" . $table_name . "' - and field.displaytype in (1,3) - and profile2field.visible=0 - and def_org_field.visible=0 - and profile2field.profileid=" . $profile_id . " - order by sequence"; + $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -930,16 +919,7 @@ } $tabid = getTabid($module); - // MWC -- Fix hidden field saving issue - // $sql1 = "select * from field where tabid=" . $tabid; - $sql1 = "select * from field - inner join profile2field on profile2field.fieldid=field.fieldid - inner join def_org_field on def_org_field.fieldid=field.fieldid - where field.tabid=" . $tabid . " - and profile2field.visible=0 - and def_org_field.visible=0 - and profile2field.profileid=" . $profile_id . " - order by sequence"; + $sql1 = "select * from field where tabid=".$tabid; $result1 = $adb->query($sql1); $noofrows = $adb->num_rows($result1); for($i=0; $i<$noofrows; $i++) From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 19:07:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:07:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.bc7449142b65334dceb5af745c12b3dc@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: fixed => * version: 4.2.4rc3 => 4.2.4rc2 * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 19:09:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:09:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.0ace64e79b95e5deccc55f70a99f943b@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:10:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:10:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4474 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060328031050.65F1C4E8AF0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:10:46 2006 New Revision: 4474 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Mon Mar 27 20:10:46 2006 @@ -29,10 +29,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $focus = new Order(); @@ -76,7 +73,6 @@ $focus->column_fields['ship_country']=$vend_focus->column_fields['country']; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:11:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:11:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4475 - /vtigercrm/trunk/modules/PurchaseOrder/index.php Message-ID: <20060328031158.E64C84E8AF0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:11:54 2006 New Revision: 4475 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/index.php Modified: vtigercrm/trunk/modules/PurchaseOrder/index.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/index.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/index.php Mon Mar 27 20:11:54 2006 @@ -50,8 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/PurchaseOrder/ListView.php'); ?> From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 19:13:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:13:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2372=3A_c?= =?utf-8?q?ustom_field-_date?= Message-ID: <076.5f56accc98932b203eae1d831846ecac@vtiger.fosslabs.com> #72: custom field- date --------------------------------+------------------------------------------- Reporter: howsday | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: custom field, date | --------------------------------+------------------------------------------- When created a custom field (date), edit the record will update to today's date instead of a default date or null value. This is very inconvinence when we want to update records (which the date field do not require for that particular contact/clients/potential). For example, i created a custom date field within potentials. Name: sales_closed_100%, only sales_closed as 100% will have date input for that particular field and when we generate monthly sales report, we can easily work out. But if a sales isn't closed and the sales person edit the potential record, it will automatically assign to today's date. The report generated will not be accurate. Please help! -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:15:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:15:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4476 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060328031540.EA3624E9CC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:15:36 2006 New Revision: 4476 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon Mar 27 20:15:36 2006 @@ -22,24 +22,17 @@ require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); -require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -111,7 +104,6 @@ '.$cvHTML; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:16:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:16:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4477 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Message-ID: <20060328031656.906B34E9CC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:16:51 2006 New Revision: 4477 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Mon Mar 27 20:16:51 2006 @@ -318,8 +318,6 @@ var fldId = getOpenerObj("purchaseorder_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.purchaseorder_name.value = product_name; - //window.opener.document.EditView.purchaseorder_id.value = product_id; } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4478 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060328032007.13D054E9C94@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:20:02 2006 New Revision: 4478 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Mar 27 20:20:02 2006 @@ -110,16 +110,6 @@ $this->column_fields = getColumnFields('PurchaseOrder'); } - function create_tables () { - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - } - - function drop_tables () { - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - } - /** Function to get summary text * This function returns name property(ie.,summary text) of the Order class. */ @@ -140,12 +130,7 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id; - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid,activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:21:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:21:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4479 - in /vtigercrm/trunk/modules/PurchaseOrder: PopupSearchForm.html SearchForm.html Message-ID: <20060328032127.53D974E4B0A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:21:23 2006 New Revision: 4479 Log: file has been removed Removed: vtigercrm/trunk/modules/PurchaseOrder/PopupSearchForm.html vtigercrm/trunk/modules/PurchaseOrder/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:50:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:50:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4480 - /vtigercrm/trunk/modules/Invoice/CreatePDF.php Message-ID: <20060328035004.974ED4EB1AE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:49:58 2006 New Revision: 4480 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Mar 27 20:49:58 2006 @@ -3,25 +3,16 @@ require_once('modules/Invoice/Invoice.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; - +global $adb,$app_strings,$products_per_page; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); $currency_symbol = $adb->query_result($result,0,'currency_symbol'); // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new Invoice(); @@ -135,8 +126,6 @@ } // addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') // Default will place vtiger in the top left corner function addImage( $logo_name, $location=array('10','10','0','0') ) { if($logo_name)//error checking just in case, by OpenCRM @@ -177,38 +166,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -345,11 +307,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -379,14 +339,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -564,7 +516,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:51:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:51:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4481 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060328035149.1FFCC4EB359@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:51:44 2006 New Revision: 4481 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Mon Mar 27 20:51:44 2006 @@ -26,9 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; -global $currentModule; +global $mod_strings,$app_strings,$currentModule,$theme; $focus = new Invoice(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { @@ -41,7 +39,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:56:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:56:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4482 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060328035658.AE6924EB7B2@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:56:54 2006 New Revision: 4482 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Mon Mar 27 20:56:54 2006 @@ -32,10 +32,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log; $focus = new Invoice(); $smarty = new vtigerCRM_Smarty(); @@ -142,7 +139,6 @@ $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $num_of_products = getNoOfAssocProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); - //$focus->mode = ''; } if(isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '') { @@ -207,64 +203,27 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { - /*$num_of_products = getNoOfAssocProducts("Quotes",$quote_focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Quotes",$quote_focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $quote_focus->mode); - /*$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($quote_focus->mode,"Quote",$quote_focus); } elseif(isset($_REQUEST['convertmode']) && ($_REQUEST['convertmode'] == 'sotoinvoice' || $_REQUEST['convertmode'] == 'update_so_val')) { - /*$num_of_products = getNoOfAssocProducts("SalesOrder",$so_focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("SalesOrder",$so_focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); - /*$smarty->assign("TAXVALUE", $so_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $so_focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"SalesOrder",$so_focus); } elseif($focus->mode == 'edit') { $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - /*$num_of_products = getNoOfAssocProducts("Invoice",$focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Invoice",$focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"Invoice",$focus); } elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - /*$smarty->assign("ROWCOUNT", $num_of_products); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"",$focus,$num_of_products,$associated_prod); } elseif((isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '') || (isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] != '')) { - /*$smarty->assign("ROWCOUNT", $num_of_products); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); - $InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", "0.000"); - $smarty->assign("ADJUSTMENTVALUE", "0.000"); - $smarty->assign("SUBTOTAL", $InvTotal.".00"); - $smarty->assign("GRANDTOTAL", $InvTotal.".00");*/ $focus->column_fields['txtTax'] = "0.000"; $focus->column_fields['txtAdjustment'] = "0.000"; $focus->column_fields['hdnSubTotal'] = ".00"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:58:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:58:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4483 - /vtigercrm/trunk/modules/Invoice/Forms.php Message-ID: <20060328035832.BE8574EB704@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:58:28 2006 New Revision: 4483 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Forms.php Modified: vtigercrm/trunk/modules/Invoice/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Forms.php (original) +++ vtigercrm/trunk/modules/Invoice/Forms.php Mon Mar 27 20:58:28 2006 @@ -171,53 +171,4 @@ return $the_script; } -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ -/* -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_quote_subject = $mod_strings['Subject']; -$lbl_quote_name = $mod_strings['Quote Name']; -$lbl_so_name = $mod_strings['Sales Order']; -$lbl_prod_name = $mod_strings['Product Name']; -$lbl_acct_name = $mod_strings['Account Name']; -$lbl_type = $mod_strings['Type']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$lbl_change_button_label = $app_strings['LBL_CHANGE_BUTTON_LABEL']; -$user_id = $current_user->id; - -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - $lbl_required_symbol$lbl_quote_subject
    -
    - $lbl_so_name
    -  
    - $lbl_acct_name
    -

    - - - - -EOQ; -$the_form .= get_left_form_footer(); - -$the_form .= get_validate_record_js(); - -return $the_form; -} -*/ ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 19:59:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:59:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4484 - /vtigercrm/trunk/modules/Invoice/index.php Message-ID: <20060328035956.90F684EB014@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:59:52 2006 New Revision: 4484 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/index.php Modified: vtigercrm/trunk/modules/Invoice/index.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/index.php (original) +++ vtigercrm/trunk/modules/Invoice/index.php Mon Mar 27 20:59:52 2006 @@ -42,7 +42,7 @@ -global $theme; +global $theme,$mod_strings; $theme_path="themes/".$theme."/"; @@ -50,9 +50,5 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - - - include ('modules/Invoice/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:01:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4485 - /vtigercrm/trunk/modules/Invoice/Invoice.js Message-ID: <20060328040113.034B14EB645@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:01:09 2006 New Revision: 4485 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Invoice.js Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Mon Mar 27 21:01:09 2006 @@ -165,25 +165,6 @@ return val; } -/* - - -function roundValue(val) { - if (val.indexOf(".")<0) { - val+=".00" - } else { - var dec=val.substring(val.indexOf(".")+1,val.length) - if (dec.length>2) - val=val.substring(0,val.indexOf("."))+"."+dec.substring(0,2) - else if (dec.length==1) - val=val+"0" - } - - return val; -} -*/ - - function copyAddressRight(form) { form.ship_street.value = form.bill_street.value; @@ -347,8 +328,6 @@ var fldId = getOpenerObj("product_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.product_name.value = product_name; - //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4486 - /vtigercrm/trunk/modules/Notes/Save.php Message-ID: <20060328041019.4FAC84EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:10:15 2006 New Revision: 4486 Log: Removed all the Junk & Commented code from the file Modified: vtigercrm/trunk/modules/Notes/Save.php Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:11:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:11:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4487 - /vtigercrm/trunk/modules/Invoice/Invoice.php Message-ID: <20060328041121.8B0A14EA894@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:11:17 2006 New Revision: 4487 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Invoice.php Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Mar 27 21:11:17 2006 @@ -108,12 +108,6 @@ $this->column_fields = getColumnFields('Invoice'); } - function create_tables () { - } - - function drop_tables () { - } - function get_summary_text() { return $this->name; @@ -126,10 +120,6 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:12:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:12:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4488 - /vtigercrm/trunk/modules/Notes/index.php Message-ID: <20060328041211.657F84EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:12:07 2006 New Revision: 4488 Log: Removed all the Unuses & Commented code from the file Modified: vtigercrm/trunk/modules/Notes/index.php Modified: vtigercrm/trunk/modules/Notes/index.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:14:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:14:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4489 - /vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Message-ID: <20060328041458.CC5AB4EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:14:54 2006 New Revision: 4489 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original) +++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Mon Mar 27 21:14:54 2006 @@ -23,22 +23,10 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $app_strings,$current_language,$current_user,$adb,$list_max_entries_per_page,$theme; $current_module_strings = return_module_language($current_language, 'Invoice'); - global $list_max_entries_per_page; - global $urlPrefix; - global $adb; $log = LoggerManager::getLogger('invoice_list'); - - global $currentModule; - global $theme; - - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -56,7 +44,6 @@ } $focus = new Invoice(); - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:18:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:18:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4490 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060328041837.18F084ED8BC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:18:32 2006 New Revision: 4490 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon Mar 27 21:18:32 2006 @@ -25,21 +25,14 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -108,7 +101,6 @@ -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:18:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:18:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4491 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060328041854.875B14ED8BC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:18:50 2006 New Revision: 4491 Log: create table added for security.php Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Mon Mar 27 21:18:50 2006 @@ -125,7 +125,8 @@ } $startTime = microtime(); - +$modules = array("Security"); +$focus=0; // tables creation eecho("Creating Core tables: "); $success = $db->createTables("schema/DatabaseSchema.xml"); @@ -138,6 +139,12 @@ else eecho("Tables Successfully created.\n"); +foreach ( $modules as $module ) +{ + $focus = new $module(); + $focus->create_tables(); +} + create_default_users(); // populate users table From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:23:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:23:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4492 - /vtigercrm/trunk/modules/Invoice/Save.php Message-ID: <20060328042353.3F0CE4F291B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:23:49 2006 New Revision: 4492 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Mon Mar 27 21:23:49 2006 @@ -38,22 +38,15 @@ $focus->mode = $_REQUEST['mode']; } -//$focus->retrieve($_REQUEST['record']); - foreach($focus->column_fields as $fieldname => $val) { if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } } - -//print_r($focus->column_fields); $focus->save("Invoice"); @@ -80,7 +73,6 @@ } $query1 = "delete from invoiceproductrel where invoiceid=".$focus->id; - //echo $query1; $adb->query($query1); } @@ -118,8 +110,7 @@ function updateStk($product_id,$qty,$mode,$ext_prod_arr) { - global $adb; - global $current_user; + global $adb,$current_user; $prod_name = getProductName($product_id); $qtyinstk= getPrdQtyInStck($product_id); if($mode == 'edit') @@ -163,17 +154,13 @@ sendPrdStckMail($product_id,$upd_qty,$prod_name); } - - //$query= "update products set qtyinstock=".$upd_qty." where productid=".$product_id; - //$adb->query($query); //Check for reorder level and send mail } function sendPrdStckMail($product_id,$upd_qty,$prod_name) { - global $current_user; - global $adb; + global $current_user,$adb; $reorderlevel = getPrdReOrderLevel($product_id); if($upd_qty < $reorderlevel) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:26:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:26:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4493 - in /vtigercrm/trunk/modules/Invoice: Popup.html SearchForm.html Message-ID: <20060328042607.442944FD5E6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:26:02 2006 New Revision: 4493 Log: file has been removed Removed: vtigercrm/trunk/modules/Invoice/Popup.html vtigercrm/trunk/modules/Invoice/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:29:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:29:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4494 - /vtigercrm/trunk/modules/Notes/SearchForm.html Message-ID: <20060328042938.348094FD5E6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:29:33 2006 New Revision: 4494 Log: Removed Commented code from the file Modified: vtigercrm/trunk/modules/Notes/SearchForm.html Modified: vtigercrm/trunk/modules/Notes/SearchForm.html ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:38:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:38:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4495 - in /vtigercrm/trunk/modules/PriceBooks: Popup.html SearchForm.html Message-ID: <20060328043841.AEC282BF16B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:38:37 2006 New Revision: 4495 Log: file has been removed Removed: vtigercrm/trunk/modules/PriceBooks/Popup.html vtigercrm/trunk/modules/PriceBooks/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:40:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:40:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4496 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060328044052.24DD44EA6B8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:40:48 2006 New Revision: 4496 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Mon Mar 27 21:40:48 2006 @@ -136,9 +136,6 @@ } } -function set_focus() -{ -} function cancelForm(frm) { window.history.back(); @@ -235,8 +232,6 @@ var fldId = getOpenerObj("vendor_id"); fldName.value = vendor_name; fldId.value = vendor_id; - //window.opener.document.EditView.vendor_name.value = vendor_name; - //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_inventory_pb(listprice, fldname) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:42:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:42:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4497 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060328044251.307AC4EA6B8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:42:46 2006 New Revision: 4497 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon Mar 27 21:42:46 2006 @@ -78,10 +78,7 @@ $button = ''; - $button .= ' '; - $returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id; - $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; return getPriceBookRelatedProducts($query,$focus,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:46:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:46:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4498 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060328044618.9E91E4FE007@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 21:46:13 2006 New Revision: 4498 Log: Removed commented lines Security.php Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Mar 27 21:46:13 2006 @@ -16,7 +16,6 @@ require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -// TabMenu shown in the header page. class Security extends CRMEntity { var $table_name = "role"; @@ -358,7 +357,6 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); - //$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignid','campaign',1,'50','campaignid','Campaign ID',1,0,0,100,4,76,1,'V~M',0,2)"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); @@ -377,9 +375,7 @@ //Ticket Details -- START //Block25 -- Start -// $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'groupname','troubletickets',1,'54','groupname','Group',1,0,0,100,1,1,1)"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')"); - // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'crmid','seticketsrel',1,'59','parent_id','Product Name',1,0,0,100,3,1,1,'V~O')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')"); @@ -432,7 +428,6 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); -// $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'currency','products',1,'1','currency','Currency',1,0,0,100,3,2,1,'V~O')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); @@ -535,8 +530,6 @@ $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')"); -//Priority not needed in events -# $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,1,1,'V~O')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')"); @@ -571,7 +564,6 @@ //Block44-47 $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,null,'BAS')"); -// $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'company_name','vendor',1,'2','company_name','Company Name',1,0,0,100,2,1,1,'V~M')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,null,'BAS')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')"); @@ -599,7 +591,6 @@ //Block48 $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,null,'BAS')"); -// $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'productid','pricebookproductrel',1,'59','product_id','Product Name',1,0,0,100,2,1,1,'I~O')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')"); @@ -621,13 +612,11 @@ $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'currency','quotes',1,'1','currency','Currency',1,0,0,100,7,1,1,'V~O')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')"); -// $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'type','quotes',1,'1','type','Type',1,0,0,100,12,1,1,'V~O')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')"); @@ -671,7 +660,6 @@ //Block57 $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')"); - //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'quoteid','purchaseorder',1,'78','quote_id','Quote Name',1,0,0,100,2,1,1,'I~M')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')"); @@ -679,7 +667,6 @@ $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'type','purchaseorder',1,'1','type','Type',1,0,0,100,9,1,1,'V~O')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')"); @@ -731,9 +718,7 @@ $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorterms','salesorder',1,'1','vendorterms','Vendor Terms',1,0,0,100,5,1,1,'V~O')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')"); - //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorid','salesorder',1,'75','vendor_id','Vendor Name',1,0,0,100,7,1,1,'I~O')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')"); @@ -788,7 +773,6 @@ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')"); -// $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'notes','invoice',1,'1','notes','Notes',1,0,0,100,4,1,1,'V~O')"); //to include contact name field in Invoice-start $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')"); @@ -796,9 +780,7 @@ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')"); - //$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoiceterms','invoice',1,'1','invoiceterms','Invoice Terms',1,0,0,100,7,1,1,'V~O')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')"); -// $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'type','invoice',1,'1','type','Type',1,0,0,100,8,1,1,'V~O')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')"); @@ -961,23 +943,12 @@ $this->db->query("insert into profile2tab values (".$profile4_id.",25,0)"); $this->db->query("insert into profile2tab values (".$profile4_id.",26,0)"); //Inserting into profile2standardpermissions Adminsitrator - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,4,0)"); - + $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,1,0)"); @@ -1089,24 +1060,11 @@ //Insert into Profile 2 std permissions for Sales User //Help Desk Create/Delete not allowed. Read-Only - - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,1,0)"); @@ -1206,7 +1164,7 @@ $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)"); + $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,3,0)"); @@ -1214,23 +1172,12 @@ //Inserting into profile2std for Support Profile // Potential is read-only - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,1,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,2,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,1,0)"); @@ -1330,7 +1277,7 @@ $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)"); + $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,3,0)"); @@ -1338,23 +1285,12 @@ //Inserting into profile2stdper for Profile Guest Profile //All Read-Only - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,0,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,1,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,2,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,4,0)"); - + $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,1,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,2,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,0,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,1,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,2,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,1,1)"); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:47:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:47:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4499 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060328044716.710184FE007@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:47:12 2006 New Revision: 4499 Log: status added for all faq Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:50:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:50:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4500 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060328045059.EFC5E4FE007@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:50:55 2006 New Revision: 4500 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Mon Mar 27 21:50:55 2006 @@ -14,13 +14,8 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; -global $list_max_entries_per_page; -global $currentModule; - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:51:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:51:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4501 - /vtigercrm/trunk/modules/PriceBooks/index.php Message-ID: <20060328045152.1E7174FEB46@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:51:48 2006 New Revision: 4501 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/index.php Modified: vtigercrm/trunk/modules/PriceBooks/index.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/index.php (original) +++ vtigercrm/trunk/modules/PriceBooks/index.php Mon Mar 27 21:51:48 2006 @@ -16,8 +16,6 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/PriceBooks/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:53:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:53:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4502 - /vtigercrm/trunk/modules/PriceBooks/EditView.php Message-ID: <20060328045357.991B34FEE28@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:53:53 2006 New Revision: 4502 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Mon Mar 27 21:53:53 2006 @@ -14,10 +14,7 @@ require_once('modules/PriceBooks/PriceBook.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; +global $app_strings,$mod_strings,$theme; $focus = new PriceBook(); $smarty = new vtigerCRM_Smarty(); @@ -35,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:59:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:59:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4503 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060328045902.2348B4FEC7F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:58:57 2006 New Revision: 4503 Log: changes made for uitype 33 Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Mar 27 21:58:57 2006 @@ -701,6 +701,19 @@ {/foreach} + {elseif $uitype eq 33} +     + {elseif $uitype eq 53}
    "; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    \n"; - echo ""; - echo $this->pref->menulink($callink ."calendar_dayview&t=".$last_day->getYYYYMMDD(),$this->pref->getImage(left,'list'),$last_day->getDate()).""; - echo " ". strftime($mod_strings['LBL_DATE_TITLE'],$from->ts) ." "; - echo ""; - echo $this->pref->menulink($callink ."calendar_dayview&t=".$next_day->getYYYYMMDD(),$this->pref->getImage(right,'list'),$next_day->getDate())."
    "; echo " From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 02:50:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:50:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4138 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060313105033.00B65409C1D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:50:29 2006 New Revision: 4138 Log: getTimeFilterOption() method has been defined and call to getCalendarHeader has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Mon Mar 13 03:50:29 2006 @@ -7,6 +7,7 @@ * @modulegroup appointment * @module calendar_week */ + require_once('modules/Calendar/CalendarCommon.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; $callink = 'index.php?module=Calendar&action='; @@ -20,35 +21,8 @@ echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_APPOINTMENT'], true); echo "\n
    \n"; $t=Date("Ymd"); -?> -
    - - - - - - - - - - '; - $output .= ''; - $output .= ''; - */ - if($module != 'Orders' && $focus->object_name != 'Order') - { - //$output .= ''; - //$output .= ''; + if($i%2 == 0) $row_class = "evenListRow"; + else $row_class = "oddListRow"; + + $product_Detail[$i]['txtProduct'.$i]= $productname; + + if($module != 'PurchaseOrder' && $focus->object_name != 'Order') + { $product_Detail[$i]['qtyInStock'.$i]=$qtyinstock; - } - #$output .= ''; + } $product_Detail[$i]['txtQty'.$i]=$qty; - #$output .=''; $product_Detail[$i]['unitPrice'.$i]=$unitprice; - #$output .= ''; - #$output .= ''; $product_Detail[$i]['txtListPrice'.$i]=$listprice; - #$output .= ''; - #$output .= ''; $product_Detail[$i]['total'.$i]=$total; - #$output .= ''; - $output .= ''; if($i != 1) { - #$output .= ''; + + $product_Detail[$i]['hdnProductId'.$i] = $productid; + $product_Detail[$i]['hdnRowStatus'.$i] = ''; + $product_Detail[$i]['hdnTotal'.$i] = $total; } return $product_Detail; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 00:02:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 08:02:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4417 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060324080227.662434EBC44@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 01:02:16 2006 New Revision: 4417 Log: * Added script function call settotalnoofrows in onBlur of Qty and added onBlur in ListPrice textbox Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Mar 24 01:02:16 2006 @@ -183,9 +183,11 @@
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - -
    -tablename = $calobj->table_name; } + + /** + * Function to get options for time filter combo + * @param $selcriteria -- selected option :: Type string + * Constructs html option tag + * returns html option tag in string format + */ + //Code added by Minnie - Starts + function getTimeFilterOption($selcriteria="") + { + $timefilter = Array("fullday"=>"Full day (24 Hours)", + "workhr"=>"Work hours (8am - 8pm)", + "morningtonoon"=>"Early morning to Noon (12am - 12pm)", + "noontomidnight"=>"Noon to Midnight (12pm - 12am)", + //"custom"=>"Custom" + ); + $thtml = ""; + foreach($timefilter as $FilterKey=>$FilterValue) + { + if($FilterKey == $selcriteria) + { + $thtml .= ""; + }else + { + $thtml .= ""; + } + } + return $thtml; + } + //Code added by Minnie - Ends + Function info() { // global $lang,$tutos,$calpath,$callink,$image_path,$mod_strings; global $lang,$tutos,$calpath,$callink,$image_path,$mod_strings,$adb; @@ -117,40 +122,17 @@ { $mn_name =""; } - echo ""; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($last_week,$next_week,"week",$day_from,$this->pref,$day_to,$m_name,$yy); + echo $calendarheader; echo "'; + // gettin' values + $alphabetical_search_values = & $app_list_strings['alphabetical_search_values']; + /* world alphabets has different count of letters. Plus we can add "special" (multucharacter) values in alphabetical seach bar */ + $count = count($alphabetical_search_values); + + // building alphabetical search bar from array values + for($i =0;$i<=$count;$i++) + $list .= ''; return $list; } From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 20:48:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:48:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.e2a84838d8dea6b536eead99768dab28@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4398]) merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 20:48:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:48:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.2d8fcf11c2c2dc5e7e13ad2f9c46e459@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4398]) merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 20:48:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 04:48:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4398 - in /vtigercrm/branches/4.2: data/CRMEntity.php modules/Potentials/updateRelations.php modules/Users/UserInfoUtil.php schema/DatabaseSchema.xml Message-ID: <20060323044859.D923C4EAD0A@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 21:48:54 2006 New Revision: 4398 Log: merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 Modified: vtigercrm/branches/4.2/data/CRMEntity.php vtigercrm/branches/4.2/modules/Potentials/updateRelations.php vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 21:48:54 2006 @@ -272,7 +272,7 @@ } //This check is done for products. - if($module == 'Products' || $module == 'Notes' || $module =='Faq') + if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'PriceBook' || $module == 'Vendor' || $module == 'Emails') { $vtlog->logthis("module is =".$module,'info'); $ownerid = $current_user->id; Modified: vtigercrm/branches/4.2/modules/Potentials/updateRelations.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/updateRelations.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/updateRelations.php Wed Mar 22 21:48:54 2006 @@ -15,8 +15,9 @@ //if($_REQUEST['module']=='Users') // $sql = "insert into salesmanactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; //else +if($_REQUEST['module']=='Potentials') $sql = "insert into contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; -$adb->query($sql); +else $sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; $adb->query($sql); header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parid"]); Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Wed Mar 22 21:48:54 2006 @@ -571,6 +571,7 @@ global $adb; $sqldelete = "delete from activitygrouprelation where activityid=".$activityid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')"; $adb->query($sql); Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Wed Mar 22 21:48:54 2006 @@ -160,7 +160,7 @@ Type=InnoDB modifiedby - + tabid @@ -225,7 +225,7 @@ fieldname - + tabidblockdisplaytype @@ -726,7 +726,6 @@ - @@ -808,10 +807,10 @@ Type=InnoDB accountid - + potentialid - + sales_stageType=InnoDB @@ -845,7 +844,7 @@ - + @@ -945,7 +944,7 @@ activityidsubject - + activitytypedate_start @@ -957,10 +956,10 @@ date_starttime_start - + eventstatus - + statuseventstatus @@ -1003,7 +1002,7 @@ Type=InnoDB - + attachmentsid @@ -1044,7 +1043,7 @@ Type=InnoDB crmid - + attachmentsidcrmid @@ -1180,7 +1179,7 @@ - + @@ -1582,7 +1581,7 @@ - + @@ -1757,7 +1756,7 @@ ticketid - + status @@ -1788,6 +1787,7 @@ + @@ -2381,6 +2381,7 @@ + @@ -3033,7 +3034,7 @@ - + Type=InnoDB @@ -3572,7 +3573,7 @@ - + profileidtabid @@ -3607,11 +3608,11 @@ tabidfieldname - + tabidprofileid - + visibleprofileid @@ -3657,10 +3658,10 @@ tabidfieldid - + tabid - + visiblefieldid @@ -3793,7 +3794,7 @@ - + relation_id @@ -4050,10 +4051,10 @@ - + quotestage - + potentialid @@ -4799,10 +4800,10 @@ - + - + cvid @@ -4873,6 +4874,7 @@
    "; - echo ""; - echo ""; - echo "\n"; - echo ""; - echo "
    \n"; - echo ""; - echo $this->pref->menulink($callink ."calendar_weekview&t=".$last_week,$this->pref->getImage(left,'list'),$mod_strings['LBL_LAST_WEEK']) .""; - echo $mod_strings['LBL_WEEK'] ." of " . $m_name . " ".$day_from." to ".$mn_name.$day_to." ". $yy ." "; - echo ""; - echo $this->pref->menulink($callink ."calendar_weekview&t=".$next_week,$this->pref->getImage(right,'list') ,$mod_strings['LBL_NEXT_WEEK']) ."
    "; echo "
    "; - echo " -
    - Time filter : - -
    "; + echo "
    "; + echo "Time filter : "; + echo "
    "; echo "
    "; echo ""; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 02:58:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:58:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4139 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060313105846.64925409C4C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:58:42 2006 New Revision: 4139 Log: call to functions getHeaderTab() and getCalendarHeader() has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Mon Mar 13 03:58:42 2006 @@ -1,4 +1,5 @@ \n"; $t=Date("Ymd"); -?> -
    - - - - -
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - -
    -\n"; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($lm,$nm,"month",$ly,$this->pref,$ny,$m_name,$y,$d,$f,$n); + echo $calendarheader; echo " - + {/section} @@ -50,6 +50,7 @@
    "; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "
    \n"; - echo ""; $nm = $m + 1; $ny = $y; if ( $nm == 13 ) @@ -135,22 +109,8 @@ } $m_name = $mod_strings['cal_month_long'][$m]; - - //echo $this->pref->menulink($callink."calendar_monthview&f=".$f."&n=".$n."&m=".$lm."&d=".$d."&y=".$ly,$this->pref->getImage(left,'list'),$mod_strings['LBL_LAST_WEEK']) .""; - - echo $m_name ." ". $y; - - echo ""; - - echo "
    "; echo " From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 03:14:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:14:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4140 - /vtigercrm/trunk/modules/Calendar/CalendarCommon.php Message-ID: <20060313111437.554F3409CB2@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:14:32 2006 New Revision: 4140 Log: CalendarCommon.php has been included Added: vtigercrm/trunk/modules/Calendar/CalendarCommon.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 03:17:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:17:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4141 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060313111748.B0422409CDA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:17:44 2006 New Revision: 4141 Log: in query activity.description has been changed to crmentity.description Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Mon Mar 13 04:17:44 2006 @@ -1976,7 +1976,7 @@ # Second query ( Get Recurring appointments ) # # - $q = "SELECT activity.activityid, activity.subject, activity.activitytype, activity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid"; + $q = "SELECT activity.activityid, activity.subject, activity.activitytype, crmentity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid"; $q.=" where ( activity.activitytype in ('Call','Meeting') AND "; if(!is_admin($current_user)) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 03:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4142 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060313112937.920A3409D30@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:29:31 2006 New Revision: 4142 Log: description column added for profile table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Mon Mar 13 04:29:31 2006 @@ -4011,6 +4011,7 @@ +
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:11:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:11:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4143 - in /vtigercrm/trunk: include/utils/UserInfoUtil.php modules/Users/ListProfiles.php modules/Users/SaveProfile.php Message-ID: <20060313131108.E8CD5409F61@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:10:58 2006 New Revision: 4143 Log: profile listview has been integrated Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php (contents, props changed) vtigercrm/trunk/modules/Users/ListProfiles.php (contents, props changed) vtigercrm/trunk/modules/Users/SaveProfile.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Mar 13 06:10:58 2006 @@ -1890,11 +1890,11 @@ * @param $profilename -- Profile Name:: Type varchar * @param $parentProfileId -- Profile Id:: Type integer */ -function createProfile($profilename,$parentProfileId) +function createProfile($profilename,$parentProfileId,$description) { global $adb; //Inserting values into Profile Table - $sql1 = "insert into profile values('','".$profilename."')"; + $sql1 = "insert into profile values('','".$profilename."','".$description."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/trunk/modules/Users/ListProfiles.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:12:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4144 - /vtigercrm/trunk/modules/Users/ListProfiles.php Message-ID: <20060313131221.3192C409F77@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:12:15 2006 New Revision: 4144 Log: xtpl include statement removed Modified: vtigercrm/trunk/modules/Users/ListProfiles.php Modified: vtigercrm/trunk/modules/Users/ListProfiles.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListProfiles.php (original) +++ vtigercrm/trunk/modules/Users/ListProfiles.php Mon Mar 13 06:12:15 2006 @@ -10,7 +10,6 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('XTemplate/xtpl.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/utils/UserInfoUtil.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4145 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060313131303.6D4CA409F8C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:12:57 2006 New Revision: 4145 Log: new file added for profile listview Added: vtigercrm/trunk/Smarty/templates/UserProfile.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4146 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060313135850.829D040A149@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:58:46 2006 New Revision: 4146 Log: issue in profile has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Mar 13 06:58:46 2006 @@ -39,7 +39,7 @@ Edit {/if}      		{$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    +
    From vtiger-tickets at vtiger.fosslabs.com Mon Mar 13 19:17:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 14 Mar 2006 03:17:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= Message-ID: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Keywords: database postgresql adodb | ---------------------------------------+------------------------------------ Create a branch of source:vtigercrm/branches/4.2, called source:vtigercrm/branches/4.2_postgresql_integration, in which work can be done to remove the mysql-only behavior currently present in vtigercrm-4.2.x. ADODB is designed for transparent multidatabase support, and all issues identified which enable postgresql and other backends to be used should be considered fixed bugs. This branch and eventual merge is intended to serve as a model for source:vtigercrm/trunk to do the same before entering beta status. Please test simultaneously on mysql and postgresql while developing on this branch. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Mar 13 19:21:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 14 Mar 2006 03:21:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.31670f6a911ed2a2c8310af088bd7c00@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4147]) refs #62. Create a branch of vtigercrm/branches/4.2 named vtigercrm/branches/4.2_postgresql_integration. Development on this branch should be merged back to vtigercrm/branches/4.2 as soon as complete, to be included in vtigercrm/tags/vtigercrm-4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 19:21:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 03:21:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4147 - /vtigercrm/branches/4.2_postgresql_integration/ Message-ID: <20060314032128.3C5244AF411@vtiger.fosslabs.com> Author: jeffk Date: Mon Mar 13 20:21:23 2006 New Revision: 4147 Log: refs #62. Create a branch of vtigercrm/branches/4.2 named vtigercrm/branches/4.2_postgresql_integration. Development on this branch should be merged back to vtigercrm/branches/4.2 as soon as complete, to be included in vtigercrm/tags/vtigercrm-4.2.5 Added: vtigercrm/branches/4.2_postgresql_integration/ - copied from r4146, vtigercrm/branches/4.2/ From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 21:45:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 05:45:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4148 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060314054543.1D466438DE1@vtiger.fosslabs.com> Author: richie Date: Mon Mar 13 22:45:38 2006 New Revision: 4148 Log: Data changed to be more subtle Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:04:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:04:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4149 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060314070438.3BAF84D935E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:04:33 2006 New Revision: 4149 Log: mysql5 changes made Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Tue Mar 14 00:04:33 2006 @@ -46,30 +46,30 @@ $table_name="user2role"; $table_name="role2tab"; - $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home','','',1)"); - $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads','','',1)"); - $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials','','',1)"); - $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities','','',1)"); - $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails','','',1)"); - $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk','','',1)"); - $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products','','',1)"); - $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards','','',1)"); - $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq','','',1)"); - $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events','','',1)"); - $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar','','',1)"); - $this->db->query("INSERT INTO tab VALUES (18,'Vendors',0,15,'Vendors','','',1)"); - $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks','','',1)"); - $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,19,'SalesOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice','','',1)"); - $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss','','',1)"); - $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports','','',1)"); - $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns','','',1)"); - $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal','','',1)"); + $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"); // Populate the blocks table $this->db->query("insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)"); @@ -159,52 +159,52 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'phone','account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,'','ADV')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')"); //Added field emailoptout for accounts -- after 4.2 patch2 - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,null,'BAS')"); //Block 11 -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,'','BAS')"); - -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')"); + +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')"); //Block12 -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')"); @@ -215,46 +215,46 @@ //Block13 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'firstname','leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'phone','leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lastname','leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'company','leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'email','leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,'','ADV')"); -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')"); //Block13 -- End //Block15 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')"); //Block15 --End //Block16 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')"); //Block16 -- End @@ -264,64 +264,64 @@ //Contact Details -- START //Block4 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'firstname','contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'phone','contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'lastname','contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'email','contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')"); //Block4 -- End //Block6 - Begin Customer Portal -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,'','ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')"); //Block6 - End Customer Portal //Block 7 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')"); //Block7 -- End //ContactImageInformation - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')"); //Block8 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')"); //Block8 -- End //Contact Details -- END @@ -333,20 +333,20 @@ $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'amount','potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'accountid','potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'closingdate','potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'sales_stage','potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')"); //Block1 -- End //Block3 -- Start - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')"); //Block3 -- End //Potential Details -- END @@ -360,16 +360,16 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); //$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignid','campaign',1,'50','campaignid','Campaign ID',1,0,0,100,4,76,1,'V~M',0,2)"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,'','BAS')"); - -$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')"); + +$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')"); //Campaign entries end @@ -378,24 +378,24 @@ //Block25 -- Start // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'groupname','troubletickets',1,'54','groupname','Group',1,0,0,100,1,1,1)"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'crmid','seticketsrel',1,'59','parent_id','Product Name',1,0,0,100,3,1,1,'V~O')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','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 field values (13,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'title','troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'description','troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')"); //Block25-30 -- End //Ticket Details -- END @@ -405,67 +405,67 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productname','products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcode','products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',0,2,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcategory','products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',0,3,'BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_end_date','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,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,26,1,'D~O~OTH~GE~start_date~Start Date',1,'','BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','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 field values (14,".$this->db->getUniqueID("field").",'sales_end_date','products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,26,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,'','BAS')"); - - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')"); + + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,'BAS')"); //Block32 Pricing Information -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,'','BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); // $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'currency','products',1,'1','currency','Currency',1,0,0,100,3,2,1,'V~O')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); //Block 33 stock info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','ADV')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')"); //ProductImageInformation - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')"); //Block 36 Description Info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')"); //Product Details -- END //Note Details -- START //Block17 -- Start -$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,'','BAS')"); +$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'title','notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')"); -$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')"); //Block17 -- End //Note Details -- END @@ -474,14 +474,14 @@ //Block21 -- Start $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',0,2,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,'')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,'')"); @@ -491,75 +491,75 @@ //Task Details --START //Block19 -- Start $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'status','activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,'','BAS')"); -$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,'','BAS')"); - - -$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')"); +$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); + + +$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,'','BAS')"); - - $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')"); + + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')"); //Block19 -- End //Task Details -- END //Event Details --START //Block41-43-- Start $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,'','BAS')"); - - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')"); + + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')"); //Priority not needed in events # $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,1,1,'V~O')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,'','BAS')"); - $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,'','BAS')"); - $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')"); //Block41-43 -- End //Event Details -- END //Faq Details -- START //Block37-40 -- Start -$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,'','BAS')"); +$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')"); //Block37-40 -- End @@ -568,43 +568,43 @@ //Vendor Details --START //Block44-47 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'company_name','vendor',1,'2','company_name','Company Name',1,0,0,100,2,1,1,'V~M')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')"); //Block 46 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','treet','Street',1,0,0,100,1,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','treet','Street',1,0,0,100,1,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'BAS')"); //Block 47 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'BAS')"); //Vendor Details -- END //PriceBook Details Start //Block48 -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'productid','pricebookproductrel',1,'59','product_id','Product Name',1,0,0,100,2,1,1,'I~O')"); - $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')"); //Block50 -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')"); //PriceBook Details End @@ -612,55 +612,55 @@ //Quote Details -- START //Block51 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'currency','quotes',1,'1','currency','Currency',1,0,0,100,7,1,1,'V~O')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')"); // $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'type','quotes',1,'1','type','Type',1,0,0,100,12,1,1,'V~O')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')"); //Block 53 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,'','BAS')"); - -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')"); + +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')"); //Block55 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'BAS')"); //Block 56 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'BAS')"); //Quote Details -- END @@ -668,113 +668,113 @@ //Purchase Order Details -- START //Block57 -$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')"); //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'quoteid','purchaseorder',1,'78','quote_id','Quote Name',1,0,0,100,2,1,1,'I~M')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'type','purchaseorder',1,'1','type','Type',1,0,0,100,9,1,1,'V~O')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')"); //Block 59 -$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')"); //Block61 - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'BAS')"); //Block62 - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'BAS')"); //Purchase Order Details -- END //Sales Order Details -- START //Block63 -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorterms','salesorder',1,'1','vendorterms','Vendor Terms',1,0,0,100,5,1,1,'V~O')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')"); //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorid','salesorder',1,'75','vendor_id','Vendor Name',1,0,0,100,7,1,1,'I~O')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')"); //Block 65 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')"); //Block67 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'BAS')"); //Block68 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'BAS')"); //Sales Order Details -- END @@ -782,58 +782,58 @@ //Invoice Details -- START //Block69 -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')"); // $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'notes','invoice',1,'1','notes','Notes',1,0,0,100,4,1,1,'V~O')"); //to include contact name field in Invoice-start -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')"); //end -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')"); //$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoiceterms','invoice',1,'1','invoiceterms','Invoice Terms',1,0,0,100,7,1,1,'V~O')"); -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')"); // $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'type','invoice',1,'1','type','Type',1,0,0,100,8,1,1,'V~O')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); //Block 71 -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')"); //Block73 - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'BAS')"); //Block74 - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'BAS')"); //Invoice Details -- END @@ -845,10 +845,10 @@ //New Security Start //Inserting into profile table - $this->db->query("insert into profile values ('".$profile1_id."','Administrator')"); - $this->db->query("insert into profile values ('".$profile2_id."','Sales Profile')"); - $this->db->query("insert into profile values ('".$profile3_id."','Support Profile')"); - $this->db->query("insert into profile values ('".$profile4_id."','Guest Profile')"); + $this->db->query("insert into profile values ('".$profile1_id."','Administrator',null)"); + $this->db->query("insert into profile values ('".$profile2_id."','Sales Profile',null)"); + $this->db->query("insert into profile values ('".$profile3_id."','Support Profile',null)"); + $this->db->query("insert into profile values ('".$profile4_id."','Guest Profile',null)"); //Inserting into profile2gloabal permissions $this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',1,0)"); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:35:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:35:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4150 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060314073528.5412F4DE588@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 00:35:24 2006 New Revision: 4150 Log: Form changed from massdelete to selectall Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Tue Mar 14 00:35:24 2006 @@ -28,7 +28,7 @@
    -
    + cvid From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:08:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:08:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4161 - /vtigercrm/trunk/temp/test1/ Message-ID: <20060314090813.6DCBC4098A0@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:08:08 2006 New Revision: 4161 Log: test Removed: vtigercrm/trunk/temp/test1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:09:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:09:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4162 - /vtigercrm/trunk/temp/test/ Message-ID: <20060314090910.D62414097EF@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:09:05 2006 New Revision: 4162 Log: test Removed: vtigercrm/trunk/temp/test/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:22:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:22:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4163 - /vtigercrm/trunk/temp/a.txt Message-ID: <20060314092233.2B4CC4CBE83@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:22:27 2006 New Revision: 4163 Log: test Added: vtigercrm/trunk/temp/a.txt From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:24:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:24:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4164 - /vtigercrm/trunk/temp/a.txt Message-ID: <20060314092426.5C75F4D3BB5@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:24:18 2006 New Revision: 4164 Log: test Modified: vtigercrm/trunk/temp/a.txt Modified: vtigercrm/trunk/temp/a.txt ============================================================================== --- vtigercrm/trunk/temp/a.txt (original) +++ vtigercrm/trunk/temp/a.txt Tue Mar 14 02:24:18 2006 @@ -1,1 +1,8 @@ +djjd +sd +d +d +d ihddhnccn + + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:47:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:47:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4165 - /vtigercrm/tags/TEST0.1/ Message-ID: <20060314094729.14E3D4CE15C@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:47:23 2006 New Revision: 4165 Log: tagging the files for test Added: vtigercrm/tags/TEST0.1/ - copied from r4164, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:58:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:58:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4166 - /vtigercrm/trunk/temp/ Message-ID: <20060314095834.313354D3BBA@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:58:29 2006 New Revision: 4166 Log: test Removed: vtigercrm/trunk/temp/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:00:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:00:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4167 - /vtigercrm/tags/TEST0.1/ Message-ID: <20060314100014.8EB214DEB4C@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 03:00:10 2006 New Revision: 4167 Log: test Removed: vtigercrm/tags/TEST0.1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:25:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:25:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4168 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060314102544.B1B014DE9B7@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:25:40 2006 New Revision: 4168 Log: Removed the GroupName field in Edit View Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Mar 14 03:25:40 2006 @@ -66,7 +66,7 @@ - + @@ -86,14 +86,17 @@ - - + + + + + - - - - {$USER_STATUS_OPTIONS} + + + {$USER_STATUS_OPTIONS} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:30:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:30:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4169 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060314103024.EB5164DEEDC@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:30:21 2006 New Revision: 4169 Log: Groups Associated with the user is fully resolved Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:42:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:42:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4170 - /vtigercrm/trunk/include/utils/GetUserGroups.php Message-ID: <20060314104217.96506438DD2@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:42:13 2006 New Revision: 4170 Log: Fixed the issue in RoleHandling Modified: vtigercrm/trunk/include/utils/GetUserGroups.php Modified: vtigercrm/trunk/include/utils/GetUserGroups.php ============================================================================== --- vtigercrm/trunk/include/utils/GetUserGroups.php (original) +++ vtigercrm/trunk/include/utils/GetUserGroups.php Tue Mar 14 03:42:13 2006 @@ -16,7 +16,7 @@ class GetUserGroups { var $user_groups=Array(); - var $userRole=''; + //var $userRole=''; /** to get all the parent groups of the specified group * @params $groupId --> Group Id :: Type Integer @@ -38,12 +38,16 @@ } } + + //Setting the User Role + $userRole = fetchUserRole($userid); + //echo 'user2group Array
    '; //print_r($this->user_groups); //echo 'user2group Array
    '; //Retreiving from the user2role - $query="select * from group2role where roleid='".$this->userRole."'"; + $query="select * from group2role where roleid='".$userRole."'"; $result = $adb->query($query); $num_rows=$adb->num_rows($result); for($i=0;$i<$num_rows;$i++) @@ -57,13 +61,13 @@ } //Retreiving from the user2rs - $parentRoles=getParentRole($this->userRole); + $parentRoles=getParentRole($userRole); $parentRolelist="("; foreach($parentRoles as $par_rol_id) { $parentRolelist .= "'".$par_rol_id."',"; } - $parentRolelist .= "'".$this->userRole."')"; + $parentRolelist .= "'".$userRole."')"; //echo '
    '.$parentRolelist.'
    '; $query="select * from group2rs where roleandsubid in".$parentRolelist; $result = $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:44:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:44:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4171 - /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Message-ID: <20060314104449.69CB5438DD2@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:44:45 2006 New Revision: 4171 Log: Fixed the issue in RoleHandling when calling GetUserGroups Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Mar 14 03:44:45 2006 @@ -43,7 +43,7 @@ $user_role_info=getRoleInformation($user_role); $user_role_parent=$user_role_info[$user_role][1]; $userGroupFocus=new GetUserGroups(); - $userGroupFocus->userRole=$user_role; + //$userGroupFocus->userRole=$user_role; $userGroupFocus->getAllUserGroups($userid); $subRoles=getRoleSubordinates($user_role); $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 03:23:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 11:23:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4172 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060314112324.AFF984DCC1D@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 04:23:20 2006 New Revision: 4172 Log: Modified fetchUserGroupsIds Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Mar 14 04:23:20 2006 @@ -13,6 +13,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +require_once('include/utils/GetUserGroups.php'); include('config.php'); global $log; @@ -69,17 +70,11 @@ function fetchUserGroupids($userid) { global $adb; - $sql= "select users2group.groupid from users2group inner join groups on groups.groupid=users2group.groupid where userid=" .$userid; - $result = $adb->query($sql); - //code changed to return a list of groups related to the userid as comma seperated - if($adb->num_rows($result)!=0) - { - for($i=0;$i<$adb->num_rows($result);$i++) - $groupid[]= $adb->query_result($result,$i,"groupid"); - - $groupidlists = implode (",",$groupid); - } - return $groupidlists; + $focus = new GetUserGroups(); + $focus->getAllUserGroups($userid); + $groupidlists = implode(",",$focus->user_groups); + return $groupidlists; + } /** Function to load all the permissions From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:40:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:40:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4173 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060314124034.9391A4CE1E7@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:40:30 2006 New Revision: 4173 Log: Removed the Hyperlink in the Role field value for users other than admin Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:52:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:52:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4174 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060314125248.941454DE60D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:52:44 2006 New Revision: 4174 Log: Updated the Role,Status, & Currency field to Readonly for standard users Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Mar 14 05:52:44 2006 @@ -165,9 +165,24 @@ $status .= "\n"; $smarty->assign("USER_STATUS_OPTIONS", $status); - - - $ROLE_SELECT_OPTION = '\n"; + $smarty->assign("USER_STATUS_OPTIONS", $status); + +} + +if (is_admin($current_user)) { + + $ROLE_SELECT_OPTION = ''; } if($focus->id != '') { @@ -201,7 +216,7 @@ - +if (is_admin($current_user)) { $GROUP_SELECT_OPTION = ''; $smarty->assign("GROUP_NAME", $GROUP_SELECT_OPTION); + } + +if (is_admin($current_user)) { + $CURRENCY_SELECT_OPTION = ''; +} - $CURRENCY_SELECT_OPTION = ''; $smarty->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION); -} + $smarty->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view)); $smarty->assign("CLOUD_TAG", $focus->tagcloud); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:59:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:59:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4175 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060314125918.11C574E02B7@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:59:15 2006 New Revision: 4175 Log: Shout Box Removed from Homepage Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Mar 14 05:59:15 2006 @@ -125,7 +125,7 @@ - - - @@ -94,7 +92,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:39:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:39:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4151 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060314073932.1B84B40A89C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 00:39:28 2006 New Revision: 4151 Log: Added id = 'parent_id' & id = return_module as well as closed the form tag Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Mar 14 00:39:28 2006 @@ -15,10 +15,10 @@ - + - + {if $MODULE eq 'Activities'} @@ -62,4 +62,4 @@ {elseif $MODULE eq 'HelpDesk'} {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:39:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:39:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4152 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060314073952.3BD2D40A89C@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:39:48 2006 New Revision: 4152 Log: mysql5 query support added Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Tue Mar 14 00:39:48 2006 @@ -30,11 +30,11 @@ { if($val != '') { - $adb->query("insert into ".$tableName. " values('','".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values('','--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); } $i++; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:40:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:40:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4153 - /vtigercrm/trunk/modules/Reports/PopulateReports.php Message-ID: <20060314074013.B0A08415CF7@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:40:09 2006 New Revision: 4153 Log: mysql5 query support added Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/PopulateReports.php (original) +++ vtigercrm/trunk/modules/Reports/PopulateReports.php Tue Mar 14 00:40:09 2006 @@ -418,7 +418,7 @@ global $adb; $sql = "INSERT INTO reportfolder "; $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES ('','".$fldrname."','".$fldrdescription."','SAVED')"; + $sql .= "VALUES (null,'".$fldrname."','".$fldrdescription."','SAVED')"; $result = $adb->query($sql); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:40:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:40:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4154 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060314074052.1C722438DD2@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:40:48 2006 New Revision: 4154 Log: mysql5 query support added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Tue Mar 14 00:40:48 2006 @@ -425,7 +425,7 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')"); //Block32 Pricing Information @@ -482,8 +482,8 @@ $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,'')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,'')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End //Email Details -- END From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 23:59:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:59:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4155 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060314075904.211B94D3BAF@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:59:00 2006 New Revision: 4155 Log: mysql5 support added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 00:16:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 08:16:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4156 - /vtigercrm/trunk/modules/Users/LoginHistory.php Message-ID: <20060314081653.61B844CE15D@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 01:16:49 2006 New Revision: 4156 Log: mysql5 support Modified: vtigercrm/trunk/modules/Users/LoginHistory.php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/LoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/LoginHistory.php Tue Mar 14 01:16:49 2006 @@ -98,7 +98,7 @@ function user_login(&$usname,&$usip,&$intime) { //print("GS --> intime=".$intime); - $query = "Insert into loginhistory values ('','$usname','$usip','',".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4157 - /vtigercrm/trunk/temp/ Message-ID: <20060314090307.8F5194D3BC0@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:02:44 2006 New Revision: 4157 Log: test Added: vtigercrm/trunk/temp/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:05:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:05:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4158 - /vtigercrm/trunk/temp/test/ Message-ID: <20060314090521.EACB04097AC@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:05:18 2006 New Revision: 4158 Log: test Added: vtigercrm/trunk/temp/test/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:06:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:06:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4159 - /vtigercrm/trunk/temp/test1/ Message-ID: <20060314090637.837C64097EF@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:06:32 2006 New Revision: 4159 Log: test Added: vtigercrm/trunk/temp/test1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 01:06:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:06:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4160 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060314090652.C48224097EF@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 02:06:47 2006 New Revision: 4160 Log: start and end date default values set Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Tue Mar 14 02:06:47 2006 @@ -5276,10 +5276,10 @@ - + - +
    *{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_USER_ROLE}{$USER_ROLE} {$UMOD.LBL_GROUP_NAME}{$GROUP_NAME}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
    *{$UMOD.LBL_EMAIL}*{$UMOD.LBL_STATUS}*{$UMOD.LBL_STATUS} 
     
      
    + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:21:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:21:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4182 - in /vtigercrm/trunk/install: 1checkSystem.php 2setConfig.php Message-ID: <20060314152127.C1EDC4E2C25@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:21:17 2006 New Revision: 4182 Log: config file name changed Modified: vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:24:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:24:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4183 - /vtigercrm/trunk/config.php Message-ID: <20060314152404.4590C4E2C22@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:23:59 2006 New Revision: 4183 Log: contents modified for mutilple packaging support Modified: vtigercrm/trunk/config.php Modified: vtigercrm/trunk/config.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:42:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:42:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4184 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060314154227.6BE1D4E2C4E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:42:22 2006 New Revision: 4184 Log: Removed the form ending tag Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Mar 14 08:42:22 2006 @@ -62,4 +62,4 @@ {elseif $MODULE eq 'HelpDesk'} {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:04:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 17:04:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4185 - /vtigercrm/trunk/config.inc.php Message-ID: <20060314170435.5E2FC4E2CF8@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 10:04:30 2006 New Revision: 4185 Log: file checked in with no contents Modified: vtigercrm/trunk/config.inc.php Modified: vtigercrm/trunk/config.inc.php ============================================================================== --- vtigercrm/trunk/config.inc.php (original) +++ vtigercrm/trunk/config.inc.php Tue Mar 14 10:04:30 2006 @@ -1,71 +1,0 @@ - From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:11:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 17:11:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4186 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060314171101.5B7094E2D1B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 10:10:57 2006 New Revision: 4186 Log: updated for utils path Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Tue Mar 14 10:10:57 2006 @@ -39,7 +39,7 @@ require_once('modules/Users/LoginHistory.php'); require_once('modules/Settings/FileStorage.php'); require_once('data/Tracker.php'); -require_once('include/utils.php'); +require_once('include/utils/utils.php'); require_once('modules/Users/Security.php'); // load the config_override.php file to provide default user settings From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 23:24:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 07:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4187 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060315072409.7F6174E33FC@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 00:24:03 2006 New Revision: 4187 Log: Added profile name and description as hidden parameters Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed Mar 15 00:24:03 2006 @@ -34,9 +34,11 @@
    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - elseif($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $global_per_arry = getProfileGlobalPermission($profileId); - //print_r($global_per_arry); - $view_all_per = $global_per_arry[1]; - $edit_all_per = $global_per_arry[2]; - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - - - } - - - -} -elseif($secondaryModule == 'stand_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - //Updating the Edit Save Option - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $act_perr_arry = getTabsActionPermission($profileId); - foreach($act_perr_arry as $tabid=>$action_array) - { - $entity_name = getTabname($tabid); - //Create/Edit Permission - $tab_create_per_id = $action_array['1']; - $tab_create_per = getDisplayValue($tab_create_per_id,$tabid,'1'); - //Delete Permission - $tab_delete_per_id = $action_array['2']; - $tab_delete_per = getDisplayValue($tab_delete_per_id,$tabid,'2'); - //View Permission - $tab_view_per_id = $action_array['4']; - $tab_view_per = getDisplayValue($tab_view_per_id,$tabid,'4'); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - - - } - if($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $act_perr_arry = getTabsActionPermission($profileId); - foreach($act_perr_arry as $tabid=>$action_array) - { - $entity_name = getTabname($tabid); - //Create/Edit Permission - $tab_create_per_id = $action_array['1']; - $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); - //Delete Permission - $tab_delete_per_id = $action_array['2']; - $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); - //View Permission - $tab_view_per_id = $action_array['4']; - $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - -} -elseif($secondaryModule == 'tab_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $tab_perr_array = getTabsPermission($profileId); - $no_of_tabs = sizeof($tab_perr_array); - $i=1; - foreach($tab_perr_array as $tabid=>$tab_perr) - { - $entity_name = getTabname($tabid); - $tab_allow_per_id = $tab_perr_array[$tabid]; - $tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,''); - - if ($i%2==0) +$mode=$_REQUEST['mode']; + +//Global Privileges + +if($mode == 'view') +{ + $global_per_arry = getProfileGlobalPermission($profileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayValue($view_all_per,1); + $privileges_global[]=getGlobalDisplayValue($edit_all_per,2); +} +elseif($mode == 'edit') +{ + $global_per_arry = getProfileGlobalPermission($profileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayOutput($view_all_per,1); + $privileges_global[]=getGlobalDisplayOutput($edit_all_per,2); +} +elseif($mode == 'create') +{ + if($parentProfileId != '') + { + $global_per_arry = getProfileGlobalPermission($parentProfileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayOutput($view_all_per,1); + $privileges_global[]=getGlobalDisplayOutput($edit_all_per,2); + } + else + { + $privileges_global[]=getGlobalDisplayOutput(0,1); + $privileges_global[]=getGlobalDisplayOutput(0,2); + } + +} + +$smarty->assign("GLOBAL_PRIV",$privileges_global); + +//standard privileges +if($mode == 'view') +{ + $act_perr_arry = getTabsActionPermission($profileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayValue($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayValue($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayValue($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } +} +if($mode == 'edit') +{ + $act_perr_arry = getTabsActionPermission($profileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } +} +if($mode == 'create') +{ + if($parentProfileId != '') + { + $act_perr_arry = getTabsActionPermission($parentProfileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } + } + else + { + $act_perr_arry = getTabsActionPermission(1); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput(0,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput(0,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput(0,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } + $act_perr_arry = getTabsActionPermission($parentProfileId); + } + +} +$smarty->assign("STANDARD_PRIV",$privileges_stand); + +//tab Privileges + +if($mode == 'view') +{ + $tab_perr_array = getTabsPermission($profileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } +} +if($mode == 'edit') +{ + $tab_perr_array = getTabsPermission($profileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } +} +if($mode == 'create') +{ + if($parentProfileId != '') + { + $tab_perr_array = getTabsPermission($parentProfileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } + } + else + { + $tab_perr_array = getTabsPermission(1); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput(0,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } + } + +} +$privileges_tab = array_chunk($privileges_tab, 2); +$smarty->assign("TAB_PRIV",$privileges_tab); + +//utilities privileges + +if($mode == 'view') +{ + $act_utility_arry = getTabsUtilityActionPermission($profileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayValue($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } +} +elseif($mode == 'edit') +{ + $act_utility_arry = getTabsUtilityActionPermission($profileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } +} +elseif($mode == 'create') +{ + if($parentProfileId != '') + { + $act_utility_arry = getTabsUtilityActionPermission($parentProfileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } + } + else + { + $act_utility_arry = getTabsUtilityActionPermission(1); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput(0,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } + + } + +} +$smarty->assign("UTILITIES_PRIV",$privilege_util); + +//Field privileges +$modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); +$no_of_mod=sizeof($modArr); +for($i=0;$i<$no_of_mod; $i++) +{ + $fldModule=key($modArr); + $lang_str=$modArr[$fldModule]; + $privilege_fld[]=$fldModule; + next($modArr); +} +$smarty->assign("PRI_FIELD_LIST",$privilege_fld); + +if($mode=='view') +{ + $fieldListResult = getProfile2AllFieldList($modArr,$profileId); + for($i=0; $i"; + } + else + { + $visible = ""; + } + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } +} +elseif($mode=='edit') +{ + $fieldListResult = getProfile2AllFieldList($modArr,$profileId); + for($i=0; $i'; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } +} +elseif($mode=='create') +{ + if($parentProfileId != '') + { + $fieldListResult = getProfile2AllFieldList($modArr,$parentProfileId); + for($i=0; $i'; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; + $mandatory = '*'; + $readonly = 'disabled'; + } + if($fieldListResult[$module_name][$j][3] == 0) + { + $visible = "checked"; } else { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; + $visible = ""; } - $i++; - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - if($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $tab_perr_array = getTabsPermission($profileId); - $no_of_tabs = sizeof($tab_perr_array); - $i=1; - foreach($tab_perr_array as $tabid=>$tab_perr) - { - $entity_name = getTabname($tabid); - $tab_allow_per_id = $tab_perr_array[$tabid]; - $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); - - if ($i%2==0) + $field[]=$mandatory.' '.$fldLabel; + $field[]=''; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } + } + else + { + $fieldListResult = getProfile2AllFieldList($modArr,1); + for($i=0; $i'; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - $i++; - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - - -} -elseif($secondaryModule == 'util_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $i=1; - if($mode == 'view') - { - - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $act_utility_arry = getTabsUtilityActionPermission($profileId); - - foreach($act_utility_arry as $tabid=>$action_array) - { - - $entity_name = getTabname($tabid); - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - $k=1; - $no_of_actions=sizeof($action_array); - foreach($action_array as $action_id=>$act_per) - { - - - $action_name = getActionName($action_id); - $tab_util_act_per = $action_array[$action_id]; - $tab_util_per = getDisplayValue($tab_util_act_per,$tabid,$action_id); - - - - if($k%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - } - else - { - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - if($k == $no_of_actions) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - } - $k++; - - - - - } - - } - - - - - - - } - elseif($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $act_utility_arry = getTabsUtilityActionPermission($profileId); - - foreach($act_utility_arry as $tabid=>$action_array) - { - - $entity_name = getTabname($tabid); - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - $k=1; - $no_of_actions=sizeof($action_array); - foreach($action_array as $action_id=>$act_per) - { - - - $action_name = getActionName($action_id); - $tab_util_act_per = $action_array[$action_id]; - $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); - - - - if($k%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - } - else - { - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - if($k == $no_of_actions) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - } - $k++; - - } - } - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - -} -elseif($secondaryModule == 'field_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfSelectedTab'); - if($mode == 'list') - { - $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendor'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBook'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); - - $no_of_mod=sizeof($modArr); - for($i=0;$i<$no_of_mod; $i++) - { - $fldModule=key($modArr); - $lang_str=$modArr[$fldModule]; - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $i++; - next($modArr); - $fldModule=key($modArr); - $lang_str=$modArr[$fldModule]; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - next($modArr); - } - - - } - elseif($mode=='view') - { - - $fld_module=$_REQUEST['fld_module']; - $xtpl->assign("FIELDMODULE", '  - '.$fld_module.' Field Access'); - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $fieldListResult = getProfile2FieldList($fld_module, $profileId); - $noofrows = $adb->num_rows($fieldListResult); - for($i=0; $i<$noofrows; $i++) - { - $fldLabel= $adb->query_result($fieldListResult,$i,"fieldlabel"); - if($adb->query_result($fieldListResult,$i,"visible") == 0) - { - $visible = ""; - } - else - { - $visible = ""; - } - - if(($i+1)%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - } - - - } - elseif($mode=='edit') - { - $fld_module=$_REQUEST['fld_module']; - $xtpl->assign("FIELDMODULE", '  - '.$fld_module.' Field Access'); - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $fieldListResult = getProfile2FieldList($fld_module, $profileId); - $noofrows = $adb->num_rows($fieldListResult); - for($i=0; $i<$noofrows; $i++) - { - $fldLabel= $adb->query_result($fieldListResult,$i,"fieldlabel"); - $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - $mandatory = ''; - $readonly = ''; - - if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) - { - $mandatory = '*'; - $readonly = 'disabled'; - } - if($adb->query_result($fieldListResult,$i,"visible") == 0) - { - $visible = "checked"; - } - else - { - $visible = ""; - } - - if(($i+1)%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - } - - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); -} - -$xtpl->assign("THEME", $theme); -$xtpl->assign("IMAGE_PATH", $image_path); - -$xtpl->parse("main"); - -$xtpl->out("main"); - + $mandatory = '*'; + $readonly = 'disabled'; + } + $visible = "checked"; + $field[]=$mandatory.' '.$fldLabel; + $field[]=''; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } + } +} + +$smarty->assign("FIELD_PRIVILEGES",$privilege_field); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +if($mode == 'view') + $smarty->display("ProfileDetailView.tpl"); +else + $smarty->display("EditProfile.tpl"); function getGlobalDisplayValue($id,$actionid) { - global $image_path; - if($id == '') - { - $value = ' '; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - else - { - $value = ' '; - } - - return $value; + global $image_path; + if($id == '') + { + $value = ' '; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + else + { + $value = ' '; + } + + return $value; } function getGlobalDisplayOutput($id,$actionid) { - if($actionid == '1') - { - $name = 'view_all'; - } - elseif($actionid == '2') - { - - $name = 'edit_all'; - } - - if($id == '') - { - $value = ''; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - return $value; + if($actionid == '1') + { + $name = 'view_all'; + } + elseif($actionid == '2') + { + + $name = 'edit_all'; + } + + if($id == '' && $id != 0) + { + $value = ''; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + return $value; } function getDisplayValue($id) { - global $image_path; - - if($id == '') - { - $value = ' '; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - else - { - $value = ' '; - } - return $value; + global $image_path; + + if($id == '') + { + $value = ' '; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + else + { + $value = ' '; + } + return $value; } function getDisplayOutput($id,$tabid,$actionid) { - if($actionid == '') - { - $name = $tabid.'_tab'; - } - else - { - $temp_name = getActionname($actionid); - $name = $tabid.'_'.$temp_name; - } - - - - if($id == '') - { - $value = ''; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - return $value; + if($actionid == '') + { + $name = $tabid.'_tab'; + } + else + { + $temp_name = getActionname($actionid); + $name = $tabid.'_'.$temp_name; + } + + + + if($id == '' && $id != 0) + { + $value = ''; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + return $value; } Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue Mar 14 07:22:46 2006 @@ -1320,4 +1320,80 @@ background: url(images/calc_mem_btn.gif) no-repeat; width:25px; } - +/* profile */ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + 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; +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 06:24:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:24:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4179 - in /vtigercrm/trunk: Smarty/templates/CreateProfile.tpl Smarty/templates/CreateProfile1.tpl Smarty/templates/EditProfile.tpl Smarty/templates/ProfileDetailView.tpl modules/Users/CreateProfile1.php Message-ID: <20060314142448.775AD4E1FA4@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:24:39 2006 New Revision: 4179 Log: new files added for profile Added: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (with props) vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (with props) vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/modules/Users/CreateProfile1.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 06:26:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:26:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4180 - /vtigercrm/trunk/modules/Users/CreateProfile.php Message-ID: <20060314142627.101874E2424@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:26:24 2006 New Revision: 4180 Log: new UI for profile has been integrated Modified: vtigercrm/trunk/modules/Users/CreateProfile.php Modified: vtigercrm/trunk/modules/Users/CreateProfile.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 06:32:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:32:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4181 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060314143215.CDC264E26AC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:32:11 2006 New Revision: 4181 Log: issue in profile listview has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Tue Mar 14 07:32:11 2006 @@ -40,7 +40,7 @@ Edit {/if}   - + {/section} @@ -50,6 +50,7 @@ +
    @@ -202,60 +202,6 @@

    - - - - -
    YOUR SHOUT!!!Minimize / Maximize
     
    -
    -
    {if $TAGCLOUD_JS ne ''} From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:14:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 13:14:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4176 - in /vtigercrm/trunk: ./ include/database/ install/ Message-ID: <20060314131420.33BC24C67EE@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 06:14:07 2006 New Revision: 4176 Log: Modifications made for multi-package support Added: vtigercrm/trunk/config.db.php vtigercrm/trunk/config.inc.php vtigercrm/trunk/config.template.php vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/include/database/PearDatabase.php vtigercrm/trunk/index.php (contents, props changed) vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Tue Mar 14 06:14:07 2006 @@ -701,9 +701,9 @@ global $dbconfig, $dbconfigoption; $this->disconnect(); $this->setDatabaseType($dbconfig['db_type']); - $this->setUserName($dbconfig['db_user_name']); + $this->setUserName($dbconfig['db_username']); $this->setUserPassword($dbconfig['db_password']); - $this->setDatabaseHost( $dbconfig['db_host_name']); + $this->setDatabaseHost( $dbconfig['db_hostname']); $this->setDatabaseName($dbconfig['db_name']); $this->dbOptions = $dbconfigoption; $this->enableSQLlog = ($dbconfig['log_sql'] == true); @@ -734,9 +734,9 @@ { $this->disconnect(); $this->setDatabaseType($dbconfig['db_type']); - $this->setUserName($dbconfig['db_user_name']); + $this->setUserName($dbconfig['db_username']); $this->setUserPassword($dbconfig['db_password']); - $this->setDatabaseHost( $dbconfig['db_host_name']); + $this->setDatabaseHost( $dbconfig['db_hostname']); $this->setDatabaseName($dbconfig['db_name']); $this->dbOptions = $dbconfigoption; if($dbconfig['log_sql']) Modified: vtigercrm/trunk/index.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:33:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 13:33:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4177 - /vtigercrm/trunk/install.php Message-ID: <20060314133320.ABB414DEECC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 06:33:12 2006 New Revision: 4177 Log: modified to use it when called from the command line Modified: vtigercrm/trunk/install.php (contents, props changed) Modified: vtigercrm/trunk/install.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 06:22:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:22:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4178 - in /vtigercrm/trunk: Smarty/templates/UserProfile.tpl include/utils/utils.php modules/Users/profilePrivileges.php themes/blue/style.css Message-ID: <20060314142257.CF5194E1BE3@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:22:46 2006 New Revision: 4178 Log: new UI integrated for profiles Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/modules/Users/profilePrivileges.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Tue Mar 14 07:22:46 2006 @@ -8,6 +8,7 @@ + - + {/section} @@ -50,7 +51,6 @@

    @@ -36,10 +37,10 @@
      {if $LIST_ENTRIES[entries].del_permission eq 'yes'} - Edit + Edit {/if}  {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    -
    Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Tue Mar 14 07:22:46 2006 @@ -1005,6 +1005,44 @@ $result = $adb->query($query); return $result; } + +//added by jeri + +function getProfile2FieldPermissionList($fld_module, $profileid) +{ + global $log; + $log->info("in getProfile2FieldList ".$fld_module. ' profile id is '.$profileid); + + global $adb; + $tabid = getTabid($fld_module); + + $query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid; + $result = $adb->query($query); + $return_data=array(); + for($i=0; $i<$adb->num_rows($result); $i++) + { + $return_data[]=array($adb->query_result($result,$i,"fieldlabel"),$adb->query_result($result,$i,"visible"),$adb->query_result($result,$i,"uitype"),$adb->query_result($result,$i,"visible"),$adb->query_result($result,$i,"fieldid")); + } + return $return_data; +} + +function getProfile2AllFieldList($mod_array,$profileid) +{ + global $log; + $log->info("in getProfile2AllFieldList profile id is " .$profileid); + + global $adb; + $profilelist=array(); + for($i=0;$iassign("PROFILEID", $profileId); -$xtpl->assign("PROFILE_NAME", $profileName); +$smarty->assign("PROFILEID", $profileId); +$smarty->assign("PROFILE_NAME", $profileName); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); //Initially setting the secondary selected tab -if(isset($_REQUEST['secmodule']) && $_REQUEST['secmodule'] != '') -{ - $secondaryModule=$_REQUEST['secmodule']; - $mode=$_REQUEST['mode']; - -} -else -{ - - $secondaryModule='global_priv'; - $mode='view'; - -} - -if($secondaryModule == 'global_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $global_per_arry = getProfileGlobalPermission($profileId); - $view_all_per = $global_per_arry[1]; - $edit_all_per = $global_per_arry[2]; - - $output .= '
    View All'.getGlobalDisplayValue($view_all_per,1).'
    Edit All'.getGlobalDisplayValue($edit_all_per,2).'
    View All'.getGlobalDisplayOutput($view_all_per,1).'
    Edit All'.getGlobalDisplayOutput($edit_all_per,2).'
    Create/EditDeleteView
    Entity
    '.$tab_create_per.''.$tab_delete_per.''.$tab_view_per.'
    '.$entity_name.'
    Create/EditDeleteView
    Entity
    '.$tab_create_per.''.$tab_delete_per.''.$tab_view_per.'
    '.$entity_name.'
    '.$tab_allow_per.'
    '.$entity_name.''.$tab_allow_per.'
    '.$tab_allow_per.'
    '.$entity_name.''.$tab_allow_per.'
    '.$entity_name.'
    '.$action_name.''.$tab_util_per.'
    '.$action_name.''.$tab_util_per.'
    '.$entity_name.'
    '.$action_name.''.$tab_util_per.'
    '.$action_name.''.$tab_util_per.'
    '.$mod_strings[$lang_str].'
    '.$mod_strings[$lang_str].'
    '.$fldLabel.''.$visible.'
    '.$fldLabel.''.$visible.'
    '.$mandatory.' '.$fldLabel.'
    '.$mandatory.' '.$fldLabel.'
    {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    - - - + + + + + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 01:29:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:29:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4188 - in /vtigercrm/trunk/modules/Users: createnewgroup.php listgroups.php Message-ID: <20060315092941.52FF54E34FF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:29:34 2006 New Revision: 4188 Log: Groups list and edit view has been smartified Modified: vtigercrm/trunk/modules/Users/createnewgroup.php vtigercrm/trunk/modules/Users/listgroups.php Modified: vtigercrm/trunk/modules/Users/createnewgroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/createnewgroup.php (original) +++ vtigercrm/trunk/modules/Users/createnewgroup.php Wed Mar 15 02:29:34 2006 @@ -14,21 +14,11 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -?> - - - - - - Role Details - - - - -$memberValue) + { + foreach($memberValue as $memberId) + { + if($memberType == 'groups') + { + $memberName=fetchGroupName($memberId); + $memberDisplay="Group::"; + } + elseif($memberType == 'roles') + { + $memberName=getRoleName($memberId); + $memberDisplay="Roles::"; + } + elseif($memberType == 'rs') + { + $memberName=getRoleName($memberId); + $memberDisplay="RoleAndSubordinates::"; + } + elseif($memberType == 'users') + { + $memberName=getUserName($memberId); + $memberDisplay="User::"; + } + $member[]=$memberType.'::'.$memberId; + $member[]=$memberDisplay.$memberName; + } + } + $smarty->assign("MEMBER", array_chunk($member,2)); +} +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); -?> +//for javascript +$smarty->assign("ROLEIDSTR",$roleIdStr); +$smarty->assign("ROLENAMESTR",$roleNameStr); +$smarty->assign("USERIDSTR",$userIdStr); +$smarty->assign("USERNAMESTR",$userNameStr); +$smarty->assign("GROUPIDSTR",$grpIdStr); +$smarty->assign("GROUPNAMESTR",$grpNameStr); - - -
    - - - - - - -
    - - - -
    Settings
    Groups > Add Group
    - -
    -
    - - - - -
    - - -
    Group Details
    +//echo $Err_msg; - - - - - - - - - - - - - +$smarty->assign("GROUPNAME",$groupInfo[0]); - - - - - - - - - - - - - -
    (Use A-Z, a-z, 1-9)
    - -
    Select Members
    		 -
    - - -     		- - - - - - -
    - - -
    - - -
    -     		- -
    -     		(Use CTRL to select multiple)
    Description
    +$smarty->assign("DESCRIPTION",$groupInfo[1]); - - - - - - -
    - - - -
    -
    - -
    - - +$smarty->display("GroupEditView.tpl"); +?> Modified: vtigercrm/trunk/modules/Users/listgroups.php ============================================================================== --- vtigercrm/trunk/modules/Users/listgroups.php (original) +++ vtigercrm/trunk/modules/Users/listgroups.php Wed Mar 15 02:29:34 2006 @@ -11,55 +11,36 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -?> +require_once('include/utils/UserInfoUtil.php'); - - - - Roles List - - - - - -
    - -
    - - -    - -

    - - - - - - -$groupInfo) { - if ($cnt%2==0) - { - $output .= ""; - $output .= ""; - $output .= ""; + + $standCustFld = array(); + $standCustFld['groupid']= $groupId; + $standCustFld['groupname']= $groupInfo[0]; + $standCustFld['description']= $groupInfo[1]; + $return_data[]=$standCustFld; $cnt++; } - echo $output; + +$smarty->assign("LIST_HEADER",$list_header); +$smarty->assign("LIST_ENTRIES",$return_data); +$smarty->assign("PROFILES", $standCustFld); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); + +$smarty->display("ListGroup.tpl"); ?> - -
    "; - } - else - { - $output .= "
    "; - } - $output .=" edit | del ".$groupInfo[0]."".$groupInfo[1]."
    - - From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 01:30:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:30:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4189 - /vtigercrm/trunk/modules/Users/profilePrivileges.php Message-ID: <20060315093010.0488C4E3509@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 02:30:02 2006 New Revision: 4189 Log: Supported latest ui Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Wed Mar 15 02:30:02 2006 @@ -10,11 +10,13 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $profileId=$_REQUEST['profileid']; -$profileName=getProfileName($profileId); +$profileName=''; $parentProfileId=$_REQUEST['parentprofile']; if($_REQUEST['mode'] =='create' && $_REQUEST['radiobutton'] != 'baseprofile') $parentProfileId = ''; + + $smarty = new vtigerCRM_Smarty; $secondaryModule=''; @@ -22,13 +24,40 @@ $output =''; $output1 =''; $smarty->assign("PROFILEID", $profileId); -$smarty->assign("PROFILE_NAME", $profileName); $smarty->assign("MOD", return_module_language($current_language,'Settings')); $smarty->assign("APP", $app_strings); $smarty->assign("CMOD", $mod_strings); +if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '' && $_REQUEST['mode'] == 'create') +{ + $profileName=$_REQUEST['profile_name']; +} +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']); +if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') + $smarty->assign("MODE",$_REQUEST['mode']); + + + + //Initially setting the secondary selected tab $mode=$_REQUEST['mode']; +if($mode == 'create') +{ + $smarty->assign("ACTION",'SaveProfile'); +} +elseif($mode == 'edit') +{ + $smarty->assign("ACTION",'UpdateProfileChanges'); +} + //Global Privileges From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 01:30:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:30:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4190 - in /vtigercrm/trunk/Smarty/templates: GroupEditView.tpl ListGroup.tpl Message-ID: <20060315093026.4A8E94E3516@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:30:19 2006 New Revision: 4190 Log: files added to integrate new UI for groups Added: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 01:34:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:34:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4191 - in /vtigercrm/trunk/modules/Users: SaveProfile.php UpdateProfileChanges.php Message-ID: <20060315093407.487AA4E351D@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 02:34:01 2006 New Revision: 4191 Log: Modified to support latest UI Modified: vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Wed Mar 15 02:34:01 2006 @@ -14,7 +14,6 @@ require_once('include/utils/utils.php'); global $adb; $profileid = $_REQUEST['profileid']; -$secmodule = $_REQUEST['secmodule']; //Retreiving the tabs permission array $tab_perr_result = $adb->query("select * from profile2tab where profileid=".$profileid); @@ -24,8 +23,6 @@ $num_act_per = $adb->num_rows($act_perr_result); $num_act_util_per = $adb->num_rows($act_utility_result); -if($secmodule=='global_priv') -{ //Updating profile2global permissons table $view_all_req=$_REQUEST['view_all']; $view_all = getPermissionValue($view_all_req); @@ -38,11 +35,8 @@ $update_query = "update profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid; $adb->query($update_query); - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=global_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='tab_priv') -{ + + //profile2tab permissions for($i=0; $i<$num_tab_per; $i++) { $tab_id = $adb->query_result($tab_perr_result,$i,"tabid"); @@ -67,12 +61,8 @@ } } } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=tab_priv&mode=view&profileid=".$profileid; - header($loc); - -} -elseif($secmodule=='stand_priv') -{ + + //profile2standard permissions for($i=0; $i<$num_act_per; $i++) { $tab_id = $adb->query_result($act_perr_result,$i,"tabid"); @@ -116,11 +106,8 @@ } } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=stand_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='util_priv') -{ + + //Update Profile 2 utility for($i=0; $i<$num_act_util_per; $i++) { $tab_id = $adb->query_result($act_utility_result,$i,"tabid"); @@ -146,12 +133,29 @@ } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=util_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='field_priv') + + + + $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); + +foreach($modArr as $fld_module => $fld_label) { - $fld_module = $_REQUEST['fld_module']; $fieldListResult = getProfile2FieldList($fld_module, $profileid); $noofrows = $adb->num_rows($fieldListResult); $tab_id = getTabid($fld_module); @@ -178,18 +182,10 @@ $adb->query($update_query); } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=field_priv&mode=view&fld_module=".$fld_module."&profileid=".$profileid; +} + $loc = "Location: index.php?action=profilePrivileges&module=Users&mode=view&profileid=".$profileid; header($loc); -} -/* -//Updating the profile2tab table - -//Updating the profile2standardpermissions table - - -//Updating the profile2utility table - -*/ + function getPermissionValue($req_per) { if($req_per == 'on') @@ -202,8 +198,5 @@ } return $permission_value; } -/* -$loc = "Location: index.php?action=ProfileDetailView&module=Users&fld_module=".$fld_module."&profileid=".$profileid; -header($loc); -*/ + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 01:38:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:38:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4192 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060315093803.B12F04E3529@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:37:59 2006 New Revision: 4192 Log: entry for info_type of field table has been included Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Wed Mar 15 02:37:59 2006 @@ -269,7 +269,7 @@ if(is_numeric($blockid)) { - $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0)"; + $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 02:07:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 10:07:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4193 - in /vtigercrm/trunk/Smarty/templates: GroupEditView.tpl ListGroup.tpl Message-ID: <20060315100748.2897B4E3568@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 03:07:33 2006 New Revision: 4193 Log: issue in group has been fixed Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Mar 15 03:07:33 2006 @@ -120,6 +120,7 @@ + - + {/section} From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 02:53:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 10:53:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4194 - in /vtigercrm/trunk/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat uninstallvtiger.sh Message-ID: <20060315105310.AC6894E35C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 03:53:04 2006 New Revision: 4194 Log: changes made for 5 beta Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat vtigercrm/trunk/pkg/bin/startvTiger.sh vtigercrm/trunk/pkg/bin/stopvTiger.bat vtigercrm/trunk/pkg/bin/uninstallvtiger.sh Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed Mar 15 03:53:04 2006 @@ -43,18 +43,18 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5_alpha -bin\apache -k uninstall -n vtigercrm5_alpha +bin\apache -k stop -n vtigercrm5_beta +bin\apache -k uninstall -n vtigercrm5_beta echo "" echo "" -echo "installing vtigercrm5_alpha apache service" +echo "installing vtigercrm5_beta apache service" echo "" echo "" -bin\apache -k install -n vtigercrm5_alpha -f conf\httpd.conf +bin\apache -k install -n vtigercrm5_beta -f conf\httpd.conf echo "" -echo "Starting vtigercrm5_alpha apache service" +echo "Starting vtigercrm5_beta apache service" echo "" -bin\apache -n vtigercrm5_alpha -k start +bin\apache -n vtigercrm5_beta -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -112,27 +112,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5_alpha database already exists" +echo "check to see if vtigercrm5_beta database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_alpha'" | "%WINDIR%\system32\find.exe" "vtigercrm5_alpha" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_beta'" | "%WINDIR%\system32\find.exe" "vtigercrm5_beta" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5_alpha database exists" +ECHO "vtigercrm5_beta database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5_alpha database does not exist" +ECHO "vtigercrm5_beta database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5_alpha and populate the same" +echo "Proceeding to create database vtigercrm5_beta and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_alpha" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_beta" echo "" -echo "vtigercrm5_alpha database created" +echo "vtigercrm5_beta 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 Wed Mar 15 03:53:04 2006 @@ -111,20 +111,20 @@ fi echo "" -echo "Checking if the vtigercrm5_alpha database already exists" +echo "Checking if the vtigercrm5_beta database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_alpha >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_beta >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5_alpha does not exist. Creating database vtigercrm5_alpha" + echo "Database vtigercrm5_beta does not exist. Creating database vtigercrm5_beta" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_alpha" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_beta" fi host=`hostname` echo "*****************************************************************************************************" if [ $apache_bundled == 'false' ];then - echo "Please access the product at http://${host}:/vtigerCRM5_alpha1/vtigerCRM" + echo "Please access the product at http://${host}:/vtigerCRM5_beta/vtigerCRM" else echo "Please access the product at http://${host}:" echo "*****************************************************************************************************" Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Wed Mar 15 03:53:04 2006 @@ -32,11 +32,11 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm4_5 apache service" +echo "stopping vtigercrm5_beta apache service" echo "" bin\apache -n vtigercrm4_5 -k stop echo "" -echo "uninstalling vtigercrm4_5 apache service" +echo "uninstalling vtigercrm5_beta apache service" echo "" bin\apache -k uninstall -n vtigercrm4_5 rem .\bin\ShutdownApache.exe logs\httpd.pid Modified: vtigercrm/trunk/pkg/bin/uninstallvtiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/uninstallvtiger.sh (original) +++ vtigercrm/trunk/pkg/bin/uninstallvtiger.sh Wed Mar 15 03:53:04 2006 @@ -17,42 +17,42 @@ cd ${PREV_DIR} if [ ${APACHE_STATUS} == "false" ] then - diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5_alpha1/httpd.conf > /dev/null; + diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5_beta/httpd.conf > /dev/null; if [ $? -eq 0 ] then - cp conf/vtigerCRMBackup/vtigerCRM5_alpha1/httpd.vtiger.crm.conf conf/httpd.conf + cp conf/vtigerCRMBackup/vtigerCRM5_beta/httpd.vtiger.crm.conf conf/httpd.conf echo "The httpd.conf file successfully reverted" else - echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5_alpha1/httpd.vtiger.crm.conf. Kindly revert the same manually" + echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5_beta/httpd.vtiger.crm.conf. Kindly revert the same manually" fi - diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5_alpha1/libphp4.so > /dev/null; + diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5_beta/libphp4.so > /dev/null; if [ $? -eq 0 ] then - cp modules/vtigerCRMBackup/vtigerCRM5_alpha1/libphp4.vtiger.crm.so modules/libphp4.so + cp modules/vtigerCRMBackup/vtigerCRM5_beta/libphp4.vtiger.crm.so modules/libphp4.so echo "The libphp4.so file successfully reverted" else - echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5_alpha1/libphp4.vtiger.crm.so. Kindly revert the same manually" + echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5_beta/libphp4.vtiger.crm.so. Kindly revert the same manually" fi cd - - if [ -d $PWD/vtigerCRM5_alpha1 ]; then + if [ -d $PWD/vtigerCRM5_beta ]; then echo "Uninstalling vtigerCRM from the system..." - rm -rf ../conf/vtiger_conf/vtigerCRM5_alpha1 - rm -rf ../modules/vtiger_modules/vtigerCRM5_alpha1 - rm -rf vtigerCRM5_alpha1 + rm -rf ../conf/vtiger_conf/vtigerCRM5_beta + rm -rf ../modules/vtiger_modules/vtigerCRM5_beta + rm -rf vtigerCRM5_beta echo "Uninstallation of vtigerCRM completed" cd ${HOME} fi else cd - - if [ -d $PWD/vtigerCRM5_alpha1 ]; then + if [ -d $PWD/vtigerCRM5_beta ]; then echo "Uninstalling vtigerCRM from the system..." - rm -rf ../conf/vtiger_conf/vtigerCRM5_alpha1 - rm -rf ../modules/vtiger_modules/vtigerCRM5_alpha1 - rm -rf vtigerCRM5_alpha1 + rm -rf ../conf/vtiger_conf/vtigerCRM5_beta + rm -rf ../modules/vtiger_modules/vtigerCRM5_beta + rm -rf vtigerCRM5_beta echo "Uninstallation of vtigerCRM completed" cd ${HOME} fi From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 03:26:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:26:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4195 - in /vtigercrm/trunk/adodb/drivers: adodb-odbc_db2.inc.php adodb-pdo_mssql.inc.php adodb-pdo_mysql.inc.php adodb-pdo_oci.inc.php adodb-pdo_pgsql.inc.php adodb-postgres8.inc.php adodb-sybase_ase.inc.php Message-ID: <20060315112610.628BD4E3612@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:26:01 2006 New Revision: 4195 Log: added for multiple database support Added: vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 03:29:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:29:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4196 - in /vtigercrm/trunk/adodb/lang: adodb-da.inc.php adodb-esperanto.inc.php adodb-uk1251.inc.php Message-ID: <20060315112923.355894E3612@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:29:17 2006 New Revision: 4196 Log: added to support few more languages Added: vtigercrm/trunk/adodb/lang/adodb-da.inc.php vtigercrm/trunk/adodb/lang/adodb-esperanto.inc.php vtigercrm/trunk/adodb/lang/adodb-uk1251.inc.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 03:31:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:31:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4197 - /vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php Message-ID: <20060315113104.BFD474E3620@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:31:00 2006 New Revision: 4197 Log: added for encrypt Added: vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 05:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 13:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4198 - /vtigercrm/trunk/modules/Users/DeleteUser.php Message-ID: <20060315131019.CED684E36EB@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 06:10:14 2006 New Revision: 4198 Log: done handling for roles and groups during use delete Modified: vtigercrm/trunk/modules/Users/DeleteUser.php Modified: vtigercrm/trunk/modules/Users/DeleteUser.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 05:34:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 13:34:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4199 - in /vtigercrm/trunk: Smarty/templates/GroupDetailview.tpl modules/Users/GroupDetailView.php Message-ID: <20060315133418.3FA3A4E3717@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 06:34:10 2006 New Revision: 4199 Log: files added to integrate new UI for groups Added: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl vtigercrm/trunk/modules/Users/GroupDetailView.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 06:38:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 14:38:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4200 - in /vtigercrm/trunk/schema: ./ DatabaseSchema.xml Message-ID: <20060315143856.20D0C4E3750@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 07:38:51 2006 New Revision: 4200 Log: new folder Added: vtigercrm/trunk/schema/ vtigercrm/trunk/schema/DatabaseSchema.xml From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 06:50:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 14:50:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4201 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060315145006.08E094E37B5@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 07:50:01 2006 New Revision: 4201 Log: query changed to state rolename instead of role in the select query Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 15 07:50:01 2006 @@ -190,7 +190,7 @@ } // insert values into user2role table - $role_query = "select roleid from role where name='administrator'"; + $role_query = "select roleid from role where rolename='administrator'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); @@ -285,7 +285,7 @@ //$sql_stmt1 = "insert into user2role values(1,1)"; //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); -$role_query = "select roleid from role where name='standard_user'"; +$role_query = "select roleid from role where rolename='standard_user'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:05:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:05:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4202 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060315150522.7705D4E37E0@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:05:17 2006 New Revision: 4202 Log: Added new label for Email Templates Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:12:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:12:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4203 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060315151217.5082F4E37EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:12:12 2006 New Revision: 4203 Log: Added tpl file for Email Templates List View for New UI & smartification Added: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:12:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:12:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4204 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060315151257.C3A8D4E37EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:12:53 2006 New Revision: 4204 Log: Added tpl file for Email Templates Detail View for New UI & smartification Added: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:17:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:17:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4205 - in /vtigercrm/trunk/modules: MessageBoard/ squirrelmail-1.4.4/ Message-ID: <20060315151707.B835E4E37FD@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:17:03 2006 New Revision: 4205 Log: MessageBoard and squirrelmail folders removed Removed: vtigercrm/trunk/modules/MessageBoard/ vtigercrm/trunk/modules/squirrelmail-1.4.4/ From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:17:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:17:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4206 - /vtigercrm/trunk/modules/Users/deleteemailtemplate.php Message-ID: <20060315151740.B5B1C4E37FD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:17:36 2006 New Revision: 4206 Log: Added idlist & id_array for new delete button functionality in ListView Email Templates tpl Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:26:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:26:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4207 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060315152611.376AF4E3818@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:26:07 2006 New Revision: 4207 Log: Smartification of ListView Email Templates done with modifications in the corr php file Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Wed Mar 15 08:26:07 2006 @@ -10,52 +10,49 @@ * ********************************************************************************/ +require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); -?> - - - -Roles List - - - - - - - - -
    - -
    -
    -

    Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Wed Mar 15 03:07:33 2006 @@ -38,9 +38,9 @@
      - Edit + Edit  {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].groupname} {$LIST_ENTRIES[entries].description} 
    - - - - - query($sql); $temprow = $adb->fetch_array($result); + //echo '
    '; print_r($temprow); echo '
    '; + + $edit="Edit "; $del="Del "; $bar=" | "; $cnt=1; require_once('include/utils/UserInfoUtil.php'); +global $app_strings; +global $app_list_strings; +global $mod_strings; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; + + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); +$smarty->assign("IMAGE_PATH", $image_path); + +$return_data=array(); do { - $name=$temprow["name"]; - if ($cnt%2==0) - printf("",$temprow["templatename"]); - printf("",$temprow["description"]); + $templatearray=array(); + $templatearray['templatename'] = $temprow["templatename"]; + $templatearray['templateid'] = $temprow["templateid"]; + $templatearray['description'] = $temprow["description"]; + $templatearray['foldername'] = $temprow["foldername"]; + $return_data[]=$templatearray; $cnt++; }while($temprow = $adb->fetch_array($result)); +$smarty->assign("TEMPLATES",$return_data); +$smarty->display("ListEmailTemplates.tpl"); + ?> -
    "); - else - printf("
    "); - $templatename = $temprow["templatename"]; - printf("%s%s
    - - From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:27:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:27:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4208 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060315152752.447D24E3810@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:27:48 2006 New Revision: 4208 Log: Smartification of DetailView Email Templates done with modifications in the corr php file Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Wed Mar 15 08:27:48 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); @@ -16,14 +16,21 @@ global $mod_strings; global $app_strings; global $app_list_strings; +global $current_language; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Users/detailviewemailtemplate.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("THEME", $theme); + +$smarty = new vtigerCRM_smarty; + +$smarty->assign("APP", $app_strings); +$smarty->assign("THEME", $theme); +$smarty->assign("UMOD", $mod_strings); +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); +$smarty->assign("IMAGE_PATH", $image_path); if(isset($_REQUEST['templateid']) && $_REQUEST['templateid']!='') { @@ -47,18 +54,16 @@ // $emailtemplateResult = $adb->fetch_array($result); } -$xtpl->assign("FOLDERNAME", $emailtemplateResult["foldername"]); +$smarty->assign("FOLDERNAME", $emailtemplateResult["foldername"]); -$xtpl->assign("TEMPLATENAME", $emailtemplateResult["templatename"]); -$xtpl->assign("DESCRIPTION", $emailtemplateResult["description"]); -$xtpl->assign("TEMPLATEID", $emailtemplateResult["templateid"]); +$smarty->assign("TEMPLATENAME", $emailtemplateResult["templatename"]); +$smarty->assign("DESCRIPTION", $emailtemplateResult["description"]); +$smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]); -$xtpl->assign("SUBJECT", $emailtemplateResult["subject"]); -$xtpl->assign("BODY", nl2br($emailtemplateResult["body"])); +$smarty->assign("SUBJECT", $emailtemplateResult["subject"]); +$smarty->assign("BODY", nl2br($emailtemplateResult["body"])); -$xtpl->parse("main"); -$xtpl->out("main"); - +$smarty->display("DetailViewEmailTemplate.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:29:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:29:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4209 - in /vtigercrm/trunk: Smarty/templates/RoleEditView.tpl modules/Users/createrole.php Message-ID: <20060315152916.B2B1F4E381C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:29:09 2006 New Revision: 4209 Log: new files added for implementing the new UI for role Added: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/modules/Users/createrole.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:33:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4210 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060315153325.297AD4E382B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:33:21 2006 New Revision: 4210 Log: Style changes done to reflect corr changes for new UI of email templates Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Mar 15 08:33:21 2006 @@ -858,8 +858,9 @@ font-size:11px; text-align:left; width:100%; - border-left:1px solid #CCCCCC; + border-left:0px solid #CCCCCC; border-right:0px solid #CCCCCC; + border-collapse: collapse; } .prdTab tr th{ @@ -867,6 +868,7 @@ font-size:11px; text-align:left; border-right:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; padding-left:5px; background-color:#E5E5E5; height:20px; @@ -881,6 +883,7 @@ 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; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:40:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:40:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4211 - /vtigercrm/trunk/themes/blue/images/private.gif Message-ID: <20060315154048.27DAC4E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:40:43 2006 New Revision: 4211 Log: Added private.gif Added: vtigercrm/trunk/themes/blue/images/private.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:41:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:41:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4212 - /vtigercrm/trunk/themes/blue/images/public.gif Message-ID: <20060315154134.4C3614E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:41:29 2006 New Revision: 4212 Log: Added public.gif image for email templates ui Added: vtigercrm/trunk/themes/blue/images/public.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:42:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:42:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4213 - /vtigercrm/trunk/themes/blue/images/ViewTemplate.gif Message-ID: <20060315154220.37BC94E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:42:15 2006 New Revision: 4213 Log: Added image for Detail view email templates ui Added: vtigercrm/trunk/themes/blue/images/ViewTemplate.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:44:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:44:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4214 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060315154441.B4DF24E3841@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:44:37 2006 New Revision: 4214 Log: query fixed for insert with addition of quotes Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 15 08:44:37 2006 @@ -195,7 +195,7 @@ $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); - $sql_stmt1 = "insert into user2role values(".$user->id.",".$role_id.")"; + $sql_stmt1 = "insert into user2role values(".$user->id.",'".$role_id."')"; $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); } @@ -229,8 +229,8 @@ // TODO HTML if($success==0) die("Error: Tables not created. Table creation failed.\n"); -elseif ($success==1) - die("Error: Tables partially created. Table creation failed.\n"); +//elseif ($success==1) +// die("Error: Tables partially created. Table creation failed.\n"); else eecho("Tables Successfully created.\n"); @@ -290,7 +290,7 @@ $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); -$sql_stmt2 = "insert into user2role values(".$uid.",".$role_id.")"; +$sql_stmt2 = "insert into user2role values(".$uid.",'".$role_id."')"; $db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); // create and populate combo tables From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 07:45:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:45:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4215 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060315154541.387274E3853@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:45:37 2006 New Revision: 4215 Log: mysql version check temporarily disabled Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:48:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 18:48:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4216 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060315184840.7C47B4E39BF@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 11:48:33 2006 New Revision: 4216 Log: Handling for Groups and SharingRules when deleting roles is done Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Mar 15 11:48:33 2006 @@ -2276,25 +2276,77 @@ */ function deleteRole($roleId,$transferRoleId) { - global $adb; - $roleInfo=getRoleAndSubordinatesInformation($roleId); - foreach($roleInfo as $roleid=>$roleDetArr) - { - - $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'"; - $adb->query($sql1); - - //Deleteing from role2profile table - $sql2 = "delete from role2profile where roleid='".$roleid."'"; - $adb->query($sql2); - - //delete from role table; - $sql9 = "delete from role where roleid='".$roleid."'"; - $adb->query($sql9); - //echo $sql1.' '.$sql2.' '.$sql9; - } - -} + global $adb; + $roleInfo=getRoleAndSubordinatesInformation($roleId); + foreach($roleInfo as $roleid=>$roleDetArr) + { + + $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'"; + $adb->query($sql1); + + //Deleteing from role2profile table + $sql2 = "delete from role2profile where roleid='".$roleid."'"; + $adb->query($sql2); + + //delete handling for groups + $sql10 = "delete from group2role where roleid='".$roleid."'"; + $adb->query($sql10); + + $sql11 = "delete from group2rs where roleandsubid='".$roleid."'"; + $adb->query($sql11); + + + //delete handling for sharing rules + deleteRoleRelatedSharingRules($roleid); + + //delete from role table; + $sql9 = "delete from role where roleid='".$roleid."'"; + $adb->query($sql9); + //echo $sql1.' '.$sql2.' '.$sql9; + + + + } + +} + +/** Function to delete the role related sharing rules + * @param $roleid -- RoleId :: Type varchar + */ +function deleteRoleRelatedSharingRules($roleId) +{ + global $adb; + $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid', + 'datashare_grp2rs'=>'to_roleandsubid', + 'datashare_role2group'=>'share_roleid', + 'datashare_role2role'=>'share_roleid::to_roleid', + 'datashare_role2rs'=>'share_roleid::to_roleandsubid', + 'datashare_rs2grp'=>'share_roleandsubid', + 'datashare_rs2role'=>'share_roleandsubid::to_roleid', + 'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid'); + + foreach($dataShareTableColArr as $tablename=>$colname) + { + $colNameArr=explode('::',$colname); + $query="select shareid from ".$tablename." where ".$colNameArr[0]."='".$roleId."'"; + if(sizeof($colNameArr) >1) + { + $query .=" or ".$colNameArr[1]."='".$roleId."'"; + } + + + $result=$adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $shareid=$adb->query_result($result,$i,'shareid'); + deleteSharingRule($shareid); + } + + } +} + + /** Function to get userid and username of all users * @returns $userArray -- User Array in the following format: From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 20:18:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4217 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060316041831.231614E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:26 2006 New Revision: 4217 Log: Message changed a bit Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 20:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4218 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060316041843.B57154E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:39 2006 New Revision: 4218 Log: Squirrelmail check removed Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 20:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4219 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060316041855.20C6B4E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:51 2006 New Revision: 4219 Log: Drop tables check removed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 22:04:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:04:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4220 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl SettingsSubMenu.tpl Message-ID: <20060316060437.8FBBA4E4211@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:04:31 2006 New Revision: 4220 Log: field accessibility removed and icon for email templated has been added Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Wed Mar 15 23:04:31 2006 @@ -42,9 +42,7 @@
    		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}
    -{$MOD.LBL_FIELD_ACCESSIBILITY}    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    +    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		  
    -
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    +    		{$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    {$MOD.EMAILTEMPLATES}    		 {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed Mar 15 23:04:31 2006 @@ -14,39 +14,42 @@
    +
    -
    {$MOD.LBL_STUDIO}
    + +
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    +
    - Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Wed Mar 15 23:04:31 2006 @@ -4,8 +4,7 @@ position:absolute; width:155px; background-color:#FFFFFF; - /*opacity:.7; -filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ + filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ border-top:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:2px solid #CCCCCC; @@ -25,7 +24,6 @@ width:140px; height:15px; padding:2px; - /*border-bottom:1px solid #999999;*/ {rdelim} a.mnuSub:Hover @@ -36,13 +34,11 @@ text-align:left; background-color:#E9DCE9; opacity:.7; - /*filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ color:#000000; display:block; width:142px; height:15px; padding:2px; - /*border-bottom:1px solid #999999;*/ {rdelim}
    @@ -68,28 +64,6 @@
    -
    @@ -109,6 +83,7 @@
    +
    + @@ -124,14 +336,14 @@ - - - + @@ -159,215 +371,215 @@ - - - - - - - + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + @@ -393,143 +605,143 @@
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 22:44:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:44:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4221 - /vtigercrm/trunk/modules/Calendar/CalendarCommon.php Message-ID: <20060316064406.A1B6B4E42C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:44:01 2006 New Revision: 4221 Log: functions getSharedUserId(),getSharedCalendarId(),getSharedUserListViewHeader() and getSharedUserListViewEntries() have been defined Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Wed Mar 15 23:44:01 2006 @@ -11,6 +11,7 @@ //Code Added by Minnie -Starts include_once $calpath .'webelements.p3'; include_once $calpath .'permission.p3'; + require_once('include/database/PearDatabase.php'); require_once('modules/Calendar/preference.pinc'); global $calpath,$callink; @@ -21,21 +22,22 @@ $callink = 'index.php?module=Calendar&action='; /** - * Function to get the calendar header tabs + * Create HTML to display calendar header tabs * @param $t -- date :: Type string * @param $view -- view name(day/week/month) :: Type string - * takes date & view name as inputs and construct calendar header tabs - * in html table format and returns the html table in string format. + * Returns the html in string format. */ function getHeaderTab($t,$view) { - $day_selected = $week_selected = $month_selected = "dvtUnSelectedCell"; + $day_selected = $week_selected = $month_selected = $shared_selected = "dvtUnSelectedCell"; if($view == 'day') $day_selected="dvtSelectedCell"; if($view == 'week') $week_selected="dvtSelectedCell"; if($view == 'month') $month_selected="dvtSelectedCell"; + if($view == 'shared') + $shared_selected = "dvtSelectedCell"; $space_class = "dvtTabCache"; $tabhtml = ""; $tabhtml .= << - + @@ -54,6 +56,8 @@ + + @@ -71,7 +75,7 @@ } /** - * Function to get the calendar heading + * Create HTML to display calendar heading for each view * @params $prev,$next,$day_from,$day_to -- date :: Type string * @param $pref -- Object of preference class * @param $view -- view name(day/week/month) :: Type string @@ -80,8 +84,7 @@ * @param $f -- string :: Type string * @param $n -- Numeric representation of a month, without leading zeros :: Type string * $param $d -- Day of the month, 2 digits with leading zeros :: Type string - * constructs calendar heading in html table format - * and returns the html table in string format. + * Returns the html in string format. */ function getCalendarHeader($prev,$next,$view,$day_from,$pref="",$day_to="",$month="",$year="",$d="",$f="",$n="") { @@ -135,5 +138,74 @@ return $headerhtml; } + +/** + * Function to get the lists of sharedids related in calendar sharing of an user + * This function accepts the user id as arguments and + * returns the shared ids related with the user id + * as an array + */ +function getSharedUserId($id) +{ + global $adb; + $query = "SELECT * from sharedcalendar where userid=".$id; + $result = $adb->query($query); + $rows = $adb->num_rows($result); + for($j=0;$j<$rows;$j++) + { + $sharedid[] = $adb->query_result($result,$j,'sharedid'); + } + return $sharedid; +} + +/** + * Function to get the lists of user ids who shared their calendar with an user + * This function accepts the shared id as arguments and + * returns the user ids related with the shared id + * as a comma seperated string + */ +function getSharedCalendarId($sharedid) +{ + global $adb; + $query = "SELECT * from sharedcalendar where sharedid=".$sharedid; + $result = $adb->query($query); + if($adb->num_rows($result)!=0) + { + for($j=0;$j<$adb->num_rows($result);$j++) + $userid[] = $adb->query_result($result,$j,'userid'); + $shared_ids = implode (",",$userid); + } + return $shared_ids; +} + +/** + * Function to get the label for user lists + * Returns the label as an array + */ +function getSharedUserListViewHeader() +{ + global $mod_strings; + $header_label=array($mod_strings['LBL_LIST_NAME'], + $mod_strings['LBL_LIST_USER_NAME'], + ); + return $header_label; +} + +/** + * Function to get the entries for user lists + * This function accepts the shared id as arguments and + * returns the user entries related with the shared id + * as an array + */ +function getSharedUserListViewEntries($sharedid) +{ + global $adb; + $query = "SELECT * from users where id=".$sharedid; + $result =$adb->query($query); + $entries[]=$adb->query_result($result,0,'first_name').' '.$adb->query_result($result,0,'last_name'); + $entries[]=''.$adb->query_result($result,0,'user_name').''; + return $entries; + +} //Code Added by Minnie -Ends ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 22:48:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:48:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4222 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060316064810.74A164E42D5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:48:05 2006 New Revision: 4222 Log: file calendar_share.php has been included for calendar share option Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Wed Mar 15 23:48:05 2006 @@ -10,15 +10,7 @@ - - - From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 22:52:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:52:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4223 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060316065215.09FA74E42E1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:52:11 2006 New Revision: 4223 Log: labels related to calendar sharing have been included Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php 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 Wed Mar 15 23:52:11 2006 @@ -28,6 +28,12 @@ 'LBL_CONTACT'=>'Contact:', 'LBL_SAVE'=>'Save', 'LBL_RESET'=>'Cancel', +'LBL_LIST_USER_NAME'=>'User Name', +'LBL_LIST_NAME'=>'Name', +'LBL_CALENDAR_SHARED'=>'Calendar currently shared with', +'LBL_CALENDAR_SHARING'=>'Share calendar with', +'LBL_SHARING_OPTION'=>'Can see my calendar?', +'LBL_LIST_TOOLS'=>'Tools', 'LBL_CALL' => 'Call', 'LBL_MEET' => 'Meeting', From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 22:57:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:57:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4224 - /vtigercrm/trunk/index.php Message-ID: <20060316065745.1D5704E42EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:57:41 2006 New Revision: 4224 Log: actions updateCalendarSharing and disable_sharing have been added in regular expression match statement Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Wed Mar 15 23:57:41 2006 @@ -402,7 +402,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action)) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:31:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:31:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4225 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060316073136.58DF24E4340@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:31:30 2006 New Revision: 4225 Log: query has been modified to share calendar and unwanted code has been removed Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Thu Mar 16 00:31:30 2006 @@ -29,7 +29,7 @@ include_once 'modules/Calendar/base.pinc'; require_once('include/database/PearDatabase.php'); - //require_once('modules/Calls/Call.php'); + require_once('modules/Calendar/CalendarCommon.php'); /** * options for calendar selection @@ -1890,10 +1890,7 @@ { global $msg,$current_user,$table,$db; - //if ( ! $current_user->feature_ok(usecalendar,PERM_SEE) ) { - // return; - //} - + $shared_ids = getSharedCalendarId($current_user->id,'shared'); $from->setDateTime($from->getYYYYMMDD()); $to->setDateTime($to->getYYYYMMDD()); @@ -1902,10 +1899,6 @@ $to->addDays(1); } - /* - $x1 = DateTime1($from); - $x2 = DateTime1($to); - */ $x1 = sprintf ("%04d-%02d-%02d %02d:%02d:%02d",$from->year,$from->month,$from->day,$from->hour,$from->min,$from->sec); $x2 = sprintf ("%04d-%02d-%02d %02d:%02d:%02d",$to->year,$to->month,$to->day,$to->hour,$to->min,$to->sec); @@ -1944,32 +1937,26 @@ if(!is_admin($current_user)) { - $q .= " ) AND (crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') "; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0)"; $q .= " ORDER by activity.date_start,activity.time_start"; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); $result = $this->db->fetchByAssoc($r); - //print_r($result); - //$o->read_result($r,$a); $o->read_result($result); $a++; if ( $o->see_ok() ) { /* Get all participants */ - //$o->read_participants(); - //print("GS --> see"); $obj->callist[$o->record_id] = &$o; } unset($o); } - // // Query created by Jaguar # @@ -1986,38 +1973,29 @@ $q .= " (recurringdate < '". $sx2 ."' AND recurringdate >= '". $sx1 . "') "; if(!is_admin($current_user)) { - $q .= " ) AND (crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) "; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0 )" ; $q .= " ORDER by recurringid"; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("
    GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); $result = $this->db->fetchByAssoc($r); - //print_r($result); - //$o->read_result($r,$a); $o->read_result($result); $a++; if ( $o->see_ok() ) { /* Get all participants */ - //$o->read_participants(); - //print("GS --> see"); $obj->callist[$o->record_id] = &$o; } unset($o); } - // - // Query created by Jagaur # query ( Get Group activities in the calendar ) # - //if(!is_admin($current_user)) - //{ $q=" Select activity.*,crmentity.*,account.accountname,account.accountid,activitygrouprelation.groupname FROM "; $q.=" activity inner join crmentity on activity.activityid = crmentity.crmid "; $q.=" inner join activitygrouprelation on activitygrouprelation.activityid=activity.activityid"; @@ -2036,11 +2014,9 @@ $q .= " and crmentity.smownerid=0 and users2group.userid=".$current_user->id; $q .= " ORDER by activity.date_start,activity.time_start"; - //echo $q; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); @@ -2052,57 +2028,7 @@ } unset($o); } - //} - // - - /* # - # First query ( non repeating appointments ) - # - $q = "SELECT * FROM ". $this->tablename." WHERE "; - $q .= " ("; - if(!is_admin($current_user)) - { - $q .= " ( "; - } - $q .= " (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - if(!is_admin($current_user)) - { - $q .= " ) AND ( creator = '".$current_user->id."' ) "; - } - $q .= " )"; - $q .= " ORDER by a_start"; - - //print("GS --> allowed ".is_admin($current_user)." q=".$q); - # always at the end of query - # check_dbacl( $q, $current_user->id); - - // srini cal appoint - $r = $this->db->query($q); - $n = $this->db->getRowCount($r); - $a = 0; - //print("GS --> ".$n." q=".$q); - while ( $a < $n ) - { - - $o = &new appointment(); - $result = mysql_fetch_assoc($r); - //$o->read_result($r,$a); - $o->read_result($result); - $a++; - if ( $o->see_ok() ) - { */ - /* Get all participants */ - /* //$o->read_participants(); - //print("GS --> see"); - $obj->callist[$o->id] = &$o; - } - unset($o); - } - //$r->free(); - - */ + $x = new DateTime(); $x->setDateTimeTS($from->ts); @@ -2118,70 +2044,6 @@ $ymd .= $pre ."'". Date("j/n",$x->getTimeStamp()) ."'"; $x->addDays(1); } - # - # Second query ( repeating appointments w/o end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 1 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= " ) AND ( a_start <= ". $x2 ." )"; - $q .= ""; - $q .= " ORDER by a_start"; - - */ - # always at the end of query - # check_dbacl( $q, $current_user->id); - - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - - # - # Third query ( repeating appointments with end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 0 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= ") AND ( (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - $q .= ")"; - $q .= " ORDER by a_start"; - */ - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - return; } /** From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:35:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:35:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4226 - /vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Message-ID: <20060316073510.DA7A04E4344@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:35:06 2006 New Revision: 4226 Log: updateCalendarSharing.php has been added to update the calendar sharing Added: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:36:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:36:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4227 - /vtigercrm/trunk/modules/Calendar/disable_sharing.php Message-ID: <20060316073602.D59C64E434E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:35:58 2006 New Revision: 4227 Log: disable_sharing.php has been added to disable sharing Added: vtigercrm/trunk/modules/Calendar/disable_sharing.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:37:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:37:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4228 - /vtigercrm/trunk/modules/Calendar/calendar_share.php Message-ID: <20060316073737.49C494E434E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:37:33 2006 New Revision: 4228 Log: calendar_share.php for calendar sharing page Added: vtigercrm/trunk/modules/Calendar/calendar_share.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:40:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:40:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4229 - /vtigercrm/trunk/modules/Activities/language/en_us.lang.php Message-ID: <20060316074012.03FF44E4356@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:40:08 2006 New Revision: 4229 Log: label for visibility has been included Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:44:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:44:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4230 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060316074423.8176B4E435E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:44:19 2006 New Revision: 4230 Log: entry for visibility has been added in field table Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Thu Mar 16 00:44:19 2006 @@ -504,6 +504,8 @@ $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,1 + 5,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); @@ -543,6 +545,7 @@ $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')"); $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')"); $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:46:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:46:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4231 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060316074652.7DE5E4E436A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:46:48 2006 New Revision: 4231 Log: visibility_dom array has been included Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:48:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:48:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4232 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060316074846.9AAD44E436A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:48:42 2006 New Revision: 4232 Log: visibility table has been added in $comboTables array Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Mar 16 00:48:42 2006 @@ -43,7 +43,7 @@ function create_tables () { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:52:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:52:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4233 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060316075224.CBB004E4379@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:52:20 2006 New Revision: 4233 Log: sharedcalendar table has been included Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 16 00:52:20 2006 @@ -154,6 +154,13 @@
    Week   Month Share    
    + + + + + +
    + @@ -1020,6 +1027,9 @@ + + + Type=InnoDB From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:53:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:53:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4234 - /vtigercrm/trunk/vtigerlogger.php Message-ID: <20060316075345.6E1524E4377@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 00:53:41 2006 New Revision: 4234 Log: initial version Added: vtigercrm/trunk/vtigerlogger.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:56:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:56:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4235 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060316075655.9BF214E4387@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:56:50 2006 New Revision: 4235 Log: js function DisableSharing has been defined Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Thu Mar 16 00:56:50 2006 @@ -102,3 +102,54 @@ return true; } } + + +function DisableSharing() +{ + + x = document.SharedList.selected_id.length; + idstring = ""; + + if ( x == undefined) + { + + if (document.SharedList.selected_id.checked) + { + document.SharedList.idlist.value=document.SharedList.selected_id.value; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + else + { + xx = 0; + for(i = 0; i < x ; i++) + { + if(document.SharedList.selected_id[i].checked) + { + idstring = document.SharedList.selected_id[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.SharedList.idlist.value=idstring; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + { + document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=index&sel=share"; + } + else + { + return false; + } +} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 00:05:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 08:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4236 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060316080539.003B64E439E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 01:05:36 2006 New Revision: 4236 Log: gshow() a js function has been called on mouse click Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 16 01:05:36 2006 @@ -235,7 +235,7 @@ } for ($column=0;$column<=6;$column++) { - echo "datefilterid From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4246 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060316102824.7FFCB4E44CA@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 03:28:20 2006 New Revision: 4246 Log: changed the default data population for activity table Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:49:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:49:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4247 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060316104943.42AA34E44FC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 03:49:37 2006 New Revision: 4247 Log: broken line fixed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Thu Mar 16 03:49:37 2006 @@ -504,8 +504,7 @@ $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); - $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,1 - 5,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 03:59:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 11:59:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4248 - /vtigercrm/trunk/modules/Users/createemailtemplate.php Message-ID: <20060316115927.613C44E4590@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 04:59:22 2006 New Revision: 4248 Log: Modified the file for smartification of create new Email Template Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/createemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/createemailtemplate.php Thu Mar 16 04:59:22 2006 @@ -9,27 +9,35 @@ * ********************************************************************************/ require_once('database/DatabaseConnection.php'); -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); - - +require_once('data/Tracker.php'); +require_once('include/utils/UserInfoUtil.php'); +require_once('include/database/PearDatabase.php'); global $app_strings; global $app_list_strings; global $mod_strings; global $current_user; +global $current_language; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; +$smod_strings = return_module_language($current_language,'Settings'); require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Users/createemailtemplate.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty = new vtigerCRM_smarty; +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("THEME_PATH", $theme_path); +$smarty->assign("UMOD", $mod_strings); + +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); + +$smarty->display("CreateEmailTemplate.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:00:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:00:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4249 - /vtigercrm/trunk/modules/Users/editemailtemplate.php Message-ID: <20060316120043.06EE84E459E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:00:38 2006 New Revision: 4249 Log: Modified the file for smartification of EditView Email Template Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:06:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:06:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4250 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060316120609.48CC34E45AB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:06:01 2006 New Revision: 4250 Log: Made corr changes in lang file for Email templates Smartification Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:10:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:10:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4251 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060316121004.C06EF4E45AB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:09:52 2006 New Revision: 4251 Log: Added createview tpl file for smartification of new email template ui Added: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:35:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:35:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4252 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060316123532.3C8F74E45EE@vtiger.fosslabs.com> Author: don Date: Thu Mar 16 05:35:27 2006 New Revision: 4252 Log: Delete handling for profiles is done Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 16 05:35:27 2006 @@ -1989,13 +1989,35 @@ $sql7 ="delete from profile2utility where profileid=".$prof_id; $adb->query($sql7); - //updating role2profile - if(isset($transfer_profileid) && $transfer_profileid != '') - { - $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id; - $adb->query($sql8); - } + if(isset($transfer_profileid) && $transfer_profileid != '') + { + + $sql8 = "select roleid from role2profile where profileid=".$prof_id; + $result=$adb->query($sql8); + $num_rows=$adb->num_rows($result); + + for($i=0;$i<$num_rows;$i++) + { + $roleid=$adb->query_result($result,$i,'roleid'); + $sql = "select profileid from role2profile where roleid='".$roleid."'"; + $profresult=$adb->query($sql); + $num=$adb->num_rows($profresult); + if($num>1) + { + $sql10="delete from role2profile where roleid='".$roleid."' and profileid=".$prof_id; + $adb->query($sql10); + } + else + { + $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_ +id." and roleid='".$roleid."'"; + $adb->query($sql8); + } + + + } + } //delete from profile table; $sql9 = "delete from profile where profileid=".$prof_id; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:51:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:51:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4253 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060316145154.BA5684E46FE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:51:50 2006 New Revision: 4253 Log: Modified for Global Search Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 16 07:51:50 2006 @@ -71,12 +71,18 @@ From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:52:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:52:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4254 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060316145249.7A2414E4706@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 07:52:45 2006 New Revision: 4254 Log: additional parameters added to the mysql startup to log slow queries which need to be analyzed later Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Thu Mar 16 07:52:45 2006 @@ -100,7 +100,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:54:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:54:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4255 - /vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Message-ID: <20060316145400.057334E4706@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:53:56 2006 New Revision: 4255 Log: Added for Global Search Added: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:54:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:54:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4256 - /vtigercrm/trunk/pkg/bin/startvTiger.sh Message-ID: <20060316145407.DB7AB4E4706@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 07:54:03 2006 New Revision: 4256 Log: parameters added to the mysqld command to trace slow queries Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.sh (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.sh Thu Mar 16 07:54:03 2006 @@ -96,7 +96,7 @@ echo "" #chown -R nobody . #chgrp -R nobody . - ./bin/mysqld_safe --basedir=$MYSQL_HOME --datadir=$MYSQL_HOME/data --socket=$mysql_socket --tmpdir=$MYSQL_HOME/tmp --user=root --port=$mysql_port --default-table-type=INNODB > /dev/null & + ./bin/mysqld_safe --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --basedir=$MYSQL_HOME --datadir=$MYSQL_HOME/data --socket=$mysql_socket --tmpdir=$MYSQL_HOME/tmp --user=root --port=$mysql_port --default-table-type=INNODB > /dev/null & sleep 8 echo "select 1"| ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket > /dev/null if [ $? -ne 0 ]; then From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:56:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:56:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4257 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060316145603.E49294E471A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:55:59 2006 New Revision: 4257 Log: Totally changed for new Global Search including all modules Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:57:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:57:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4258 - /vtigercrm/trunk/include/freetag/freetag.class.php Message-ID: <20060316145742.8DC424E471A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:57:38 2006 New Revision: 4258 Log: Modified to refer the UnifiedSearch.php file to get the data based on the tag Modified: vtigercrm/trunk/include/freetag/freetag.class.php Modified: vtigercrm/trunk/include/freetag/freetag.class.php ============================================================================== --- vtigercrm/trunk/include/freetag/freetag.class.php (original) +++ vtigercrm/trunk/include/freetag/freetag.class.php Thu Mar 16 07:57:38 2006 @@ -915,9 +915,12 @@ // by $step. $cloud_html = ''; $cloud_spans = array(); + //included to get the site URL + include("config.php"); + foreach ($tag_list as $tag => $qty) { $size = $min_font_size + ($qty - $min_qty) * 3; - $cloud_span[] = '' . htmlspecialchars(stripslashes($tag)) . ''; + $cloud_span[] = '' . htmlspecialchars(stripslashes($tag)) . ''; } $cloud_html = join("\n ", $cloud_span); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:21:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:21:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4259 - /vtigercrm/trunk/getCompanyProfile.php Message-ID: <20060316152152.312B74E4748@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 08:21:48 2006 New Revision: 4259 Log: changes made to get headlines for given tickersymbol Modified: vtigercrm/trunk/getCompanyProfile.php Modified: vtigercrm/trunk/getCompanyProfile.php ============================================================================== --- vtigercrm/trunk/getCompanyProfile.php (original) +++ vtigercrm/trunk/getCompanyProfile.php Thu Mar 16 08:21:48 2006 @@ -16,7 +16,7 @@ * @returns $desc -- desc:: Type string array * */ -function getComdata($url,$variable) +function getComdata($url,$variable="") { $h = new http(); $desc = array(); @@ -25,20 +25,36 @@ echo "

    There is a problem with the http request!

    "; echo $h->log; exit(); - } - $msft_stats = http::table_into_array($h->body, 'Find Symbol', 0, null); - //echo '
    ';print_r($msft_stats);echo '
    '; - //die; - if($msft_stats != '') - { - $desc=$msft_stats[0]; - $data=getQuoteData($variable); - foreach($data as $key=>$value) - array_push($desc,$value); - return $desc; + } + if($variable != "") + { + $msft_stats = http::table_into_array($h->body, 'Find Symbol', 0, null); + if($msft_stats != '') + { + $desc=$msft_stats[0]; + $data=getQuoteData($variable); + foreach($data as $key=>$value) + array_push($desc,$value); + return $desc; + } + else + return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol."; } else - return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol."; + { + $headlines = array(); + $news = http::table_into_array($h->body, 'HEADLINES',0, null); + if($news != '') + { + $headlines[] = $news[35]; + $headlines[] = $news[37]; + $headlines[] = $news[39]; + $headlines[] = $news[41]; + return $headlines; + } + else + return "No headlines available"; + } } /** Function to get company quotes from external site @@ -48,7 +64,6 @@ */ function getQuoteData($var) { - //$url = "http://moneycentral.msn.com/detail/stock_quote?Symbol=".$var; $url = "http://finance.yahoo.com/q?s=".$var; $h = new http(); $h->dir = "class_http_dir/"; @@ -59,8 +74,6 @@ } $res_arr=array(); $quote_data = http::table_into_array($h->body, 'Delayed quote data', 0, null); - //echo '
    ';print_r($quote_data);echo '
    '; - //die; if($quote_data[0][0] == '') { array_shift($quote_data); @@ -73,10 +86,6 @@ if($quote_data !='') $res_arr[]=$quote_data[$i]; } - //array_shift($res_arr); - //array_shift($res_arr); - //echo '
    ';print_r($quote_data);echo '
    '; - //die; return $res_arr; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:24:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:24:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4260 - /vtigercrm/trunk/modules/Accounts/HeadLines.php Message-ID: <20060316152406.D91974E4752@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 08:24:02 2006 New Revision: 4260 Log: HeadLines.php has been added Added: vtigercrm/trunk/modules/Accounts/HeadLines.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:53:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:53:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4261 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060316155339.C460B4E478B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 08:53:35 2006 New Revision: 4261 Log: update query fixed Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 16 08:53:35 2006 @@ -2010,8 +2010,7 @@ } else { - $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_ -id." and roleid='".$roleid."'"; + $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'"; $adb->query($sql8); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 18:47:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 02:47:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4262 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060317024706.BA5F34E4D03@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 19:47:01 2006 New Revision: 4262 Log: js function has been added Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 16 19:47:01 2006 @@ -21,6 +21,22 @@ document.getElementById(selrow).className="mnuSel"; show (Sele); {rdelim} + + function ajaxResponse(response) + {ldelim} + document.getElementById('headlines').innerHTML = response.responseText; + document.getElementById('headlines').style.display="block"; + {rdelim} + + function getHeadLines(Ticker) + {ldelim} + if(Ticker!='') + {ldelim} + var ajaxObj = new Ajax(ajaxResponse); + var urlstring = "module=Accounts&action=HeadLines&tickersymbol="+Ticker; + ajaxObj.process("index.php?",urlstring); + {rdelim} + {rdelim} @@ -147,8 +163,8 @@ {/foreach}
    "; + echo ""; for ($c = 0 ; $c < $maxcol[$row] ; $c++ ) { if ( isset ( $table[$column][$row][$c] ) ) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 00:07:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 08:07:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4237 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060316080704.E816F4E439E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 01:07:01 2006 New Revision: 4237 Log: gshow() a js function has been called on mouse click Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Thu Mar 16 01:07:01 2006 @@ -236,7 +236,7 @@ } - echo "\n"; + echo "\n"; if (($xm == $m ) || $month_overlap) { #echo " ". $xxd .""; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:10:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:10:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4238 - in /vtigercrm/trunk/modules/Calendar: calendar_day.php calendar_week.php Message-ID: <20060316091051.4B1CC4E441E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:10:44 2006 New Revision: 4238 Log: calendar_day.php and calendar_week.php have been removed Removed: vtigercrm/trunk/modules/Calendar/calendar_day.php vtigercrm/trunk/modules/Calendar/calendar_week.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:12:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:12:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4239 - /vtigercrm/trunk/modules/Calendar/calendar_month.php Message-ID: <20060316091209.8E9B04E442B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:12:05 2006 New Revision: 4239 Log: calendar_month.php has been removed Removed: vtigercrm/trunk/modules/Calendar/calendar_month.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:17:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:17:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4241 - in /vtigercrm/trunk/modules/Calendar: dayHourList.php monthDaysList.php weekDaysList.php Message-ID: <20060316091701.807EA4E4428@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:16:56 2006 New Revision: 4241 Log: file has been removed Removed: vtigercrm/trunk/modules/Calendar/dayHourList.php vtigercrm/trunk/modules/Calendar/monthDaysList.php vtigercrm/trunk/modules/Calendar/weekDaysList.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:16:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:16:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4240 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060316091656.3D7D54E4415@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 02:16:51 2006 New Revision: 4240 Log: overwriting with the 4.2.4 changes for vtlogger and other misc fixes Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Thu Mar 16 02:16:51 2006 @@ -14,11 +14,12 @@ ********************************************************************************/ require_once('include/logging.php'); -//include('adodb/adodb.inc.php'); -include_once('adodb/adodb.inc.php'); +include('adodb/adodb.inc.php'); require_once("adodb/adodb-xmlschema.inc.php"); -$log1 =& LoggerManager::getLogger('VT'); +require_once('vtigerlogger.php'); +global $vtlog; +$vtlog = new vtigerLogger(); class PearDatabase{ var $database = null; @@ -34,11 +35,8 @@ var $lastmysqlrow = -1; var $enableSQLlog = false; - function isMySQL() { return dbType=='mysql'; } - function isOracle() { return dbType=='oci8'; } - function println($msg) { @@ -46,13 +44,11 @@ $log1 =& LoggerManager::getLogger('VT'); if(is_array($msg)) { - //$log1->fatal("PearDatabse ->".print_r($msg,true)); - $log1->info("PearDatabse ->".print_r($msg,true)); + $log1->fatal("PearDatabse ->".print_r($msg,true)); } else { - //$log1->fatal("PearDatabase ->".$msg); - $log1->info("PearDatabase ->".$msg); + $log1->fatal("PearDatabase ->".$msg); } return $msg; } @@ -162,13 +158,13 @@ if($this->dieOnError || $dieOnError) { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(),'error'); + $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg()); } else { - //$this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()." (SQL=".$this->sql.")",'error'); + $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + } return false; } @@ -189,7 +185,7 @@ * Contributor(s): ______________________________________.. */ function checkConnection(){ -global $log1; +global $vtlog; if(!isset($this->database)) { $this->println("TRANS creating new connection"); @@ -206,9 +202,8 @@ else { // $this->println("checkconnect using old connection"); - //commenting as the above log will suffice. this was filling up the logs too much - //$log1->info('checkconnect using old connection'); - } + $vtlog->logthis('checkconnect using old connection','info'); + } } /* ADODB converted @@ -232,16 +227,11 @@ function query($sql, $dieOnError=false, $msg='') { - global $log1; + global $vtlog; //$this->println("ADODB query ".$sql); - $log1->debug('query being executed : '.$sql); - $mytime["start"] = $this->microtime_float(); + $vtlog->logthis('query being executed : '.$sql,'debug'); $this->checkConnection(); $result = & $this->database->Execute($sql); - $mytime["execute"] = $this->microtime_float(); - $mytime["total"] = $mytime["execute"]-$mytime["start"]; - if ( $mytime["total"] > 0.5 ) - $log1->error("TIME: sql statement $sql took {$mytime['total']} seconds."); $this->lastmysqlrow = -1; if(!$result)$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError); return $result; @@ -261,6 +251,15 @@ $this->checkConnection(); $result = $this->database->UpdateBlob($tablename, $colname, $data, $id); $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result); + return $result; + } + + function updateBlobFile($tablename, $colname, $id, $filename) + { + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); + $this->checkConnection(); + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } @@ -283,9 +282,9 @@ function limitQuery($sql,$start,$count, $dieOnError=false, $msg='') { - global $log1; + global $vtlog; //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count); - $log1->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count); + $vtlog->logthis(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count,'debug'); $this->checkConnection(); $result =& $this->database->SelectLimit($sql,$count,$start); if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError); @@ -398,12 +397,12 @@ */ function getRowCount(&$result){ - global $log1; + global $vtlog; //$this->println("ADODB getRowCount"); if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $log1->debug('getRowCount rows= '.$rows); + $vtlog->logthis('getRowCount rows= '.$rows,'debug'); return $rows; } @@ -430,23 +429,13 @@ //$this->println("ADODB fetch_array return null"); return NULL; } - //return $this->change_key_case($result->FetchRow()); - $ret = @ $this->change_key_case($result->FetchRow()); - if ( !is_array($ret) ) - { - $this->println( "ERROR: SQL (".$this->sql.")" ); - $this->println( print_r($result,1) ); - //die; - } - return $ret; - + return $this->change_key_case($result->FetchRow()); } /* ADODB newly added. replacement for mysql_result() */ function query_result(&$result, $row, $col=0) - { - if ( !$result ) return; + { //$this->println("ADODB query_result r=".$row." c=".$col); $result->Move($row); $rowdata = $this->change_key_case($result->FetchRow()); @@ -470,12 +459,12 @@ }*/ function getAffectedRowCount(&$result){ - global $log1; + global $vtlog; // $this->println("ADODB getAffectedRowCount"); - $log1->debug('getAffectedRowCount'); + $vtlog->logthis('getAffectedRowCount','debug'); $rows =$this->database->Affected_Rows(); // $this->println("ADODB getAffectedRowCount rows=".rows); - $log1->info('getAffectedRowCount rows = '.$rows); + $vtlog->logthis('getAffectedRowCount rows = '.$rows,'debug'); return $rows; } @@ -585,10 +574,10 @@ */ function getNextRow(&$result, $encode=true){ - global $log1; + global $vtlog; //$this->println("ADODB getNextRow"); - $log1->info('getNextRow'); + $vtlog->logthis('getNextRow','info'); if(isset($result)){ $row = $this->change_key_case($result->FetchRow()); if($row && $encode&& is_array($row))return array_map('to_html', $row); @@ -608,12 +597,6 @@ return $result->FetchField($col); } - function microtime_float() - { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); - } - function getQueryTime(){ return $this->query_time; } @@ -773,7 +756,7 @@ function quote($string){ - return ADOConnection::qstr($string,get_magic_quotes_gpc()); + return ADOConnection::qstr($string); } @@ -825,12 +808,16 @@ //$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName)); $schema = new adoSchema( $db ); + //Debug Adodb XML Schema + $sehema->XMLS_DEBUG = TRUE; + //Debug Adodb + $sehema->debug = true; $sql = $schema->ParseSchema( $schemaFile ); $this->println("--------------Starting the table creation------------------"); //$this->println($sql); - + //integer ExecuteSchema ([array $sqlArray = NULL], [boolean $continueOnErr = NULL]) $result = $schema->ExecuteSchema( $sql, true ); if($result) print $db->errorMsg(); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:27:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:27:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4242 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060316092749.CBBF84E4449@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:27:45 2006 New Revision: 4242 Log: addEventUI.php has been included Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 16 02:27:45 2006 @@ -8,6 +8,7 @@ * @module calendar_week */ require_once('modules/Calendar/CalendarCommon.php'); + require_once('modules/Calendar/addEventUI.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; $callink = 'index.php?module=Calendar&action='; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:29:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:29:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4243 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060316092932.872004E444E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:29:27 2006 New Revision: 4243 Log: addEventUI.php has been included Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Thu Mar 16 02:29:27 2006 @@ -1,5 +1,6 @@ Author: saraj Date: Thu Mar 16 02:52:31 2006 New Revision: 4244 Log: adodb upgraded to V4.72 21 Feb 2006 release Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php vtigercrm/trunk/adodb/adodb-datadict.inc.php vtigercrm/trunk/adodb/adodb-error.inc.php vtigercrm/trunk/adodb/adodb-errorhandler.inc.php vtigercrm/trunk/adodb/adodb-errorpear.inc.php vtigercrm/trunk/adodb/adodb-exceptions.inc.php vtigercrm/trunk/adodb/adodb-iterator.inc.php vtigercrm/trunk/adodb/adodb-lib.inc.php vtigercrm/trunk/adodb/adodb-pager.inc.php vtigercrm/trunk/adodb/adodb-pear.inc.php vtigercrm/trunk/adodb/adodb-perf.inc.php vtigercrm/trunk/adodb/adodb-php4.inc.php vtigercrm/trunk/adodb/adodb-time.inc.php vtigercrm/trunk/adodb/adodb-xmlschema.inc.php vtigercrm/trunk/adodb/adodb.inc.php vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php vtigercrm/trunk/adodb/datadict/datadict-access.inc.php vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php vtigercrm/trunk/adodb/drivers/adodb-access.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php vtigercrm/trunk/adodb/lang/adodb-ar.inc.php vtigercrm/trunk/adodb/lang/adodb-bg.inc.php vtigercrm/trunk/adodb/lang/adodb-en.inc.php vtigercrm/trunk/adodb/lang/adodb-es.inc.php vtigercrm/trunk/adodb/lang/adodb-hu.inc.php vtigercrm/trunk/adodb/lang/adodb-nl.inc.php vtigercrm/trunk/adodb/lang/adodb-pl.inc.php vtigercrm/trunk/adodb/lang/adodb-ro.inc.php vtigercrm/trunk/adodb/perf/perf-db2.inc.php vtigercrm/trunk/adodb/perf/perf-informix.inc.php vtigercrm/trunk/adodb/perf/perf-mssql.inc.php vtigercrm/trunk/adodb/perf/perf-mysql.inc.php vtigercrm/trunk/adodb/perf/perf-oci8.inc.php vtigercrm/trunk/adodb/perf/perf-postgres.inc.php vtigercrm/trunk/adodb/pivottable.inc.php vtigercrm/trunk/adodb/rsfilter.inc.php vtigercrm/trunk/adodb/server.php vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php vtigercrm/trunk/adodb/session/adodb-compress-gzip.php vtigercrm/trunk/adodb/session/adodb-cryptsession.php vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php vtigercrm/trunk/adodb/session/adodb-session-clob.php vtigercrm/trunk/adodb/session/adodb-session.php vtigercrm/trunk/adodb/session/crypt.inc.php vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php vtigercrm/trunk/adodb/session/old/adodb-session-clob.php vtigercrm/trunk/adodb/session/old/adodb-session.php vtigercrm/trunk/adodb/session/old/crypt.inc.php vtigercrm/trunk/adodb/tests/benchmark.php vtigercrm/trunk/adodb/tests/client.php vtigercrm/trunk/adodb/tests/pdo.php vtigercrm/trunk/adodb/tests/test-datadict.php vtigercrm/trunk/adodb/tests/test-pgblob.php vtigercrm/trunk/adodb/tests/test-php5.php vtigercrm/trunk/adodb/tests/test.php vtigercrm/trunk/adodb/tests/test3.php vtigercrm/trunk/adodb/tests/test4.php vtigercrm/trunk/adodb/tests/test5.php vtigercrm/trunk/adodb/tests/test_rs_array.php vtigercrm/trunk/adodb/tests/testcache.php vtigercrm/trunk/adodb/tests/testdatabases.inc.php vtigercrm/trunk/adodb/tests/testmssql.php vtigercrm/trunk/adodb/tests/testoci8.php vtigercrm/trunk/adodb/tests/testoci8cursor.php vtigercrm/trunk/adodb/tests/testpaging.php vtigercrm/trunk/adodb/tests/testpear.php vtigercrm/trunk/adodb/tests/testsessions.php vtigercrm/trunk/adodb/tests/tmssql.php vtigercrm/trunk/adodb/toexport.inc.php vtigercrm/trunk/adodb/tohtml.inc.php vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl vtigercrm/trunk/adodb/xsl/remove-0.2.xsl Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-error.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-errorhandler.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-errorpear.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-exceptions.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-iterator.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-lib.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-pager.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-pear.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-perf.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-php4.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-time.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-xmlschema.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-ar.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-bg.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-en.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-es.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-hu.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-nl.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-pl.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-ro.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/pivottable.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/rsfilter.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/server.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-compress-gzip.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-cryptsession.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-session-clob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-session.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/crypt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-session-clob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-session.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/crypt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/benchmark.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/client.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/pdo.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-datadict.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-pgblob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-php5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test3.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test4.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test_rs_array.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testcache.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testdatabases.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testmssql.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testoci8.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testoci8cursor.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testpaging.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testpear.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testsessions.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/tmssql.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/toexport.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tohtml.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/remove-0.2.xsl ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:19:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:19:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4245 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060316101936.DC2684E44BC@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 03:19:31 2006 New Revision: 4245 Log: default values for startdate,enddate set sendnotification default value set to 0 Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Mar 16 03:19:31 2006 @@ -1010,7 +1010,7 @@ - + @@ -5595,10 +5595,10 @@ - + - +
    - - - - - - + + + + + +
    		- {foreach item=tabledetail from=$HOMEDETAILS} {if $tabledetail neq ''} {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} @@ -157,6 +173,7 @@
    {/if} + @@ -178,7 +195,7 @@ {/foreach} - +
    {$tabledetail.Title.1} (Mark as Default View)
    {/if} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 18:52:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 02:52:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4263 - /vtigercrm/trunk/modules/Accounts/ListViewTop.php Message-ID: <20060317025204.D716C4E4D0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 19:52:00 2006 New Revision: 4263 Log: change4s made to get tickersymbol Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Thu Mar 16 19:52:00 2006 @@ -32,7 +32,7 @@ $current_module_strings = return_module_language($current_language, "Accounts"); $log = LoggerManager::getLogger('top accounts_list'); - $list_query = 'select account.accountid, account.accountname, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; + $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; $list_result=$adb->query($list_query); $open_accounts_list = array(); $noofrows = min($adb->num_rows($list_result),7); @@ -42,6 +42,7 @@ $open_accounts_list[] = Array('accountid' => $adb->query_result($list_result,$i,'accountid'), 'accountname' => $adb->query_result($list_result,$i,'accountname'), 'amount' => $adb->query_result($list_result,$i,'amount'), + 'tickersymbol' => $adb->query_result($list_result,$i,'tickersymbol'), ); } @@ -67,12 +68,8 @@ 'AMOUNT' => ($account['amount']), ); - $value[]=''.$account['accountname'].''; + $value[]=''.$account['accountname'].''; $value[]=convertFromDollar($account['amount'],$rate); - - - - $entries[$account['accountid']]=$value; } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 19:56:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 03:56:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4264 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060317035626.6C3FC4E4D97@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 20:56:20 2006 New Revision: 4264 Log: key has been set in sharedcalendar table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 16 20:56:20 2006 @@ -156,8 +156,10 @@ + +
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 20:50:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 04:50:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4265 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060317045024.7B5034E4E0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 21:50:19 2006 New Revision: 4265 Log: Added combo values in Campaign module for campaignstatus, campaigntype, expected response, actual cost, expected revenue fields Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 20:52:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 04:52:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4266 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060317045254.66DD34E4E0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 21:52:50 2006 New Revision: 4266 Log: Added the respective tablenames in the comboTables Array for campaign module Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Mar 16 21:52:50 2006 @@ -43,7 +43,7 @@ function create_tables () { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 21:42:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 05:42:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4267 - /vtigercrm/trunk/index.php Message-ID: <20060317054245.92DCB4E4E70@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 22:42:40 2006 New Revision: 4267 Log: changes made to escape header and footer Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Mar 16 22:42:40 2006 @@ -402,7 +402,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action)) @@ -753,7 +753,7 @@ $theme = $default_theme; } -if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat") +if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines") { // Under the SPL you do not have the right to remove this copyright statement. $copyrightstatement=" -

    +

    +

    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,

    +

    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. +
    2. Features
      3. +
    +

    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 @@ -41,7 +253,7 @@

    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://www.vtiger.com/products/crm/demo_5alpha

    +

    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 @@ -110,7 +322,7 @@

    		vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. - URL: Click + URL: Click Here
    7 + 7 List of files modified between + List of files modified between alpha and alpha 2   
    Sl No. Ticket IDDescription
    1-Enhanced Dashboards with more + Ticket IDDescription
    1-Enhanced Dashboards with more than 20 charts
    2 - -Multiple currency support and + 2 + -Multiple currency support and currency conversion through Web service integration
    3-Campaign Management module for + 3-Campaign Management module for Marketing automation
    4 - -Update some of your publicly + 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' + 5 + -Stay-in-touch with your customers' by uploading their photos.
    6 -   - Analyze your customers business + 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 + 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 + 9 + 1006 Send E-mail notification to other users.
    10 - 736Show latest/new leads on a Home + 10 + 736Show latest/new leads on a Home page.
    11- Ajax-based multidimensional + 11- Ajax-based multidimensional product images upload.
    12 - - - Contact Images Scrolling in Contact + 12 + - + Contact Images Scrolling in Contact ListView
    13 - - - Ajax-based my Portal module + 13 + - + Ajax-based my Portal module under Tools tab.
    14-In Home page, display the status + 14-In Home page, display the status of modified records since last logout for users.
    15 - - - Tag Cloud - Integration + 15 + - + Tag Cloud - Integration (http://tagcloud.com)
    16 - - - Company-wide Announcements configuration + 16 + - + Company-wide Announcements configuration from Settings.
    17 - - - Thumbnail view on Mouseover for + 17 + - + Thumbnail view on Mouseover for Contact images in List View.
    18 - - - Upload vtiger CRM - Users' photos.
    19 - - - Resize the users photos and create - thumbnails.
    20 - - - Attach multiple files in single + 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 + 21 + - + FCK editor upgraded to the latest version (v2.2).
    22 - - - Shout Box integration with vtiger + 22 + - + Shout Box integration with vtiger CRM Home page for vtiger users to chat online.
    23 - - - Tabbed approach of Detail View + 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 + 24 + 445 + Addition of multiple Contacts in Activities, Emails, Potentials, Vendors related lists.
    25 - - - Add New E-mail in Related List + 25 + - + Add New E-mail in Related List of Leads & Contacts.
    26 - 502 Address Inheritance for Contacts.
    27 - - - Ajaxified detail view for all + 26 + 502 Address Inheritance for Contacts.
    27 + - + Ajaxified detail view for all modules.
    28-Separate Log Messages for Security + 28-Separate Log Messages for Security Management.
    - - - - - - - - + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + @@ -553,6 +765,12 @@
  • 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: Release Notes

    @@ -778,14 +996,14 @@ - - - - - - - - - - - - + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - + + +
    SL No. + SL No. Ticket ID + Ticket ID Description
    1 - 1058While creating customview for + Description
    1 + 1058While creating customview for salesorder return action is not redirected to Salesorder Listview.
    2 - 1070In activity related list,when + 2 + 1070In activity related list,when I click on "Activity Information" link,activity detailview is not displayed
    3 - 1067minute combo box + 3 + 1067minute combo box of duration field is not displaying proper values
    4 - -In Popup SalesOrder and PurchaseOrder + 4 + -In Popup SalesOrder and PurchaseOrder "Hacking attempt" exception is thrown.
    5 - - - Adding New Event in Potential + 5 + - + Adding New Event in Potential Relatedlist will not be working
    6 - - - In Listview when a set of accounts + 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 + 7 + 866Problem with ticket creation
    8 + 898 Attachment Error Message not proper
    9 - 913 parent email id is not selected + 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' + 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 + 13 + 1088Ticket notification with wrong signature
    14 - - - Create New User, Edit & Detail + 14 + - + Create New User, Edit & Detail View of the My Preference/Settings Smartified
    15 - - - In create customview 'Choose + 15 + - + In create customview 'Choose columns' the 'Event information' and 'Event Description' does'nt list
    16 - - - Security Support for Reports -
    17 - - - Activity Reminder Notification + 16 + - + Security Support for Reports +
    17 + - + Activity Reminder Notication email
    18 - 964 - Activities are not in start date + 18 + 964 + Activities are not in start date order and not configurable
    S. No Ticket + Ticket ID Subject
    1 +
    		@@ -795,7 +1013,7 @@
    2 +
    		Default Organization Sharing in Security is modified @@ -804,13 +1022,13 @@
    3588 + 588 Suppress sending mail to account when a ticket is submitted.
    4 +
    		Product quantity in stock is automatically updated when @@ -822,7 +1040,7 @@
    5
    +
    		In Office Plug-in, fields from multiple modules (Accounts, Contacts, Leads, HelpDesk, and Users) can be merged while creating mail @@ -830,20 +1048,20 @@
    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 @@ -997,68 +1215,68 @@ vulnerability fix.
    21
    -     		833
    -     		test mail can be sent to test + 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 + 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, + 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 -> + 26
    +     		710
    +     		activity notifications -> display further information
    27
    -     		504 New Contact -Account addressNew + 27
    +     		504 New Contact -Account addressNew Contact -Account address
    28259Office Integration account name + 28259Office Integration account name in address block
    29378Office Plugin field selection29378Office Plugin field selection
    From vtiger-tickets at vtiger.fosslabs.com Tue Mar 21 10:21:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 21 Mar 2006 18:21:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.96d413f57301d104adadab10f0e15295@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4381]) refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 10:21:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 21 Mar 2006 18:21:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4381 - /vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Message-ID: <20060321182107.951CA4E98EA@vtiger.fosslabs.com> Author: jeffk Date: Tue Mar 21 11:21:03 2006 New Revision: 4381 Log: refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Tue Mar 21 11:21:03 2006 @@ -89,7 +89,7 @@ { $has_header = 1; } -if($_REQUEST['modulename'] != '') +if(isset( $_REQUEST['modulename']) && $_REQUEST['modulename'] != '') $_REQUEST['module'] = $_REQUEST['modulename']; if (! isset( $_REQUEST['module'] ) || $_REQUEST['module'] == 'Contacts') @@ -239,23 +239,21 @@ { $datarows = $xrows; } -if($_REQUEST['skipped_record_count'] != '') +if(isset($_SESSION['skipped_record_count']) && $_REQUEST['skipped_record_count'] != '') $skipped_record_count = $_REQUEST['skipped_record_count']; else $_REQUEST['skipped_record_count'] = 0; -if($_REQUEST['noofrows'] != '') +if(isset($_REQUEST['noofrows']) && $_REQUEST['noofrows'] != '') $totalnoofrows = $_REQUEST['noofrows']; else $totalnoofrows = count($datarows); -$loopcount = ($totalnoofrows/$RECORDCOUNT)+1; - -if($_REQUEST['startval'] != '') +if(isset($_REQUEST['startval']) && $_REQUEST['startval'] != '') $START = $_REQUEST['startval']; else $START = $_SESSION['startval']; -if($_REQUEST['recordcount'] != '') +if(isset($_REQUEST['recordcount']) && $_REQUEST['recordcount'] != '') $RECORDCOUNT = $_REQUEST['recordcount']; else $RECORDCOUNT = $_SESSION['recordcount']; From vtiger-tickets at vtiger.fosslabs.com Tue Mar 21 10:21:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 21 Mar 2006 18:21:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.28ce533abfd8f86ba669bd99be16ada7@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4381]) refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 23:48:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:48:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4382 - /vtigercrm/trunk/modules/Orders/ Message-ID: <20060322074808.6049D4EA265@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:48:03 2006 New Revision: 4382 Log: Not Needed Removed: vtigercrm/trunk/modules/Orders/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 23:50:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:50:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4383 - /vtigercrm/trunk/modules/Users/EditView.html Message-ID: <20060322075047.4CD614EA271@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:50:42 2006 New Revision: 4383 Log: file removed as user edit view smartified Removed: vtigercrm/trunk/modules/Users/EditView.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 23:51:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:51:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4384 - /vtigercrm/trunk/modules/Users/ListView.html Message-ID: <20060322075154.A2B234EA271@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:51:50 2006 New Revision: 4384 Log: file removed as UserList View smartified Removed: vtigercrm/trunk/modules/Users/ListView.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 23:56:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:56:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4385 - /vtigercrm/trunk/modules/Users/ Message-ID: <20060322075624.0EBF14EA281@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:56:16 2006 New Revision: 4385 Log: files removed as security has been smartified Removed: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.html vtigercrm/trunk/modules/Users/DetailView.html vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.html vtigercrm/trunk/modules/Users/EditFieldLevelAccess.html vtigercrm/trunk/modules/Users/GroupDetailView.html vtigercrm/trunk/modules/Users/ListFieldPermissions.html vtigercrm/trunk/modules/Users/ListFldProfiles.html vtigercrm/trunk/modules/Users/ListProfiles.html vtigercrm/trunk/modules/Users/OrgSharingDetailView.html vtigercrm/trunk/modules/Users/OrgSharingEditView.html vtigercrm/trunk/modules/Users/RoleDetailView.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 23:57:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:57:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4386 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060322075748.4AE5E4EA282@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:57:44 2006 New Revision: 4386 Log: Security Added for all charts Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Mar 22 00:57:44 2006 @@ -455,12 +455,8 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } - else - { - echo $mod_strings['LBL_NO_PERMISSION_FIELD']; - } // To display the charts for Lead status - if ($type == "leadstatus") + elseif (($type == "leadstatus")&& (getFieldVisibilityPermission('Leads',$user_id,'leadstatus') == "0")) { $graph_by="leadstatus"; $graph_title="Leads By Status"; @@ -470,7 +466,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Lead Industry - if($type == "leadindustry") + elseif (($type == "leadindustry") && (getFieldVisibilityPermission('Leads',$user_id,'industry') == "0")) { $graph_by="industry"; $graph_title="Leads By Industry"; @@ -480,7 +476,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales by Lead Source - if($type == "salesbyleadsource") + elseif (($type == "salesbyleadsource")&& (getFieldVisibilityPermission('Potentials',$user_id,'leadsource') == "0")) { $graph_by="leadsource"; $graph_title="Sales by LeadSource"; @@ -490,7 +486,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales by Account - if($type == "salesbyaccount") + elseif (($type == "salesbyaccount") && (getFieldVisibilityPermission('Potentials',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Sales by Accounts"; @@ -500,7 +496,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Account by Industry - if($type == "accountindustry") + elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0")) { $graph_by="industry"; $graph_title="Account By Industry"; @@ -510,7 +506,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Products by Category - if($type == "productcategory") + elseif (($type == "productcategory") && (getFieldVisibilityPermission('Products',$user_id,'productcategory') == "0")) { $graph_by="productcategory"; $graph_title="Products by Category"; @@ -520,7 +516,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } // Sales Order by Accounts - if($type == "sobyaccounts") + elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Sales Order by Accounts"; @@ -530,7 +526,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales Order by Status - if($type == "sobystatus") + elseif (($type == "sobystatus") && (getFieldVisibilityPermission('SalesOrder',$user_id,'sostatus') == "0")) { $graph_by="sostatus"; $graph_title="Sales Order by Status"; @@ -540,7 +536,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Purchase Order by Status - if($type == "pobystatus") + elseif (($type == "pobystatus") && (getFieldVisibilityPermission('PurchaseOrder',$user_id,'postatus') == "0")) { $graph_by="postatus"; $graph_title="Purchase Order by Status"; @@ -550,7 +546,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Quotes by Accounts - if($type == "quotesbyaccounts") + elseif (($type == "quotesbyaccounts") && (getFieldVisibilityPermission('Quotes',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Quotes by Accounts"; @@ -560,7 +556,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Quotes by Stage - if($type == "quotesbystage") + elseif (($type == "quotesbystage") && (getFieldVisibilityPermission('Quotes',$user_id,'quotestage') == "0")) { $graph_by="quotestage"; $graph_title="Quotes by Stage"; @@ -570,7 +566,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Invoice by Accounts - if($type == "invoicebyacnts") + elseif (($type == "invoicebyacnts") && (getFieldVisibilityPermission('Invoice',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Invoices by Accounts"; @@ -580,7 +576,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Invoices by status - if($type == "invoicebystatus") + elseif (($type == "invoicebystatus") && (getFieldVisibilityPermission('Invoice',$user_id,'invoicestatus') == "0")) { $graph_by="invoicestatus"; $graph_title="Invoices by status"; @@ -590,7 +586,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Tickets by Status - if($type == "ticketsbystatus") + elseif (($type == "ticketsbystatus") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketstatus') == "0")) { $graph_by="ticketstatus"; $graph_title="Tickets by status"; @@ -600,7 +596,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Tickets by Priority - if($type == "ticketsbypriority") + elseif (($type == "ticketsbypriority") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketpriorities') == "0")) { $graph_by="priority"; $graph_title="Tickets by Priority"; @@ -609,6 +605,11 @@ $query=$helpdesk_query; echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } + else + { + echo $mod_strings['LBL_NO_PERMISSION_FIELD']; + } + ?>
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 01:32:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:32:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4387 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060322093211.483FE4EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:32:05 2006 New Revision: 4387 Log: MaxClients and KeepAlive parameters added Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Wed Mar 22 02:32:05 2006 @@ -87,14 +87,14 @@ # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. -# +# referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 - +MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # -KeepAliveTimeout 15 +KeepAliveTimeout 10 ## ## Server-Pool Size Regulation (MPM specific) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 01:32:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:32:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4388 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060322093253.8677F4EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:32:45 2006 New Revision: 4388 Log: MaxClients and KeepAlive parameters added Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Wed Mar 22 02:32:45 2006 @@ -96,14 +96,14 @@ # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. -# +# referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 - +MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # -KeepAliveTimeout 15 +KeepAliveTimeout 10 ## ## Server-Pool Size Regulation (MPM specific) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 01:33:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:33:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4389 - /vtigercrm/trunk/pkg/php/php.ini Message-ID: <20060322093327.49B024EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:33:22 2006 New Revision: 4389 Log: output_handler = ob_gzhandler entry added Modified: vtigercrm/trunk/pkg/php/php.ini Modified: vtigercrm/trunk/pkg/php/php.ini ============================================================================== --- vtigercrm/trunk/pkg/php/php.ini (original) +++ vtigercrm/trunk/pkg/php/php.ini Wed Mar 22 02:33:22 2006 @@ -115,7 +115,7 @@ ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. zlib.output_compression = Off - +output_handler = ob_gzhandler ; You cannot specify additional output handlers if zlib.output_compression ; is activated here. This setting does the same as output_handler but in ; a different order. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 04:59:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 12:59:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4390 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060322125949.CC0BC4EA500@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 05:59:44 2006 New Revision: 4390 Log: * Added NULL in fieldvalue when it is empty Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 05:19:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 13:19:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4391 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060322131936.AE5C44EA52A@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 06:19:31 2006 New Revision: 4391 Log: Changed the default home view from myaccount to key metrice Ahmed Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 22 06:19:31 2006 @@ -158,7 +158,7 @@ // added by jeri to populate default image and tagcloud for admin $user->imagename = 'admin.jpeg'; $user->tagcloud = 'http://www.tagcloud.com/cloud/js/mycloud79/default/50'; - $user->defhomeview = 'home_myaccount'; + $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') $admin_email ="admin at administrator.com"; From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:05:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:05:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2367=3A_O?= =?utf-8?q?ld_config_file_in_Phprint?= In-Reply-To: <076.3e4d97ffe9a3e653ec381a342a555d51@vtiger.fosslabs.com> References: <076.3e4d97ffe9a3e653ec381a342a555d51@vtiger.fosslabs.com> Message-ID: <085.2380ea1967a13f320d9d6109c2c83cd5@vtiger.fosslabs.com> #67: Old config file in Phprint ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc2 Resolution: invalid | Keywords: phprint config ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => invalid * status: new => closed Comment: The proper config file to reference is config.php. config.inc.php is where the install defaults are kept and config.php is for overriding the defaults. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:14:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:14:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= Message-ID: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- r4358 is the first changeset to fix up several references to undefined variable errors. This ticket is for tracking those changes. Make sure you reference to it in your commit messages. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 18:14:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:14:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4392 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323021451.9F3C74EABB0@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:14:49 2006 New Revision: 4392 Log: clean up uninitialized var notice while importing leads ref #70 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 19:14:49 2006 @@ -676,6 +676,8 @@ $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")"; $adb->query($sql1); $groupname = $_REQUEST['assigned_group_name']; + if (isset($_REQUEST['assigntype'])) + { if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails') { if($table_name == 'leaddetails') @@ -691,7 +693,7 @@ { insert2TicketGroupRelation($this->id,$groupname); } - + } } } From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.55907296d4784bd6ebd8de81b957f2b4@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): And r4392 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:18:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:18:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.1baef4d2f861d1da372b7738095986bb@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4393]) fix getCustomFieldTrans call time reference. see #70 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 18:18:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:18:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4393 - /vtigercrm/branches/4.2/include/CustomFieldUtil.php Message-ID: <20060323021822.161DA4EABBE@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:18:19 2006 New Revision: 4393 Log: fix getCustomFieldTrans call time reference. see #70 Modified: vtigercrm/branches/4.2/include/CustomFieldUtil.php Modified: vtigercrm/branches/4.2/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/branches/4.2/include/CustomFieldUtil.php (original) +++ vtigercrm/branches/4.2/include/CustomFieldUtil.php Wed Mar 22 19:18:19 2006 @@ -294,7 +294,7 @@ } -function getCustomFieldTrans($module, $trans_array) +function getCustomFieldTrans($module, &$trans_array) { global $adb; $tab_id = getTabid($module); From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:44:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:44:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2325=3A_I?= =?utf-8?q?nstall_Directory_should_be_Removed_after_Install?= In-Reply-To: <076.c1808c0d5cd963d9a1a831dbb8bbba6d@vtiger.fosslabs.com> References: <076.c1808c0d5cd963d9a1a831dbb8bbba6d@vtiger.fosslabs.com> Message-ID: <085.db00c137e897162ee376138d3078cda1@vtiger.fosslabs.com> #25: Install Directory should be Removed after Install ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: install risk security ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4394]) disable installer after successful install for security reasons. closes #25 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 18:44:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:44:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4394 - in /vtigercrm/branches/4.2: install.php install/0welcome.php install/1checkSystem.php install/2setConfig.php install/3confirmConfig.php install/4createConfigFile.php install/5createTables.php install/populateSeedData.php Message-ID: <20060323024406.237A84EABF4@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:44:02 2006 New Revision: 4394 Log: disable installer after successful install for security reasons. closes #25 Modified: vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/0welcome.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/3confirmConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.php vtigercrm/branches/4.2/install/populateSeedData.php Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,14 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install.php,v 1.2 2004/10/06 09:02:02 jack Exp $ * Description: Starts the installation process. ********************************************************************************/ + +if (is_file('config.php')) { + require_once('config.php'); + if (isset($dbconfig['db_hostname']) & is_file('install_lock')) { + header("Location: index.php"); + exit(); + } +} if (substr(phpversion(), 0, 1) == "5") { ini_set("zend.ze1_compatibility_mode", "1"); Modified: vtigercrm/branches/4.2/install/0welcome.php ============================================================================== --- vtigercrm/branches/4.2/install/0welcome.php (original) +++ vtigercrm/branches/4.2/install/0welcome.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/0welcome.php,v 1.10 2004/08/26 11:44:30 sarajkumar Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} //get php configuration settings. requires elaborate parsing of phpinfo() output ob_start(); Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/1checkSystem.php,v 1.16 2005/03/08 12:01:36 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} //get php configuration settings. requires elaborate parsing of phpinfo() output ob_start(); Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/2setConfig.php,v 1.41 2005/04/29 06:44:13 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} // TODO: deprecate connection.php file //require_once("connection.php"); Modified: vtigercrm/branches/4.2/install/3confirmConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/3confirmConfig.php (original) +++ vtigercrm/branches/4.2/install/3confirmConfig.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/3confirmConfig.php,v 1.14 2005/04/25 09:41:26 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} if (isset($_REQUEST['db_hostname'])) $db_hostname = $_REQUEST['db_hostname']; Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Wed Mar 22 19:44:02 2006 @@ -18,6 +18,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/4createConfigFile.php,v 1.26 2005/04/25 05:40:50 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} require_once('include/utils.php'); include('vtigerversion.php'); Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Wed Mar 22 19:44:02 2006 @@ -17,6 +17,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/5createTables.php,v 1.58 2005/04/19 16:57:08 ray Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} set_time_limit(600); @@ -81,6 +86,23 @@ require_once('install/5createTables.inc.php'); +if (is_file('install_lock')) + $is_writable = is_writable('install_lock'); +else + $is_writable = is_writable('.'); + +$config_lock = "/*\n\nInstallation Lock File\n\n"; +$config_lock .= "This File is Used to Prevent\n"; +$config_lock .= "Changes to An Existing Configuration\n"; +$config_lock .= "of vtiger.\n\n"; +$config_lock .= "To re-enable the installation mode,\n"; +$config_lock .= "delete this file, and use the\n"; +$config_lock .= "install.php file to restart the configuration.\n\n*/"; + +if ($is_writable && ($install_lock_file = @ fopen("install_lock", "w"))) { + fputs($install_lock_file, $config_lock, strlen($config_lock)); + fclose($install_lock_file); +} ?>
    total time: seconds.
    Modified: vtigercrm/branches/4.2/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/4.2/install/populateSeedData.php (original) +++ vtigercrm/branches/4.2/install/populateSeedData.php Wed Mar 22 19:44:02 2006 @@ -17,6 +17,11 @@ * Description: Executes a step in the installation process. ********************************************************************************/ +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} + require_once('config.php'); require_once('modules/Leads/Lead.php'); From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 18:59:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:59:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.1238e948cd12f4bb6c10c4fe9caab830@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4395]) Fix restricted user modifying record erases hidden fields, by mcrowe. closes #63 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 18:59:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:59:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4395 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323025942.38F784EAC15@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:59:39 2006 New Revision: 4395 Log: Fix restricted user modifying record erases hidden fields, by mcrowe. closes #63 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 19:59:39 2006 @@ -439,7 +439,18 @@ } $tabid= getTabid($module); - $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; + // MWC -- Fix hidden field saving issue + // $sql = "select * from field where tabid=" . $tabid . " and tablename='" . $table_name . "' and displaytype in (1,3)"; + $sql = "select * from field + inner join profile2field on profile2field.fieldid=field.fieldid + inner join def_org_field on def_org_field.fieldid=field.fieldid + where field.tabid=" . $tabid . " + and field.tablename='" . $table_name . "' + and field.displaytype in (1,3) + and profile2field.visible=0 + and def_org_field.visible=0 + and profile2field.profileid=" . $profile_id . " + order by sequence"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -918,7 +929,16 @@ } $tabid = getTabid($module); - $sql1 = "select * from field where tabid=".$tabid; + // MWC -- Fix hidden field saving issue + // $sql1 = "select * from field where tabid=" . $tabid; + $sql1 = "select * from field + inner join profile2field on profile2field.fieldid=field.fieldid + inner join def_org_field on def_org_field.fieldid=field.fieldid + where field.tabid=" . $tabid . " + and profile2field.visible=0 + and def_org_field.visible=0 + and profile2field.profileid=" . $profile_id . " + order by sequence"; $result1 = $adb->query($sql1); $noofrows = $adb->num_rows($result1); for($i=0; $i<$noofrows; $i++) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 19:06:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 03:06:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4396 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323030621.6CAF24EAC2C@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 20:06:18 2006 New Revision: 4396 Log: add comment to aide future debugging. refs #70 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 20:06:18 2006 @@ -687,6 +687,7 @@ $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")"; $adb->query($sql1); $groupname = $_REQUEST['assigned_group_name']; + //Fix ref to undefined variable during lead import -mikefedyk if (isset($_REQUEST['assigntype'])) { if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails') From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 19:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 03:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.2aaf09a6701740c4d2b6acfffb22731d@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4396]) add comment to aide future debugging. refs #70 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 19:22:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 03:22:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4397 - in /vtigercrm/branches/4.2/include: language/en_us.lang.php utils.php Message-ID: <20060323032213.7E3F14EAC41@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 20:22:10 2006 New Revision: 4397 Log: Patch forUnicode-readyAlphabeticalSearch(), by justoff. Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/4.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/4.2/include/language/en_us.lang.php Wed Mar 22 20:22:10 2006 @@ -924,8 +924,35 @@ 'Opportunities' => 'Opportunity'), +// AlphabeticalSearch values for UTF-8-aware procedure +// Allows multicharacter elements + +'alphabetical_search_values' => Array('A' + , 'B' + , 'C' + , 'D' + , 'E' + , 'F' + , 'G' + , 'H' + , 'I' + , 'J' + , 'K' + , 'L' + , 'M' + , 'N' + , 'O' + , 'P' + , 'Q' + , 'R' + , 'S' + , 'U' + , 'V' + , 'W' + , 'X' + , 'Y' + , 'Z' + ), ); - - ?> Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Wed Mar 22 20:22:10 2006 @@ -4087,6 +4087,9 @@ //parameter $viewid added for customview 27/5 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='') { + /* for access to alphabetical_search values stored in /include/$lang.language.php */ + global $app_list_strings; + if($type=='advanced') $flag='&advanced=true'; @@ -4097,9 +4100,14 @@ $returnvalue = '&recordid='.$recordid; if($return_module != '') $returnvalue .= '&return_module='.$return_module; - - for($var='A',$i =1;$i<=26;$i++,$var++) - $list .= '    		'.$var.''.$alphabetical_search_values[$i].'
    + @@ -5070,10 +5072,10 @@ - + - + datefilterid From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 20:58:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:58:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2337=3A_J?= =?utf-8?q?pgraph_fixes_for_Traditional_Chinese?= In-Reply-To: <076.f161b40809c2565abef624af37d6d80f@vtiger.fosslabs.com> References: <076.f161b40809c2565abef624af37d6d80f@vtiger.fosslabs.com> Message-ID: <085.3ec064ffd6439dc7df236c9d8ce7a493@vtiger.fosslabs.com> #37: Jpgraph fixes for Traditional Chinese -------------------------------+-------------------------------------------- Reporter: kiange at gmail.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: chinese,jpgraph -------------------------------+-------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4399]) Jpgraph fixes for Traditional Chinese, by kiange. closes #37 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 20:58:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 04:58:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4399 - in /vtigercrm/branches/4.2: jpgraph/jpg-config.inc jpgraph/jpgraph.php modules/Potentials/Charts.php Message-ID: <20060323045809.F02DE4EAD1F@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 21:58:05 2006 New Revision: 4399 Log: Jpgraph fixes for Traditional Chinese, by kiange. closes #37 Modified: vtigercrm/branches/4.2/jpgraph/jpg-config.inc vtigercrm/branches/4.2/jpgraph/jpgraph.php vtigercrm/branches/4.2/modules/Potentials/Charts.php Modified: vtigercrm/branches/4.2/jpgraph/jpg-config.inc ============================================================================== --- vtigercrm/branches/4.2/jpgraph/jpg-config.inc (original) +++ vtigercrm/branches/4.2/jpgraph/jpg-config.inc Wed Mar 22 21:58:05 2006 @@ -64,6 +64,10 @@ // either FF_CHINESE or FF_BIG5 DEFINE('CHINESE_TTF_FONT','bkai00mp.ttf'); +// For Traditional Chinese with UTF-8 encode +// Download from http://twpug.net/modules/wfdownloads/visit.php?cid=33&lid=566 +DEFINE('TCHINESE_UTF8_FONT','fireflysung.ttf'); + // Special unicode cyrillic language support DEFINE("LANGUAGE_CYRILLIC",false); Modified: vtigercrm/branches/4.2/jpgraph/jpgraph.php ============================================================================== --- vtigercrm/branches/4.2/jpgraph/jpgraph.php (original) +++ vtigercrm/branches/4.2/jpgraph/jpgraph.php Wed Mar 22 21:58:05 2006 @@ -83,6 +83,7 @@ DEFINE("FF_SIMSUN",30); DEFINE("FF_CHINESE",31); DEFINE("FF_BIG5",31); +DEFINE("FF_TCHINESE_UTF8",32); // Japanese font DEFINE("FF_MINCHO",40); @@ -3087,6 +3088,7 @@ FF_VERASERIF => array(FS_NORMAL=>'VeraSe.ttf', FS_BOLD=>'VeraSeBd.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ) , FF_SIMSUN => array(FS_NORMAL=>'simsun.ttc', FS_BOLD=>'simhei.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_CHINESE => array(FS_NORMAL=>CHINESE_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), + FF_TCHINESE_UTF8 => array(FS_NORMAL=>TCHINESE_UTF8_FONT, FS_BOLD=>TCHINESE_UTF8_FONT, FS_ITALIC=>TCHINESE_UTF8_FONT, FS_BOLDITALIC=>TCHINESE_UTF8_FONT ), FF_MINCHO => array(FS_NORMAL=>MINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_PMINCHO => array(FS_NORMAL=>PMINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_GOTHIC => array(FS_NORMAL=>GOTHIC_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Wed Mar 22 21:58:05 2006 @@ -40,6 +40,7 @@ DEFINE("FF_SIMSUN",30); DEFINE("FF_CHINESE",31); DEFINE("FF_BIG5",31); +DEFINE("FF_TCHINESE_UTF8",32); function calculate_font_family($locale) @@ -50,6 +51,8 @@ { case 'cn_zh': return FF_SIMSUN; + case 'zh-tw': + return FF_TCHINESE_UTF8; case 'tw_zh': if(!function_exists('iconv')){ echo " Unable to display traditional Chinese on the graphs.
    The function iconv does not exists please read more about iconv here
    "; From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:33:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:33:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.e656980897d46134526e49d7e02895dd@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: -----------------------------------------------+---------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4400]) Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:33:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:33:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4400 - in /vtigercrm/branches/4.2/modules: Potentials/RenderRelatedListUI.php Quotes/Save.php Message-ID: <20060323053355.4CE584EAD67@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:33:52 2006 New Revision: 4400 Log: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 Modified: vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php vtigercrm/branches/4.2/modules/Quotes/Save.php Modified: vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php Wed Mar 22 22:33:52 2006 @@ -18,7 +18,8 @@ $hidden .= ''; $hidden .= ''; $hidden .= ''; - $hidden .= ''; + //2-21-06 arodes - removed contact_id value = $id since the id passed in is not a contact id value + $hidden .= ''; $hidden .= ''; $hidden .= ''; $hidden .= ''; Modified: vtigercrm/branches/4.2/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/Save.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/Save.php Wed Mar 22 22:33:52 2006 @@ -53,6 +53,12 @@ if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; + $match = stristr($fieldname,'id'); // adding this to try and set only foreign keys. + if(empty($value) && $match != '0') // we dont want ALL blank values set to null + { + $value = 'null'; + } + //echo '
    '; //echo $fieldname." ".$value; //echo '
    '; From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:34:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:34:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2366=3A_W?= =?utf-8?q?ebmail=3A_HTML-Part_not_displayable=2C_Attachments_not_transfer?= =?utf-8?q?able_to_CRM?= In-Reply-To: <076.24462a01d102c82cc33c01d47bb674f8@vtiger.fosslabs.com> References: <076.24462a01d102c82cc33c01d47bb674f8@vtiger.fosslabs.com> Message-ID: <085.5f21c4756074c6af74c0c67816d778e9@vtiger.fosslabs.com> #66: Webmail: HTML-Part not displayable, Attachments not transferable to CRM ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: mail email webmail attachment ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:39:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:39:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2354=3A_T?= =?utf-8?q?ranslate_of_hard_code_by_Summing_columns_in_reports?= In-Reply-To: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> References: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> Message-ID: <085.04535e21af04a39b90ad7dfbad7ff1c6@vtiger.fosslabs.com> #54: Translate of hard code by Summing columns in reports --------------------------+------------------------------------------------- Reporter: Kleo | Owner: developer Type: enhancement | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: --------------------------+------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4401]) Translate of hard code by Summing columns in reports, by kleo. closes #54 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:39:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:39:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4401 - /vtigercrm/branches/4.2/modules/Reports/ReportRun.php Message-ID: <20060323053953.954EC4EAD74@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:39:51 2006 New Revision: 4401 Log: Translate of hard code by Summing columns in reports, by kleo. closes #54 Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Wed Mar 22 22:39:51 2006 @@ -1383,7 +1383,7 @@ $y=$adb->num_fields($result); $custom_field_values = $adb->fetch_array($result); - $coltotalhtml .= "
    "; + $coltotalhtml .= "
    TotalsSUMAVGMINMAX
    "; foreach($this->totallist as $key=>$value) { From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2364=3A_A?= =?utf-8?q?ttachment_filenames_with_special_characters_won=27t_download?= In-Reply-To: <076.c7fcbf29ad36f8e9090608937c022092@vtiger.fosslabs.com> References: <076.c7fcbf29ad36f8e9090608937c022092@vtiger.fosslabs.com> Message-ID: <085.7718c02238eaa674c41008c8a91fbc0b@vtiger.fosslabs.com> #64: Attachment filenames with special characters won't download ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4402]) urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:50:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:50:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4402 - /vtigercrm/branches/4.2/include/RelatedListView.php Message-ID: <20060323055023.C51C04EAD84@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:50:20 2006 New Revision: 4402 Log: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 Modified: vtigercrm/branches/4.2/include/RelatedListView.php Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Wed Mar 22 22:50:20 2006 @@ -299,7 +299,7 @@ $list .= ''; $list .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } if(isset($cust_fld)) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:35:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:35:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4405 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060324073547.7A20C4EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:35:31 2006 New Revision: 4405 Log: * Removed the unwanted codes which are related to Product details Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Fri Mar 24 00:35:31 2006 @@ -150,24 +150,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:37:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:37:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4406 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060324073717.B34BB4EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:37:07 2006 New Revision: 4406 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Fri Mar 24 00:37:07 2006 @@ -82,6 +82,10 @@ global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus)); + $smarty->display("DetailView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:38:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:38:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4407 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060324073847.DA9914EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:38:39 2006 New Revision: 4407 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Fri Mar 24 00:38:39 2006 @@ -98,6 +98,10 @@ $permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); $smarty->assign("MODULE", $currentModule); + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Quotes',$focus)); + $smarty->display("DetailView.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:39:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:39:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4408 - /vtigercrm/trunk/modules/Quotes/Save.php Message-ID: <20060324073927.EF5194EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:39:12 2006 New Revision: 4408 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/Quotes/Save.php Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Fri Mar 24 00:39:12 2006 @@ -25,6 +25,7 @@ require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -213,7 +214,6 @@ $body = str_replace('{QUOTEQUANTITY}',$qty,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("Quotes",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:41:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:41:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4409 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060324074128.CEBE84EBC0C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:41:13 2006 New Revision: 4409 Log: * Changed the function call to get the products from getAssociatedProducts to getProductDetailsBlockInfo Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Fri Mar 24 00:41:13 2006 @@ -135,7 +135,8 @@ $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $num_of_products = getNoOfAssocProducts($module,$focus); $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Quotes",$focus); + //$associated_prod = getAssociatedProducts("Quotes",$focus); + $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); //getAssociatedProducts("Quotes",$focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:42:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:42:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4410 - /vtigercrm/trunk/modules/Invoice/Save.php Message-ID: <20060324074234.7374D4EBC0B@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:42:19 2006 New Revision: 4410 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/Invoice/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Fri Mar 24 00:42:19 2006 @@ -23,8 +23,8 @@ require_once('modules/Invoice/Invoice.php'); require_once('include/logging.php'); -//require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -195,7 +195,6 @@ $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("Invoice",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:46:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:46:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4411 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060324074637.98A634EBC1A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:46:23 2006 New Revision: 4411 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Fri Mar 24 00:46:23 2006 @@ -83,6 +83,10 @@ global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Invoice',$focus)); + $smarty->display("DetailView.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:48:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:48:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4412 - /vtigercrm/trunk/modules/Products/EditView.php Message-ID: <20060324074816.802384EBC1A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:48:08 2006 New Revision: 4412 Log: * Added check whether the focus object has id or not to avoid the error Modified: vtigercrm/trunk/modules/Products/EditView.php Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Fri Mar 24 00:48:08 2006 @@ -94,7 +94,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); -$smarty->assign("ROWCOUNT", getImageCount($focus->id)); +if($focus->id != '') + $smarty->assign("ROWCOUNT", getImageCount($focus->id)); if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:50:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:50:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4413 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060324075045.301844EBC29@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:50:31 2006 New Revision: 4413 Log: * Added script function call settotalnoofrows in onBlur of Qty and ListPrice textboxes Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Fri Mar 24 00:50:31 2006 @@ -1379,9 +1379,9 @@ var colseven = row.insertCell(6); colone.innerHTML=" "; coltwo.innerHTML="
    "; - colthree.innerHTML=" "; + colthree.innerHTML=" "; colfour.innerHTML=" 
    "; - colfive.innerHTML="  "; + colfive.innerHTML="  "; colsix.innerHTML=" 
    "; colseven.innerHTML="Del"; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:52:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:52:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4414 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060324075256.B86D94EBC28@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:52:47 2006 New Revision: 4414 Log: * Added condition to avoid the error when potentialid is empty in function getPotentialName Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Mar 24 00:52:47 2006 @@ -331,12 +331,16 @@ function getPotentialName($potential_id) { global $log; -$log->info("in getPotentialName ".$potential_id); + $log->info("in getPotentialName ".$potential_id); global $adb; - $sql = "select potentialname from potential where potentialid=".$potential_id; - $result = $adb->query($sql); - $potentialname = $adb->query_result($result,0,"potentialname"); + $potentialname = ''; + if($potential_id != '') + { + $sql = "select potentialname from potential where potentialid=".$potential_id; + $result = $adb->query($sql); + $potentialname = $adb->query_result($result,0,"potentialname"); + } return $potentialname; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:55:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:55:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4415 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060324075507.C6A144EBC28@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:54:55 2006 New Revision: 4415 Log: * Removed the extra div and table close tags in function getDetailAssociatedProducts Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Fri Mar 24 00:54:55 2006 @@ -760,7 +760,6 @@ $output .= ''; $output .= ''; $output .= ''; - //$output .= ''; $output .= ''; if($module == 'Quotes') @@ -817,7 +816,6 @@ $output .= ''; $output .= ''; $output .= '
    {$mod_strings['LBL_COLUMNS']}{$mod_strings['LBL_COLUMNS_SUM']}{$mod_strings['LBL_COLUMNS_AVERAGE']}{$mod_strings['LBL_COLUMNS_LOW_VALUE']}{$mod_strings['LBL_COLUMNS_LARGE_VALUE']}
    '; $list .= ''; - $list .= ''.$row[2].''; + $list .= '' . $row[2] . ''; $list .= ''; From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:53:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:53:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?= =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?= =?utf-8?q?associations?= In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> Message-ID: <085.2c67ad33db43d77037fd211a5b7889af@vtiger.fosslabs.com> #48: Sales Orders Created from Quote are not saved and do not retain associations -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: order -----------------------------------------------+---------------------------- Comment (by mfedyk): Leaving open to see if r4400 for #51 fixes this problem. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 21:55:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 05:55:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4403 - /vtigercrm/trunk/modules/SalesOrder/Save.php Message-ID: <20060324055528.6A84E4EBB22@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 23 22:55:21 2006 New Revision: 4403 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/SalesOrder/Save.php Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Mar 23 22:55:21 2006 @@ -24,6 +24,7 @@ require_once('modules/SalesOrder/SalesOrder.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -180,7 +181,6 @@ $body = str_replace('{SOQUANTITY}',$qty,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("SalesOrder",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 21:56:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 05:56:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4404 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060324055625.967354EBB22@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 23 22:56:20 2006 New Revision: 4404 Log: Removed the unwanted codes which are related to Product details Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Mar 23 22:56:20 2006 @@ -246,26 +246,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= '
     
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
    Unit Price List PriceTotal 
    '; - $output .= ''; $output .= ''; $output .= ''; $output .= ''; @@ -840,7 +838,6 @@ $output .= ''; $output .= ''; $output .= '
     '.$focus->column_fields['hdnGrandTotal'].'
    '; - $output .= '
    '; return $output; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 23:57:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:57:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4416 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060324075757.C47174EBC34@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:57:41 2006 New Revision: 4416 Log: * Removed the unwanted codes and correct assign the hidden values in function getAssociatedProducts Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Mar 24 00:57:41 2006 @@ -1115,56 +1115,28 @@ $list_price_var = 'txtListPrice'.$i; $total_var = 'total'.$i; - if($i%2 == 0) - { - $row_class = "evenListRow"; - } - else - { - $row_class = "oddListRow"; - } - - $product_Detail[$i]['txtProduct']= $productname; - - /*$output .= '
    '.$qtyinstock.'
     
    '.$unitprice.'
     
    '.$total.'
    		Del'; $product_Detail[$i]['delRow'.$i]="Del"; } - else - { - #$output .= ''; - } - $product_Detail[$i]['hdnProductId'.$i]=$total; - #$output .= ''; - $product_Detail[$i]['hdnRowStatus'.$i]=''; - #$output .= ''; - $product_Detail[$i]['hdnTotal'.$i]=''; - #$output .= ''; - #$output .= '
    + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} {/if} + @@ -195,12 +197,14 @@ + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - + {/if} - + + - + @@ -209,11 +213,13 @@
    '; echo ''; @@ -37,7 +39,6 @@ function fetchTabIDVal($fldmodule) { - global $adb; $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; $tabidresult = $adb->query($query); @@ -45,7 +46,6 @@ } $tabid = fetchTabIDVal($_REQUEST['fld_module']); - $fld_module = $_REQUEST['fld_module']; echo getCustomFieldList($tabid,$mod_strings,$fld_module); @@ -100,6 +100,8 @@ $list .= ''; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:52:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:52:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4431 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060324135250.165014EBF4C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:52:45 2006 New Revision: 4431 Log: changes made to integrate customfield edit Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Fri Mar 24 06:52:45 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - +require_once('include/CustomFieldUtil.php'); +global $mod_strings,$adb; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings['NEW']." ".$mod_strings[$_REQUEST['fld_module']]." ".$mod_strings['CUSTOMFIELD'], true); require_once('XTemplate/xtpl.php'); global $mod_strings; @@ -22,8 +22,37 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); - +$tabid=$_REQUEST['tabid']; +$fieldid=$_REQUEST['fieldid']; $xtpl=new XTemplate ('modules/Settings/customfield.html'); +if(isset($fieldid) && $fieldid!='') +{ + $mode='edit'; + $customfield_columnname=getCustomFieldData($tabid,$fieldid,'columnname'); + $customfield_typeofdata=getCustomFieldData($tabid,$fieldid,'typeofdata'); + $customfield_fieldlabel=getCustomFieldData($tabid,$fieldid,'fieldlabel'); + $customfield_typename=getCustomFieldTypeName($_REQUEST['uitype']); + $fieldtype_lengthvalue=getFldTypeandLengthValue($customfield_typename,$customfield_typeofdata); + list($fieldtype,$fieldlength,$decimalvalue)= explode(";",$fieldtype_lengthvalue); + $xtpl->assign("LABELVALUE",$customfield_fieldlabel); + $xtpl->assign("LENGTHVALUE",$fieldlength); + $xtpl->assign("DECIMALVALUE",$decimalvalue); + if($fieldtype == '7') + { + $query = "select * from ".$customfield_columnname; + $result = $adb->query($query); + $fldVal=''; + while($row = $adb->fetch_array($result)) + { + $fldVal .= $row[$customfield_columnname]; + $fldVal .= "\n"; + } + $xtpl->assign("PICKLISTVALUE",$fldVal); + } + $xtpl->assign("FLDTYPEVALUE", $fieldtype); + $xtpl->assign("FLDID", $fieldid); + $xtpl->assign("COLUMN",$customfield_columnname); +} $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); $xtpl->assign("FLD_MODULE", $_REQUEST['fld_module']); @@ -35,7 +64,6 @@ $xtpl->assign("LENGTHVALUE", $_REQUEST["fldlength"]); $xtpl->assign("DECIMALVALUE", $_REQUEST["flddecimal"]); $xtpl->assign("PICKLISTVALUE", $_REQUEST["fldPickList"]); - //$xtpl->assign("FLDTYPEVALUE", $_REQUEST["fldType"]); $typeVal = Array( 'Text'=>'0', 'Number'=>'1', From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 06:04:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:04:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4432 - /vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Message-ID: <20060324140453.2F3254EBF57@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:04:48 2006 New Revision: 4432 Log: parenttab has been included for customfield Modified: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Fri Mar 24 07:04:48 2006 @@ -1,3 +1,17 @@ +{**} +
    *ProductQty In Stock*Qty Unit Price *List Price
     
     
     
         		  
         		  
    + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} {else} {/if} + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 00:04:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 08:04:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4418 - /vtigercrm/trunk/Smarty/templates/salesEditView.tpl Message-ID: <20060324080418.865AE4EBC45@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 01:04:06 2006 New Revision: 4418 Log: * Added to display the Product Details Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Mar 24 01:04:06 2006 @@ -171,6 +171,110 @@ {assign var="fldname" value="$maindata[2][0]"} {assign var="fldvalue" value="$maindata[3][0]"} {assign var="secondvalue" value="$maindata[3][1]"} + + + + + {if $header eq 'Product Details'} + + + + + + + {/if} + + + {if $uitype eq 2} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 01:15:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 09:15:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4419 - in /vtigercrm/trunk/install: 2setConfig.php 3confirmConfig.php Message-ID: <20060324091501.6E5144EBCD8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 02:14:38 2006 New Revision: 4419 Log: dbtype select option is given and database version check is added Modified: vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 03:11:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 11:11:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4420 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060324111123.3F7104EBDE5@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 04:11:17 2006 New Revision: 4420 Log: tab cloud population removed Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Fri Mar 24 04:11:17 2006 @@ -157,7 +157,7 @@ $user->date_format = 'yyyy-mm-dd'; // added by jeri to populate default image and tagcloud for admin $user->imagename = 'admin.jpeg'; - $user->tagcloud = 'http://www.tagcloud.com/cloud/js/mycloud79/default/50'; + $user->tagcloud = ''; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:13:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:13:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4421 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060324121323.52E1E4EBE68@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:13:13 2006 New Revision: 4421 Log: vtiger log has been removed Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Fri Mar 24 05:13:13 2006 @@ -17,9 +17,7 @@ include('adodb/adodb.inc.php'); require_once("adodb/adodb-xmlschema.inc.php"); -require_once('vtigerlogger.php'); -global $vtlog; -$vtlog = new vtigerLogger(); +$log =& LoggerManager::getLogger('VT'); class PearDatabase{ var $database = null; @@ -185,7 +183,7 @@ * Contributor(s): ______________________________________.. */ function checkConnection(){ -global $vtlog; +global $log; if(!isset($this->database)) { $this->println("TRANS creating new connection"); @@ -202,7 +200,7 @@ else { // $this->println("checkconnect using old connection"); - $vtlog->logthis('checkconnect using old connection','info'); + $log->info('checkconnect using old connection'); } } @@ -227,9 +225,9 @@ function query($sql, $dieOnError=false, $msg='') { - global $vtlog; + global $log; //$this->println("ADODB query ".$sql); - $vtlog->logthis('query being executed : '.$sql,'debug'); + $log->debug('query being executed : '.$sql); $this->checkConnection(); $result = & $this->database->Execute($sql); $this->lastmysqlrow = -1; @@ -282,9 +280,9 @@ function limitQuery($sql,$start,$count, $dieOnError=false, $msg='') { - global $vtlog; + global $log; //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count); - $vtlog->logthis(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count,'debug'); + $log->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count); $this->checkConnection(); $result =& $this->database->SelectLimit($sql,$count,$start); if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError); @@ -397,12 +395,12 @@ */ function getRowCount(&$result){ - global $vtlog; + global $log; //$this->println("ADODB getRowCount"); if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $vtlog->logthis('getRowCount rows= '.$rows,'debug'); + $log->debug('getRowCount rows= '.$rows); return $rows; } @@ -459,12 +457,12 @@ }*/ function getAffectedRowCount(&$result){ - global $vtlog; + global $log; // $this->println("ADODB getAffectedRowCount"); - $vtlog->logthis('getAffectedRowCount','debug'); + $log->debug('getAffectedRowCount'); $rows =$this->database->Affected_Rows(); // $this->println("ADODB getAffectedRowCount rows=".rows); - $vtlog->logthis('getAffectedRowCount rows = '.$rows,'debug'); + $log->debug('getAffectedRowCount rows = '.$rows); return $rows; } @@ -574,10 +572,10 @@ */ function getNextRow(&$result, $encode=true){ - global $vtlog; + global $log; //$this->println("ADODB getNextRow"); - $vtlog->logthis('getNextRow','info'); + $log->info('getNextRow'); if(isset($result)){ $row = $this->change_key_case($result->FetchRow()); if($row && $encode&& is_array($row))return array_map('to_html', $row); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:13:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:13:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4422 - /vtigercrm/trunk/vtigerversion.php Message-ID: <20060324121333.CA6174EBE69@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:13:29 2006 New Revision: 4422 Log: Space removed Modified: vtigercrm/trunk/vtigerversion.php Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Fri Mar 24 05:13:29 2006 @@ -8,7 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - $patch_version = ''; $modified_database = ''; $vtiger_current_version = '4.2 GA'; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:19:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:19:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4423 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060324121932.08CA84EBE76@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:19:26 2006 New Revision: 4423 Log: code for multiselectcombobox has been included Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Mar 24 05:19:26 2006 @@ -296,6 +296,19 @@ {/foreach} + {elseif $uitype eq 33} + + {elseif $uitype eq 53} + {elseif $uitype eq 33} + + {elseif $uitype eq 53} + + + +
      Sub Total
    + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + + {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS.1} + {assign var="txtProduct" value="txtProduct"|cat:$row_no} + {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} + {assign var="txtQty" value="txtQty"|cat:$row_no} + {assign var="unitPrice" value="unitPrice"|cat:$row_no} + {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} + {assign var="total" value="total"|cat:$row_no} + {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} + {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} + {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + {/foreach} +
    *ProductQty In Stock*QtyUnit Price *List PriceTotal 
     
    {$data.$qtyInStock}
     
    {$data.$unitPrice}
         		 
    {$data.$total}
         		 + + +   +
    +
    + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     Sub Total 
      Tax 
      Adjusment 
      Grand Total 
    + + + +
    + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:22:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:22:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4424 - /vtigercrm/trunk/Smarty/templates/salesEditView.tpl Message-ID: <20060324122234.A6DC84EBE83@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:22:29 2006 New Revision: 4424 Log: changes made to integrate multiselect combo box Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Mar 24 05:22:29 2006 @@ -318,6 +318,19 @@ {/foreach} + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:25:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:25:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4425 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060324122556.339744EBE90@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:25:51 2006 New Revision: 4425 Log: check for uitype=33 has been made Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Mar 24 05:25:51 2006 @@ -105,7 +105,7 @@ $fieldvalue[] = array($date_format=>$current_user->date_format.' '.$app_strings['YEAR_MONTH_DATE']); } } - elseif($uitype == 15 || $uitype == 16) + elseif($uitype == 15 || $uitype == 16 || $uitype == 33) { $editview_label[]=$mod_strings[$fieldlabel]; $pick_query="select * from ".$fieldname; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:05:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4426 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060324130539.BF0C54EBEE5@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:05:35 2006 New Revision: 4426 Log: changes made for customfield edit Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Fri Mar 24 06:05:35 2006 @@ -9,20 +9,11 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -//require_once('adodb/adodb.php'); $fldmodule=$_REQUEST['fld_module']; $fldlabel=$_REQUEST['fldLabel']; $fldType= $_REQUEST['fieldType']; - -/* - -echo 'module is ' .$fldmodule; -echo 'label is '. $fldlabel; -echo 'field type is ' .$fldType; - -*/ - + $parenttab=$_REQUEST['parenttab']; function fetchTabIDVal($fldmodule) { @@ -74,30 +65,22 @@ $fldPickList=''; } - header("Location:index.php?module=Settings&action=CreateCustomField&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&duplicate=yes"); + header("Location:index.php?module=Settings&action=CreateCustomField&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&parenttab=".$parenttab."&duplicate=yes"); } else { - /* - //Creating the ColumnName - $sql = "select max(fieldid) fieldid from customfields"; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $row = $adb->fetch_array($result); - $max_fieldid = $row["fieldid"]; - $max_fieldid++; - } - else - { - $max_fieldid = "1"; - } - */ + if($_REQUEST['fieldid'] == '') + { + $max_fieldid = $adb->getUniqueID("field"); + $columnName = 'cf_'.$max_fieldid; + } + else + { + $max_fieldid = $_REQUEST['column']; + $columnName = $max_fieldid; + } - $max_fieldid = $adb->getUniqueID("field"); - - $columnName = 'cf_'.$max_fieldid; //Assigning the table Name $tableName =''; if($fldmodule == 'Leads') @@ -168,14 +151,12 @@ { $uichekdata='V~O~LE~'.$fldlength; $uitype = 1; - //$type = "varchar(".$fldlength.")"; $type = "C(".$fldlength.")"; // adodb type } elseif($fldType == 'Number') { $uitype = 7; - //$type="double(".$fldlength.",".$decimal.")"; //this may sound ridiculous passing decimal but that is the way adodb wants $dbfldlength = $fldlength + $decimal + 1; @@ -185,14 +166,12 @@ elseif($fldType == 'Percent') { $uitype = 9; - //$type="double(".$fldlength.",".$decimal.")"; $type="N(5.2)"; //adodb type $uichekdata='N~O~2~2'; } elseif($fldType == 'Currency') { $uitype = 71; - //$type="double(".$fldlength.",".$decimal.")"; $dbfldlength = $fldlength + $decimal + 1; $type="N(".$dbfldlength.".".$decimal.")"; //adodb type $uichekdata='N~O~'.$fldlength .','.$decimal; @@ -201,21 +180,18 @@ { $uichekdata='D~O'; $uitype = 5; - //$type = "date"; $type = "D"; // adodb type } elseif($fldType == 'Email') { $uitype = 13; - //$type = "varchar(50)"; $type = "C(50)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'Phone') { $uitype = 11; - //$type = "varchar(30)"; $type = "C(30)"; //adodb type $uichekdata='V~O'; @@ -223,21 +199,18 @@ elseif($fldType == 'Picklist') { $uitype = 15; - //$type = "varchar(255)"; $type = "C(255)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'URL') { $uitype = 17; - //$type = "varchar(255)"; $type = "C(255)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'Checkbox') { $uitype = 56; - //$type = "varchar(255)"; $type = "C(3) default 0"; //adodb type $uichekdata='C~0'; } @@ -247,6 +220,12 @@ $type = "X"; //adodb type $uichekdata='V~0'; } + elseif($fldType == 'MultiSelectCombo') + { + $uitype = 33; + $type = "X"; //adodb type + $uichekdata='V~0'; + } // No Decimal Pleaces Handling @@ -257,9 +236,11 @@ //1. add the customfield table to the field table as Block4 //2. fetch the contents of the custom field and show in the UI - //$query = "insert into customfields values('','".$columnName."','".$tableName."',2,".$uitype.",'".$fldlabel."','0','".$fldmodule."')"; //retreiving the sequence - $custfld_fieldid=$adb->getUniqueID("field"); + if($_REQUEST['fieldid'] == '') + { + $custfld_fieldid=$adb->getUniqueID("field"); + } $custfld_sequece=$adb->getUniqueId("customfield_sequence"); $blockid =''; @@ -268,13 +249,19 @@ if(is_numeric($blockid)) { - - $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; - - $adb->query($query); - - $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); - + if($_REQUEST['fieldid'] == '') + { + $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; + $adb->query($query); + $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); + } + else + { + $query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid']; + $adb->query($query); + $adb->alterTable($tableName, $columnName, "Delete_Column"); + $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); + } //Inserting values into profile2field tables $sql1 = "select * from profile"; $sql1_result = $adb->query($sql1); @@ -291,11 +278,9 @@ $adb->query($sql_def); - if($fldType == 'Picklist') + if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo') { // Creating the PickList Table and Populating Values - /*$query = "create table ".$fldmodule."_".$columnName." (".$columnName." varchar(255) NOT NULL)"; - mysql_query($query);*/ $adb->createTable($columnName, $columnName." C(255)"); //Adding Primary Key $qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")"; @@ -322,6 +307,6 @@ $adb->query($sql_def); } } - header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fldmodule); + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fldmodule."&parenttab=".$parenttab); } ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:18:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:18:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4427 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060324131834.581CC4EBEFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:18:30 2006 New Revision: 4427 Log: label for multiselect combo box has been included Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Fri Mar 24 06:18:30 2006 @@ -233,6 +233,8 @@ 'Phone'=>'Phone', 'PickList'=>'Pick List', + +'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:27:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:27:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4428 - /vtigercrm/trunk/modules/Settings/fieldtypes.php Message-ID: <20060324132738.5D4304EBF13@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:27:18 2006 New Revision: 4428 Log: changes made to create multiselect combobox custom field Modified: vtigercrm/trunk/modules/Settings/fieldtypes.php Modified: vtigercrm/trunk/modules/Settings/fieldtypes.php ============================================================================== --- vtigercrm/trunk/modules/Settings/fieldtypes.php (original) +++ vtigercrm/trunk/modules/Settings/fieldtypes.php Fri Mar 24 06:27:18 2006 @@ -82,6 +82,10 @@
    " width="20" height="20">
    " width="20" height="20">
    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:37:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:37:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4429 - /vtigercrm/trunk/modules/Settings/customfield.html Message-ID: <20060324133716.383474EBF29@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:37:11 2006 New Revision: 4429 Log: changes made for customfield edit and multiselect combo box Modified: vtigercrm/trunk/modules/Settings/customfield.html Modified: vtigercrm/trunk/modules/Settings/customfield.html ============================================================================== --- vtigercrm/trunk/modules/Settings/customfield.html (original) +++ vtigercrm/trunk/modules/Settings/customfield.html Fri Mar 24 06:37:11 2006 @@ -31,14 +31,6 @@ break; } } -/* while(pickListContent.indexOf("\n")!=-1) { - if (pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) { - pickListAry[i]=pickListContent.substr(0,pickListContent.indexOf("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '') - pickListContent=pickListContent.substr(pickListContent.indexOf("\n")+1,pickListContent.length) - i++ - } else break; - } -*/ } else if (pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) { pickListAry[0]=pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '') } @@ -115,8 +107,8 @@ } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 05:46:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:46:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4430 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060324134659.DCB884EBF40@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:46:54 2006 New Revision: 4430 Log: edit link has been included Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Fri Mar 24 06:46:54 2006 @@ -21,6 +21,8 @@ echo '
    '; echo ''; echo ''; +echo ''; +echo ''; echo ''; echo '
    '; $list .= ''.$mod_strings['Delete'].''; + $list .=' | '.$mod_strings['Edit'].''; + $list .= '
    {include file='SettingsMenu.tpl'} @@ -8,18 +22,18 @@ +{$MOD.LEADCUSTOMFIELDS}
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_STUDIO} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    -{$MOD.LEADCUSTOMFIELDS} -{$MOD.ACCOUNTCUSTOMFIELDS}
    -{$MOD.CONTACTCUSTOMFIELDS} -{$MOD.OPPORTUNITYCUSTOMFIELDS}
    -{$MOD.HELPDESKCUSTOMFIELDS} -{$MOD.PRODUCTCUSTOMFIELDS}
    -{$MOD.VENDORCUSTOMFIELDS} -{$MOD.PRICEBOOKCUSTOMFIELDS}
    -{$MOD.POCUSTOMFIELDS} -{$MOD.SOCUSTOMFIELDS}
    -{$MOD.QUOTESCUSTOMFIELDS} -{$MOD.INVOICECUSTOMFIELDS}
    +{$MOD.ACCOUNTCUSTOMFIELDS}
    +{$MOD.CONTACTCUSTOMFIELDS} +{$MOD.OPPORTUNITYCUSTOMFIELDS}
    +{$MOD.HELPDESKCUSTOMFIELDS} +{$MOD.PRODUCTCUSTOMFIELDS}
    +{$MOD.VENDORCUSTOMFIELDS} +{$MOD.PRICEBOOKCUSTOMFIELDS}
    +{$MOD.POCUSTOMFIELDS} +{$MOD.SOCUSTOMFIELDS}
    +{$MOD.QUOTESCUSTOMFIELDS} +{$MOD.INVOICECUSTOMFIELDS}
    + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:01:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:01:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4504 - in /vtigercrm/trunk/modules/Home: Forms.php home_rss.php index.php Message-ID: <20060328050112.04BE14FF57F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:01:05 2006 New Revision: 4504 Log: junk code removed in homepage Modified: vtigercrm/trunk/modules/Home/Forms.php vtigercrm/trunk/modules/Home/home_rss.php vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/Forms.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Home/home_rss.php ============================================================================== --- vtigercrm/trunk/modules/Home/home_rss.php (original) +++ vtigercrm/trunk/modules/Home/home_rss.php Mon Mar 27 22:01:05 2006 @@ -32,10 +32,7 @@ //retrieving notifications****************************** //<<<<<<<<<<<<<<<< start of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> $query = "select crmentity.setype,crmentity.crmid,crmentity.smcreatorid,crmentity.modifiedtime from crmentity inner join ownernotify on crmentity.crmid=ownernotify.crmid"; -//where ownernotify.smownerid=".$current_user->id; -//echo $query; -//$notify=array ('Accounts' =>0,'Potentials'=>0,'Contacts'=>0,'Leads'=>0,'Vendor'=>0,'Products'=>0,'Faq'=>0,'HelpDesk'=>0,'Activities'=>0); $result = $adb->query($query); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -120,24 +117,6 @@ -/* if($notify['Accounts']>0) - $notify_values='Accounts '.$notify['Accounts'].'
    '; - if($notify['Potentials']>0) - $notify_values.='Potentials '.$notify['Potentials'].'
    '; - if($notify['Contacts']>0) - $notify_values.='Contacts '.$notify['Contacts'].'
    '; - if($notify['Leads']>0) - $notify_values.='Leads '.$notify['Leads'].'
    '; - if($notify['Vendor']>0) - $notify_values.='Vendor '.$notify['Vendor'].'
    '; - if($notify['Products']>0) - $notify_values.='Products '.$notify['Products'].'
    '; - if($notify['Faq']>0) - $notify_values.='Faq '.$notify['Faq'].'
    '; - if($notify['HelpDesk']>0) - $notify_values.='Ticket '.$notify['HelpDesk'].'
    '; - if($notify['Activities']>0) - $notify_values.='Activity '.$notify['Activities'];*/ //<<<<<<<<<<<<<<<< end of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> // Variable reassignment and reformatting for author @@ -145,9 +124,6 @@ $entry_author = getUserName($author_id); $entry_author = htmlspecialchars ($entry_author); - //$entry_text = strip_tags($db->query_result($tktresult,$i,'description')); - //$entry_id = $db->query_result($tktresult,$i,'ticketid'); - //$entry_title = htmlspecialchars($db->query_result($tktresult,$i,'title')); $entry_link = $site_URL."/index.php?modules=".$mod_notify[$i]['setype']."&action=DetailView&record=".$mod_notify[$i]['crmid']; $entry_link = htmlspecialchars($entry_link); $entry_time = $db->query_result($result,$i,'modifiedtime'); Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Mon Mar 27 22:01:05 2006 @@ -39,12 +39,6 @@ $task_title = $mod_strings['LBL_OPEN_TASKS']; -?> - - -'; - $custfld .= ''; - if($uitype == 13) - { - $custfld .= ''; - } - else - { - $custfld .= ''; - } - $i++; - if($i<$noofrows) - { - $fldName=$adb->query_result($result,$i,"fieldlabel"); - $colName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if($adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($colName)); - } - else - { - $value=''; - } - $custfld .= ''; - if($uitype == 13) - { - - $custfld .= ''; - } - else - { - $custfld .= ''; - } - } - - - $custfld .= ''; - - } - } - return $custfld; -} - +/** + * Function to get custom fields + * @param $module :: table name -- Type string + * returns customfields in key-value pair array format + */ function getCustomFieldArray($module) { global $adb; @@ -298,6 +99,12 @@ } +/** + * Function to get columnname and fieldlabel from field table + * @param $module :: module name -- Type string + * @param $trans_array :: translated column fields -- Type array + * returns trans_array in key-value pair array format + */ function getCustomFieldTrans($module, $trans_array) { global $adb; @@ -315,89 +122,13 @@ } -function CustomFieldSearch($customfieldarray, $fldModule, $tableName,$colidName,$app_strings,$theme,$fieldlabel,$column) -{ - global $adb; - $adb->println("function CustomFieldSearch to display the customfields in search -- include/CustomFieldUtil.php"); - //for($i=0;$i Custom Field : '.$i.'...'.$customfieldarray[$i];} - - //Custom Field Addition - $dbquery = "select * from field where tablename='".$fldModule."' order by fieldlabel"; - $result = $adb->query($dbquery); - if($adb->num_rows($result) != 0) - { - $noofrows = $adb->num_rows($result); - - $custfld = '
    - Author: saraj Date: Mon Mar 27 22:08:32 2006 New Revision: 4505 Log: junk code has been removed and changes made for multiselectcombo box Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Mar 27 22:08:32 2006 @@ -12,6 +12,11 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +/** + * Function to get field typename + * @param $uitype :: uitype -- Type integer + * returns the field type name -- Type string + */ function getCustomFieldTypeName($uitype) { global $log; @@ -73,215 +78,11 @@ return $fldname; } - -function CustomFieldEditView($id, $fldModule, $tableName, $colidName, $app_strings, $theme) -{ - - global $adb; - //Custom Field Addition - $dbquery = "select * from field where tablename='".$fldModule."'"; - $result = $adb->query($dbquery); - if($adb->num_rows($result) != 0) - { - if(isset($id)) - { - $custquery = 'select * from '.$tableName.' where '.$colidName."='".$id."'"; - $cust_result = $adb->query($custquery); - } - $noofrows = $adb->num_rows($result); - - $custfld = ''; - $custfld .= ''; - for($i=0; $i<$noofrows; $i++) - { - $colName=$adb->query_result($result,$i,"fieldlabel"); - $setName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if(isset($id) && $adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($setName)); - } - else - { - $value=''; - } - $custfld .= ' - '; - if($uitype == 5) - { - $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']); - $custfld .= ''; - $custfld .= ''; - } - elseif($uitype == 15) - { - $pick_query="select * from ".$fldModule."_".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - $custfld .= ''; - } - else - { - - $custfld .= ''; - } - $i++; - if($i<$noofrows) - { - $colName=$adb->query_result($result,$i,"fieldlabel"); - $setName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if(isset($id) && $adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,$setName); - } - else - { - $value=''; - } - $custfld .= ''; - if($uitype == 5) - { - $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']); - $custfld .= ''; - $custfld .= ''; - - } - elseif($uitype == 15) - { - $pick_query="select * from ".$fldModule."_".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - $custfld .= ''; - } - else - { - $custfld .= ''; - } - } - - $custfld .= ''; - - } - $custfld .= '
    Custom Information
    '.$colName.': (yyyy-mm-dd)'.$colName.': (yyyy-mm-dd)
    '; - return $custfld; - - } -} - -function CustomFieldDetailView($id, $fldModule, $tableName, $colidName) -{ - global $adb; - //Assigning custom field values - $dbquery = "select * from field where tablename='".$fldModule."'"; - $result = $adb->query($dbquery); - $adb->println($result); - if($adb->num_rows($result) != 0) - { - $custquery = 'select * from '.$tableName.' where '.$colidName."='".$id."'"; - $cust_result = $adb->query($custquery); - $adb->println($cust_result); - - $noofrows=$adb->num_rows($result); - $custfld = ''; - for($i=0; $i<$noofrows; $i++) - { - $fldName=$adb->query_result($result,$i,"fieldlabel"); - $colName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if($adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($colName)); - } - else - { - $value=''; - $adb->println("emply value "); - } - $custfld .= '
    '.$fldName.':'.$value.''.$value.''.$fldName.':'.$value.''.$value.'
    '; - $custfld .= ''; - for($i=0; $i<$noofrows; $i++) - { - $id=$customfieldarray[$i]; - $colName=$column[$i]; - $setName=$fieldlabel[$i]; - $uitype[$i] = $adb->query_result($result,$i,'uitype'); - - if($uitype[$i] == 56) - { - $custfld .= ''; - if($customfieldarray[$i] == 'on') - { - $custfld .=''; - } - else - { - $custfld .=''; - } - } - elseif($uitype[$i] == 15) - { - //This elseif part is added to handle the picklist values in search -- after 4.2 patch2 - $pick_query="select * from ".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - - $custfld .= ''; - $custfld .= ''; - } - else - { - $custfld .= ''; - - $custfld .= ''; - if($i%2==1) - { - $custfld .= ''; - } - } - } - - $custfld .= '
    '.$app_strings['LBL_CUSTOM_INFORMATION'].'
    '.$colName.':'.$colName.':'.$colName.':
    '; - return $custfld; - - } -} - +/** + * Function to get customfield record from field table + * @param $tab :: Tab ID -- Type integer + * @param $datatype :: field name -- Type string + * @param $id :: field Id -- Type integer + * returns the data result in string format + */ function getCustomFieldData($tab,$id,$datatype) { global $adb; @@ -407,6 +138,14 @@ return $return_data[$datatype]; } + +/** + * Function to get customfield type,length value,decimal value and picklist value + * @param $label :: field typename -- Type string + * @param $typeofdata :: datatype -- Type string + * returns the field type,length,decimal + * and picklist value in ';' separated array format + */ function getFldTypeandLengthValue($label,$typeofdata) { if($label == 'Text') @@ -463,6 +202,10 @@ { $fieldtype = '10'; } + elseif($label == 'Multi-Select Combo Box') + { + $fieldtype = '11'; + } return $fieldtype; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4506 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060328051303.9D2F34F288B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:12:59 2006 New Revision: 4506 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Mon Mar 27 22:12:59 2006 @@ -15,16 +15,7 @@ $fldType= $_REQUEST['fieldType']; $parenttab=$_REQUEST['parenttab']; -function fetchTabIDVal($fldmodule) -{ - - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($fldmodule); +$tabid = getTabid($fldmodule); if(get_magic_quotes_gpc() == 1) { @@ -259,8 +250,6 @@ { $query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid']; $adb->query($query); - $adb->alterTable($tableName, $columnName, "Delete_Column"); - $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); } //Inserting values into profile2field tables $sql1 = "select * from profile"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:16:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:16:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4507 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060328051600.71E6D4FFC73@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:15:56 2006 New Revision: 4507 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Mon Mar 27 22:15:56 2006 @@ -15,7 +15,6 @@ global $mod_strings; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings[$_REQUEST['fld_module']].$mod_strings['CustomFields'] , true); -//or die("Couldn't connect to database $dbDatabase"); echo ''; echo ''; @@ -34,18 +33,8 @@ echo '
    '; echo '
    '; -//onclick="this.form.return_module.value="Settings"; this.form.action.value="index" - -function fetchTabIDVal($fldmodule) -{ - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($_REQUEST['fld_module']); +$tabid = getTabid($_REQUEST['fld_module']); $fld_module = $_REQUEST['fld_module']; echo getCustomFieldList($tabid,$mod_strings,$fld_module); @@ -54,11 +43,8 @@ function getCustomFieldList($tabid, $mod_strings, $fld_module) { global $adb; - //fieldid,fieldlabel,column_name,typdesc - - $dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence"; - - $result = $adb->query($dbQuery) or die("Couldn't get file list"); + $dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence"; + $result = $adb->query($dbQuery) or die("Couldn't get file list"); $list = ''; @@ -77,14 +63,11 @@ $list .= $mod_strings['FieldName'].''; -//$list .= ''; $list .= ''; - -//$list .= ''; $i=1; while($row = $adb->fetch_array($result)) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:20:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:20:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4508 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060328052058.8A200505EFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:20:54 2006 New Revision: 4508 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:21:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:21:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4509 - /vtigercrm/trunk/modules/Settings/ComboFieldList.php Message-ID: <20060328052125.09C63505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:21:20 2006 New Revision: 4509 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/ComboFieldList.php Modified: vtigercrm/trunk/modules/Settings/ComboFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/ComboFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/ComboFieldList.php Mon Mar 27 22:21:20 2006 @@ -9,7 +9,6 @@ * All Rights Reserved. * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); require_once('database/DatabaseConnection.php'); require_once('XTemplate/xtpl.php'); @@ -20,8 +19,6 @@ echo get_module_title("Settings",$mod_strings['LBL_MODULE_NAME'].": ".$mod_strings[$_REQUEST['fld_module']].$mod_strings['PicklistFields'], true); echo '
    '; -//echo get_form_header("Standard Fields", "", false ); - global $theme; $theme_path="themes/".$theme."/"; @@ -127,21 +124,7 @@ } - -function fetchTabIDVal($fldmodule) -{ - - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($fldmodule); - - - - +$tabid = getTabid($fldmodule); //Standard PickList Fields function getStdOutput($custFldArray, $mod_strings) @@ -217,8 +200,7 @@ function getUserFldArray($fld_module) { $user_fld = Array(); - $query = "select * from field where generatedtype=2 and tabid=".fetchTabIDVal($fld_module)." and uitype IN (15,16)"; -// echo $query; + $query = "select * from field where generatedtype=2 and tabid=".getTabid($fld_module)." and uitype IN (15,16)"; $result = mysql_query($query); $noofrows = mysql_num_rows($result); if($noofrows > 0) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:21:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:21:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4510 - /vtigercrm/trunk/modules/CustomView/EditView.html Message-ID: <20060328052146.947E9505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:21:42 2006 New Revision: 4510 Log: file removed as customview has been smartified Removed: vtigercrm/trunk/modules/CustomView/EditView.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:22:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:22:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4511 - in /vtigercrm/trunk/modules/CustomView: CustomView.php EditView.php Forms.php ListViewTop.php PopulateCustomView.php Save.php SaveAction.php SendMailAction.php Message-ID: <20060328052245.25530505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:22:35 2006 New Revision: 4511 Log: junk code removed in customview Modified: vtigercrm/trunk/modules/CustomView/CustomView.php vtigercrm/trunk/modules/CustomView/EditView.php vtigercrm/trunk/modules/CustomView/Forms.php vtigercrm/trunk/modules/CustomView/ListViewTop.php vtigercrm/trunk/modules/CustomView/PopulateCustomView.php vtigercrm/trunk/modules/CustomView/Save.php vtigercrm/trunk/modules/CustomView/SaveAction.php vtigercrm/trunk/modules/CustomView/SendMailAction.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Mon Mar 27 22:22:35 2006 @@ -154,14 +154,13 @@ function getCustomViewCombo($viewid='') { global $adb; - $tabid = getTabid($this->customviewmodule); - $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; - $ssql .= " where tab.tabid=".$tabid; - //echo $ssql; - $result = $adb->query($ssql); - while($cvrow=$adb->fetch_array($result)) - { - if($cvrow['cvid'] == $viewid) + $tabid = getTabid($this->customviewmodule); + $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; + $ssql .= " where tab.tabid=".$tabid; + $result = $adb->query($ssql); + while($cvrow=$adb->fetch_array($result)) + { + if($cvrow['cvid'] == $viewid) { $shtml .= ""; $this->setdefaultviewid = $cvrow['cvid']; @@ -170,84 +169,78 @@ { $shtml .= ""; } - } - //echo $shtml; - return $shtml; + } + return $shtml; } function getColumnsListbyBlock($module,$block) - { - global $adb; - $tabid = getTabid($module); - global $profile_id; - - $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + + $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; $sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and"; $sql.= " field.displaytype in (1,2) and profile2field.visible=0"; $sql.= " and profile2field.profileid=".$profile_id." order by sequence"; $result = $adb->query($sql); - $noofrows = $adb->num_rows($result); + $noofrows = $adb->num_rows($result); //Added on 14-10-2005 -- added ticket id in list - if($module == 'HelpDesk' && $block == 25) - { - $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; - } + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; + } //Added to include activity type in activity customview list - if($module == 'Activities' && $block == 19) - { - $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; - } - - for($i=0; $i<$noofrows; $i++) - { - $fieldtablename = $adb->query_result($result,$i,"tablename"); - $fieldcolname = $adb->query_result($result,$i,"columnname"); + if($module == 'Activities' && $block == 19) + { + $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; + } + + for($i=0; $i<$noofrows; $i++) + { + $fieldtablename = $adb->query_result($result,$i,"tablename"); + $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldname = $adb->query_result($result,$i,"fieldname"); $fieldtype = $adb->query_result($result,$i,"typeofdata"); $fieldtype = explode("~",$fieldtype); $fieldtypeofdata = $fieldtype[0]; - /*if($fieldcolname == "crmid" || $fieldcolname == "parent_id") - { - $fieldtablename = "crmentity"; - $fieldcolname = "setype"; - }*/ - $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); - if($fieldlabel == "Related To") - { - $fieldlabel = "Related to"; - } - if($fieldlabel == "Start Date & Time") - { - $fieldlabel = "Start Date"; - if($module == 'Activities' && $block == 19) - $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; - - } - $fieldlabel1 = str_replace(" ","_",$fieldlabel); - $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1.":".$fieldtypeofdata; - $module_columnlist[$optionvalue] = $fieldlabel; + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + if($fieldlabel == "Related To") + { + $fieldlabel = "Related to"; + } + if($fieldlabel == "Start Date & Time") + { + $fieldlabel = "Start Date"; + if($module == 'Activities' && $block == 19) + $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; + + } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1.":".$fieldtypeofdata; + $module_columnlist[$optionvalue] = $fieldlabel; if($fieldtype[1] == "M") { $this->mandatoryvalues[] = "'".$optionvalue."'"; $this->showvalues[] = $fieldlabel; } - } - return $module_columnlist; - } + } + return $module_columnlist; + } function getModuleColumnsList($module) - { - foreach($this->module_list[$module] as $key=>$value) - { - $columnlist = $this->getColumnsListbyBlock($module,$value); + { + foreach($this->module_list[$module] as $key=>$value) + { + $columnlist = $this->getColumnsListbyBlock($module,$value); if(isset($columnlist)) { $ret_module_list[$module][$key] = $columnlist; } - } - return $ret_module_list; - } - + } + return $ret_module_list; + } + function getColumnsListByCvid($cvid) { global $adb; @@ -255,7 +248,6 @@ $sSQL = "select cvcolumnlist.* from cvcolumnlist"; $sSQL .= " inner join customview on customview.cvid = cvcolumnlist.cvid"; $sSQL .= " where customview.cvid =".$cvid." order by cvcolumnlist.columnindex"; - //echo $sSQL; $result = $adb->query($sSQL); while($columnrow = $adb->fetch_array($result)) @@ -267,345 +259,339 @@ } function getStdCriteriaByModule($module) - { - global $adb; - $tabid = getTabid($module); - global $profile_id; - + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + foreach($this->module_list[$module] as $key=>$blockid) - { - $blockids[] = $blockid; - } - $blockids = implode(",",$blockids); - - $sql = "select * from field inner join tab on tab.tabid = field.tabid - inner join profile2field on profile2field.fieldid=field.fieldid - where field.tabid=".$tabid." and field.block in (".$blockids.") + { + $blockids[] = $blockid; + } + $blockids = implode(",",$blockids); + + $sql = "select * from field inner join tab on tab.tabid = field.tabid + inner join profile2field on profile2field.fieldid=field.fieldid + where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2) and profile2field.visible=0 and profile2field.profileid=".$profile_id." order by field.sequence"; - $result = $adb->query($sql); - - while($criteriatyperow = $adb->fetch_array($result)) - { - $fieldtablename = $criteriatyperow["tablename"]; - $fieldcolname = $criteriatyperow["columnname"]; - $fieldlabel = $criteriatyperow["fieldlabel"]; + $result = $adb->query($sql); + + while($criteriatyperow = $adb->fetch_array($result)) + { + $fieldtablename = $criteriatyperow["tablename"]; + $fieldcolname = $criteriatyperow["columnname"]; + $fieldlabel = $criteriatyperow["fieldlabel"]; $fieldname = $criteriatyperow["fieldname"]; - /*if($fieldtablename == "crmentity") - { - $fieldtablename = $fieldtablename.$module; - }*/ - $fieldlabel1 = str_replace(" ","_",$fieldlabel); - $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1; - $stdcriteria_list[$optionvalue] = $fieldlabel; - } - - return $stdcriteria_list; - - } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1; + $stdcriteria_list[$optionvalue] = $fieldlabel; + } + + return $stdcriteria_list; + + } function getStdFilterCriteria($selcriteria = "") - { + { $filter = array(); - $stdfilter = Array("custom"=>"Custom", - "prevfy"=>"Previous FY", - "thisfy"=>"Current FY", - "nextfy"=>"Next FY", - "prevfq"=>"Previous FQ", - "thisfq"=>"Current FQ", - "nextfq"=>"Next FQ", - "yesterday"=>"Yesterday", - "today"=>"Today", - "tomorrow"=>"Tomorrow", - "lastweek"=>"Last Week", - "thisweek"=>"Current Week", - "nextweek"=>"Next Week", - "lastmonth"=>"Last Month", - "thismonth"=>"Current Month", - "nextmonth"=>"Next Month", - "last7days"=>"Last 7 Days", - "last30days"=>"Last 30 Days", - "last60days"=>"Last 60 Days", - "last90days"=>"Last 90 Days", - "last120days"=>"Last 120 Days", - "next30days"=>"Next 30 Days", - "next60days"=>"Next 60 Days", - "next90days"=>"Next 90 Days", - "next120days"=>"Next 120 Days" - ); - - foreach($stdfilter as $FilterKey=>$FilterValue) - { - if($FilterKey == $selcriteria) - { - $shtml['value'] = $FilterKey; - $shtml['text'] = $FilterValue; - $shtml['selected'] = "selected"; - }else - { - $shtml['value'] = $FilterKey; - $shtml['text'] = $FilterValue; - $shtml['selected'] = ""; - } - $filter[] = $shtml; - } - return $filter; - - } + $stdfilter = Array("custom"=>"Custom", + "prevfy"=>"Previous FY", + "thisfy"=>"Current FY", + "nextfy"=>"Next FY", + "prevfq"=>"Previous FQ", + "thisfq"=>"Current FQ", + "nextfq"=>"Next FQ", + "yesterday"=>"Yesterday", + "today"=>"Today", + "tomorrow"=>"Tomorrow", + "lastweek"=>"Last Week", + "thisweek"=>"Current Week", + "nextweek"=>"Next Week", + "lastmonth"=>"Last Month", + "thismonth"=>"Current Month", + "nextmonth"=>"Next Month", + "last7days"=>"Last 7 Days", + "last30days"=>"Last 30 Days", + "last60days"=>"Last 60 Days", + "last90days"=>"Last 90 Days", + "last120days"=>"Last 120 Days", + "next30days"=>"Next 30 Days", + "next60days"=>"Next 60 Days", + "next90days"=>"Next 90 Days", + "next120days"=>"Next 120 Days" + ); + + foreach($stdfilter as $FilterKey=>$FilterValue) + { + if($FilterKey == $selcriteria) + { + $shtml['value'] = $FilterKey; + $shtml['text'] = $FilterValue; + $shtml['selected'] = "selected"; + }else + { + $shtml['value'] = $FilterKey; + $shtml['text'] = $FilterValue; + $shtml['selected'] = ""; + } + $filter[] = $shtml; + } + return $filter; + + } function getCriteriaJS() - { - $today = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d"), date("Y"))); - $tomorrow = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); - $yesterday = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-1, date("Y"))); - - $currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); - $currentmonth1 = date("Y-m-t"); - $lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01", date("Y"))); - $lastmonth1 = date("Y-m-t", strtotime("-1 Month")); - $nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01", date("Y"))); - $nextmonth1 = date("Y-m-t", strtotime("+1 Month")); - - $lastweek0 = date("Y-m-d",strtotime("-2 week Sunday")); - $lastweek1 = date("Y-m-d",strtotime("-1 week Saturday")); - - $thisweek0 = date("Y-m-d",strtotime("-1 week Sunday")); - $thisweek1 = date("Y-m-d",strtotime("this Saturday")); - - $nextweek0 = date("Y-m-d",strtotime("this Sunday")); - $nextweek1 = date("Y-m-d",strtotime("+1 week Saturday")); - - $next7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+6, date("Y"))); - $next30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+29, date("Y"))); - $next60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+59, date("Y"))); - $next90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+89, date("Y"))); - $next120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+119, date("Y"))); - - $last7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-6, date("Y"))); - $last30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-29, date("Y"))); - $last60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-59, date("Y"))); - $last90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-89, date("Y"))); - $last120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-119, date("Y"))); - - $currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y"))); - $currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"), date("Y"))); - $lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")-1)); - $lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1)); + { + $today = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d"), date("Y"))); + $tomorrow = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); + $yesterday = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-1, date("Y"))); + + $currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); + $currentmonth1 = date("Y-m-t"); + $lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01", date("Y"))); + $lastmonth1 = date("Y-m-t", strtotime("-1 Month")); + $nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01", date("Y"))); + $nextmonth1 = date("Y-m-t", strtotime("+1 Month")); + + $lastweek0 = date("Y-m-d",strtotime("-2 week Sunday")); + $lastweek1 = date("Y-m-d",strtotime("-1 week Saturday")); + + $thisweek0 = date("Y-m-d",strtotime("-1 week Sunday")); + $thisweek1 = date("Y-m-d",strtotime("this Saturday")); + + $nextweek0 = date("Y-m-d",strtotime("this Sunday")); + $nextweek1 = date("Y-m-d",strtotime("+1 week Saturday")); + + $next7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+6, date("Y"))); + $next30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+29, date("Y"))); + $next60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+59, date("Y"))); + $next90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+89, date("Y"))); + $next120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+119, date("Y"))); + + $last7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-6, date("Y"))); + $last30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-29, date("Y"))); + $last60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-59, date("Y"))); + $last90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-89, date("Y"))); + $last120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-119, date("Y"))); + + $currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y"))); + $currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"), date("Y"))); + $lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")-1)); + $lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1)); $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); - $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); - - $sjsStr = ''; - - return $sjsStr; - } + $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + + $sjsStr = ''; + + return $sjsStr; + } function getStdFilterByCvid($cvid) - { - global $adb; - + { + global $adb; + $sSQL = "select cvstdfilter.* from cvstdfilter inner join customview on customview.cvid = cvstdfilter.cvid"; $sSQL .= " where cvstdfilter.cvid=".$cvid; - $result = $adb->query($sSQL); - $stdfilterrow = $adb->fetch_array($result); - - $stdfilterlist["columnname"] = $stdfilterrow["columnname"]; - $stdfilterlist["stdfilter"] = $stdfilterrow["stdfilter"]; - - if($stdfilterrow["stdfilter"] == "custom") - { - if($stdfilterrow["startdate"] != "0000-00-00") - { - $stdfilterlist["startdate"] = $stdfilterrow["startdate"]; - } - if($stdfilterrow["enddate"] != "0000-00-00") - { - $stdfilterlist["enddate"] = $stdfilterrow["enddate"]; - } - } - + $result = $adb->query($sSQL); + $stdfilterrow = $adb->fetch_array($result); + + $stdfilterlist["columnname"] = $stdfilterrow["columnname"]; + $stdfilterlist["stdfilter"] = $stdfilterrow["stdfilter"]; + + if($stdfilterrow["stdfilter"] == "custom") + { + if($stdfilterrow["startdate"] != "0000-00-00") + { + $stdfilterlist["startdate"] = $stdfilterrow["startdate"]; + } + if($stdfilterrow["enddate"] != "0000-00-00") + { + $stdfilterlist["enddate"] = $stdfilterrow["enddate"]; + } + } + return $stdfilterlist; - } + } //<<<<<<<>>>>>>>>>>>>> - function getAdvFilterByCvid($cvid) - { - global $adb; - global $modules; - + function getAdvFilterByCvid($cvid) + { + global $adb; + global $modules; + $sSQL = "select cvadvfilter.* from cvadvfilter inner join customview on cvadvfilter.cvid = customview.cvid"; $sSQL .= " where cvadvfilter.cvid=".$cvid; - //echo $sSQL; - $result = $adb->query($sSQL); - - while($advfilterrow = $adb->fetch_array($result)) - { - $advft["columnname"] = $advfilterrow["columnname"]; - $advft["comparator"] = $advfilterrow["comparator"]; - $advft["value"] = $advfilterrow["value"]; + $result = $adb->query($sSQL); + + while($advfilterrow = $adb->fetch_array($result)) + { + $advft["columnname"] = $advfilterrow["columnname"]; + $advft["comparator"] = $advfilterrow["comparator"]; + $advft["value"] = $advfilterrow["value"]; $advfilterlist[] = $advft; - } - - return $advfilterlist; - } - //<<<<<<<>>>>>>>>>>>>> + } + + return $advfilterlist; + } + //<<<<<<<>>>>>>>>>>>>> function getCvColumnListSQL($cvid) { $columnslist = $this->getColumnsListByCvid($cvid); - //print_r($columnslist); if(isset($columnslist)) { foreach($columnslist as $columnname=>$value) @@ -614,19 +600,19 @@ if($value != "") { $list = explode(":",$value); - //$sqllist[] = $list[0].".".$list[1]; + //Added For getting status for Activities -Jaguar $sqllist_column = $list[0].".".$list[1]; - if($this->customviewmodule == "Activities") - { - if($list[1] == "status") - { - $sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus"; - } - } - $sqllist[] = $sqllist_column; - + if($this->customviewmodule == "Activities") + { + if($list[1] == "status") + { + $sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus"; + } + } + $sqllist[] = $sqllist_column; //Ends + $tablefield[$list[0]] = $list[1]; $fieldlabel = trim(str_replace($this->escapemodule," ",$list[3])); $this->list_fields[$fieldlabel] = $tablefield; @@ -641,9 +627,7 @@ function getCVStdFilterSQL($cvid) { global $adb; - $stdfilterlist = $this->getStdFilterByCvid($cvid); - //print_r($stdfilterlist); if(isset($stdfilterlist)) { foreach($stdfilterlist as $columnname=>$value) @@ -668,14 +652,12 @@ $startdate = $datearray[0]; $enddate = $datearray[1]; } - if($startdate != "" && $enddate != "") { $columns = explode(":",$filtercolumn); $stdfiltersql = $columns[0].".".$columns[1]." between '".$startdate." 00:00:00' and '".$enddate." 23:59:00'"; } } - //echo $stdfiltersql; return $stdfiltersql; } function getCVAdvFilterSQL($cvid) @@ -687,11 +669,10 @@ { if(isset($advfltrow)) { - //echo $advfltrow["columnname"]; $columns = explode(":",$advfltrow["columnname"]); if($advfltrow["columnname"] != "" && $advfltrow["comparator"] != "" && $advfltrow["value"] != "") { - + $valuearray = explode(",",trim($advfltrow["value"])); if(isset($valuearray) && count($valuearray) > 1) { @@ -705,11 +686,11 @@ }else { //Added for getting activity Status -Jaguar - if($this->customviewmodule == "Activities" && $columns[1] == "status") - { - $advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"])); - } - else + if($this->customviewmodule == "Activities" && $columns[1] == "status") + { + $advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"])); + } + else { $advfiltersql[] = $this->getRealValues($columns[0],$columns[1],$advfltrow["comparator"],trim($advfltrow["value"])); } @@ -720,7 +701,7 @@ } if(isset($advfiltersql)) { - $advfsql = implode(" and ",$advfiltersql); + $advfsql = implode(" and ",$advfiltersql); } return $advfsql; } @@ -896,36 +877,25 @@ function getAdvComparator($comparator,$value) { -/* fLabels['e'] = 'equals'; - fLabels['n'] = 'not equal to'; - fLabels['s'] = 'starts with'; - fLabels['c'] = 'contains'; - fLabels['k'] = 'does not contain'; - fLabels['l'] = 'less than'; - fLabels['g'] = 'greater than'; - fLabels['m'] = 'less or equal'; - fLabels['h'] = 'greater or equal';*/ - //require_once('include/database/PearDatabase.php'); - if($comparator == "e") { if(trim($value) != "") - { - $rtvalue = " = ".PearDatabase::quote($value); - }else - { - $rtvalue = " is NULL"; - } + { + $rtvalue = " = ".PearDatabase::quote($value); + }else + { + $rtvalue = " is NULL"; + } } if($comparator == "n") { if(trim($value) != "") - { - $rtvalue = " <> ".PearDatabase::quote($value); - }else - { - $rtvalue = "is NOT NULL"; - } + { + $rtvalue = " <> ".PearDatabase::quote($value); + }else + { + $rtvalue = "is NOT NULL"; + } } if($comparator == "s") { @@ -955,7 +925,7 @@ { $rtvalue = " >= ".PearDatabase::quote($value); } - + return $rtvalue; } function getDateforStdFilterBytype($type) @@ -1163,12 +1133,6 @@ if($viewid != "" && $listquery != "") { $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); - //$listviewquery = substr($listviewquery,strpos($listviewquery,'from'),strpos($listviewquery,'where')); - - //$wherequery = substr($listquery, strpos($listquery,'where'),strlen($listquery)); - - - //echo $listviewquery." ".$wherequery; if($module == "Activities" || $module == "Emails") { $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; @@ -1195,7 +1159,6 @@ } } - //echo $query; return $query; } @@ -1223,46 +1186,22 @@ return $query; } - /*function getMetricsCustomView($viewnames) - { - global $adb; - $tabid = getTabid($this->customviewmodule); - $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; - $ssql .= " where ; - //echo $ssql; - $result = $adb->query($ssql); - while($cvrow=$adb->fetch_array($result)) - { - if($cvrow['setdefault'] == 1) - { - $shtml .= ""; - $this->setdefaultviewid = $cvrow['cvid']; - } - else - { - $shtml .= ""; - } - } - //echo $shtml; - return $shtml; - }*/ function getCustomActionDetails($cvid) { global $adb; $sSQL = "select customaction.* from customaction inner join customview on customaction.cvid = customview.cvid"; - $sSQL .= " where customaction.cvid=".$cvid; - //echo $sSQL; - $result = $adb->query($sSQL); - - while($carow = $adb->fetch_array($result)) - { - $calist["subject"] = $carow["subject"]; - $calist["module"] = $carow["module"]; - $calist["content"] = $carow["content"]; + $sSQL .= " where customaction.cvid=".$cvid; + $result = $adb->query($sSQL); + + while($carow = $adb->fetch_array($result)) + { + $calist["subject"] = $carow["subject"]; + $calist["module"] = $carow["module"]; + $calist["content"] = $carow["content"]; $calist["cvid"] = $carow["cvid"]; - } - return $calist; + } + return $calist; } function getParentId($fields,$values) Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Mon Mar 27 22:22:35 2006 @@ -41,31 +41,31 @@ $smarty->assign("DATAFORMAT",$current_user->date_format); if($recordid == "") { - $oCustomView = new CustomView(); - $modulecollist = $oCustomView->getModuleColumnsList($cv_module); - $log->info('CustomView :: Successfully got ColumnsList for the module'.$cv_module); + $oCustomView = new CustomView(); + $modulecollist = $oCustomView->getModuleColumnsList($cv_module); + $log->info('CustomView :: Successfully got ColumnsList for the module'.$cv_module); if(isset($modulecollist)) { - $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist); + $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist); } //step2 - $stdfilterhtml = $oCustomView->getStdFilterCriteria(); - $log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module); + $stdfilterhtml = $oCustomView->getStdFilterCriteria(); + $log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module); $stdfiltercolhtml = getStdFilterHTML($cv_module); - $stdfilterjs = $oCustomView->getCriteriaJS(); + $stdfilterjs = $oCustomView->getCriteriaJS(); //step4 - $advfilterhtml = getAdvCriteriaHTML(); + $advfilterhtml = getAdvCriteriaHTML(); for($i=1;$i<10;$i++) - { - $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); - } + { + $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); + } $log->info('CustomView :: Successfully got AdvancedFilter for the module'.$cv_module); for($i=1;$i<6;$i++) - { - $smarty->assign("FOPTION".$i,$advfilterhtml); - $smarty->assign("BLOCK".$i,$choosecolhtml); - } + { + $smarty->assign("FOPTION".$i,$advfilterhtml); + $smarty->assign("BLOCK".$i,$choosecolhtml); + } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); @@ -82,7 +82,7 @@ $log->info('CustomView :: Successfully got ViewDetails for the Viewid'.$recordid); $modulecollist = $oCustomView->getModuleColumnsList($cv_module); $selectedcolumnslist = $oCustomView->getColumnsListByCvid($recordid); - $log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid); + $log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid); $smarty->assign("VIEWNAME",$customviewdtls["viewname"]); @@ -91,20 +91,20 @@ $smarty->assign("CHECKED","checked"); } if($customviewdtls["setmetrics"] == 1) - { - $smarty->assign("MCHECKED","checked"); - } + { + $smarty->assign("MCHECKED","checked"); + } for($i=1;$i<10;$i++) - { - $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$selectedcolumnslist[$i-1]); - $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); - } + { + $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$selectedcolumnslist[$i-1]); + $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); + } $stdfilterlist = $oCustomView->getStdFilterByCvid($recordid); $log->info('CustomView :: Successfully got Standard Filter for the Viewid'.$recordid); $stdfilterhtml = $oCustomView->getStdFilterCriteria($stdfilterlist["stdfilter"]); - $stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]); - $stdfilterjs = $oCustomView->getCriteriaJS(); + $stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]); + $stdfilterjs = $oCustomView->getCriteriaJS(); if(isset($stdfilterlist["startdate"]) && isset($stdfilterlist["enddate"])) { @@ -113,24 +113,23 @@ } $advfilterlist = $oCustomView->getAdvFilterByCvid($recordid); - $log->info('CustomView :: Successfully got Advanced Filter for the Viewid'.$recordid,'info'); + $log->info('CustomView :: Successfully got Advanced Filter for the Viewid'.$recordid,'info'); for($i=1;$i<6;$i++) - { - $advfilterhtml = getAdvCriteriaHTML($advfilterlist[$i-1]["comparator"]); + { + $advfilterhtml = getAdvCriteriaHTML($advfilterlist[$i-1]["comparator"]); $advcolumnhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$advfilterlist[$i-1]["columnname"]); $smarty->assign("FOPTION".$i,$advfilterhtml); - $smarty->assign("BLOCK".$i,$advcolumnhtml); - //echo '
    ';print_r($advcolumnhtml);echo '
    '; + $smarty->assign("BLOCK".$i,$advcolumnhtml); $smarty->assign("VALUE".$i,$advfilterlist[$i-1]["value"]); - } + } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); - $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); - $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); + $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); + $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); $smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues)); $smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues)); - + $cactionhtml = ""; if($cv_module == "Leads" || $cv_module == "Accounts" || $cv_module == "Contacts") @@ -153,120 +152,120 @@ $mod_strings = return_module_language($current_language,$module); foreach($oCustomView->module_list[$module] as $key=>$value) - { - $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; - if(isset($columnslist[$module][$key])) - { - foreach($columnslist[$module][$key] as $field=>$fieldlabel) - { - if(isset($mod_strings[$fieldlabel])) - { - if($selected == $field) - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $mod_strings[$fieldlabel]; - $advfilter_option['selected'] = "selected"; - }else - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $mod_strings[$fieldlabel]; - $advfilter_option['selected'] = ""; - } - }else - { - if($selected == $field) - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $fieldlabel; - $advfilter_option['selected'] = "selected"; - }else - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $fieldlabel; - $advfilter_option['selected'] = ""; - } - } - $advfilter[] = $advfilter_option; - } - $advfilter_out[$label]= $advfilter; - } - } - return $advfilter_out; + { + $advfilter = array(); + $label = $app_list_strings['moduleList'][$module]." ".$key; + if(isset($columnslist[$module][$key])) + { + foreach($columnslist[$module][$key] as $field=>$fieldlabel) + { + if(isset($mod_strings[$fieldlabel])) + { + if($selected == $field) + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $mod_strings[$fieldlabel]; + $advfilter_option['selected'] = "selected"; + }else + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $mod_strings[$fieldlabel]; + $advfilter_option['selected'] = ""; + } + }else + { + if($selected == $field) + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $fieldlabel; + $advfilter_option['selected'] = "selected"; + }else + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $fieldlabel; + $advfilter_option['selected'] = ""; + } + } + $advfilter[] = $advfilter_option; + } + $advfilter_out[$label]= $advfilter; + } + } + return $advfilter_out; } //step2 //step3 function getStdFilterHTML($module,$selected="") { - global $app_list_strings; - global $oCustomView; + global $app_list_strings; + global $oCustomView; $stdfilter = array(); - $result = $oCustomView->getStdCriteriaByModule($module); + $result = $oCustomView->getStdCriteriaByModule($module); $mod_strings = return_module_language($current_language,$module); - if(isset($result)) - { - foreach($result as $key=>$value) - { - if(isset($mod_strings[$value])) + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) { - if($key == $selected) - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; - $filter['selected'] = "selected"; - }else - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; - $filter['selected'] =""; - } + if($key == $selected) + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; + $filter['selected'] = "selected"; + }else + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; + $filter['selected'] =""; + } }else { - if($key == $selected) - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; - $filter['selected'] = 'selected'; - }else - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; - $filter['selected'] =''; - } + if($key == $selected) + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; + $filter['selected'] = 'selected'; + }else + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; + $filter['selected'] =''; + } } $stdfilter[]=$filter; - } - } - - return $stdfilter; + } + } + + return $stdfilter; } //step3 //step4 function getAdvCriteriaHTML($selected="") { - global $adv_filter_options; - global $app_list_strings; - $AdvCriteria = array(); - foreach($adv_filter_options as $key=>$value) - { - if($selected == $key) - { + global $adv_filter_options; + global $app_list_strings; + $AdvCriteria = array(); + foreach($adv_filter_options as $key=>$value) + { + if($selected == $key) + { $advfilter_criteria['value'] = $key; $advfilter_criteria['text'] = $value; $advfilter_criteria['selected'] = "selected"; - }else - { + }else + { $advfilter_criteria['value'] = $key; - $advfilter_criteria['text'] = $value; - $advfilter_criteria['selected'] = ""; - } - $AdvCriteria[] = $advfilter_criteria; - } - - return $AdvCriteria; + $advfilter_criteria['text'] = $value; + $advfilter_criteria['selected'] = ""; + } + $AdvCriteria[] = $advfilter_criteria; + } + + return $AdvCriteria; } //step4 Modified: vtigercrm/trunk/modules/CustomView/Forms.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Forms.php (original) +++ vtigercrm/trunk/modules/CustomView/Forms.php Mon Mar 27 22:22:35 2006 @@ -162,13 +162,7 @@ function getFieldSelect(&$column_fields,$colnum,&$required_fields,$suggest_field,$translated_fields,$module) { -/* -echo '
    column fields : ';print_r($column_fields); -echo '
    column : '.$colnum; -echo '
    required fields : ';print_r($required_fields); -echo '
    suggest fields : '.$suggest_field; -echo '
    translated fields : ';print_r($translated_fields); -*/ global $mod_strings; + global $mod_strings; global $app_strings; global $outlook_contacts_field_map; require_once('include/database/PearDatabase.php'); @@ -195,7 +189,6 @@ { continue; } -//echo '
    : '.$field; $output .= "\n"; - }*/ - $output .= "\n"; return $output; Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original) +++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Mon Mar 27 22:22:35 2006 @@ -80,7 +80,7 @@ $value[]=''.$metriclist['name'].''; $value[]=''.$metriclist['count'].''; - $entries[$metriclist['id']]=$value; + $entries[$metriclist['id']]=$value; } } @@ -94,7 +94,6 @@ global $adb; $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; $ssql .= " where customview.setmetrics = 1 order by customview.entitytype"; - //echo $ssql; $result = $adb->query($ssql); while($cvrow=$adb->fetch_array($result)) { Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Mon Mar 27 22:22:35 2006 @@ -341,54 +341,53 @@ ); $cvadvfilters = Array( - Array( - Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V', - 'comparator'=>'e', - 'value'=>'Hot' - ) - ), - - Array( - Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V', - 'comparator'=>'e', - 'value'=>'Prospect' - ) - ), - Array( + Array( + Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V', + 'comparator'=>'e', + 'value'=>'Hot' + ) + ), + Array( + Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V', + 'comparator'=>'e', + 'value'=>'Prospect' + ) + ), + Array( Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'comparator'=>'e', 'value'=>'Closed Won' ) ), - Array( + Array( Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'comparator'=>'e', 'value'=>'Prospecting' ) ), - Array( + Array( Array('columnname'=>'troubletickets:status:ticketstatus:HelpDesk_Status:V', 'comparator'=>'n', 'value'=>'Closed' ) ), - Array( + Array( Array('columnname'=>'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V', 'comparator'=>'e', 'value'=>'High' ) ), - Array( - Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', + Array( + Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'n', 'value'=>'Accepted' ), - Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', + Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'n', 'value'=>'Rejected' ) ), - Array( + Array( Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'e', 'value'=>'Rejected' @@ -398,9 +397,9 @@ foreach($customviews as $key=>$customview) { - $queryid = insertCustomView($customview['viewname'],$customview['setdefault'],$customview['setmetrics'],$customview['cvmodule']); - insertCvColumns($queryid,$cvcolumns[$key]); - + $queryid = insertCustomView($customview['viewname'],$customview['setdefault'],$customview['setmetrics'],$customview['cvmodule']); + insertCvColumns($queryid,$cvcolumns[$key]); + if(isset($cvstdfilters[$customview['stdfilterid']])) { $i = $customview['stdfilterid']; @@ -408,7 +407,7 @@ } if(isset($cvadvfilters[$customview['advfilterid']])) { - insertCvAdvFilter($queryid,$cvadvfilters[$customview['advfilterid']]); + insertCvAdvFilter($queryid,$cvadvfilters[$customview['advfilterid']]); } } @@ -423,10 +422,8 @@ $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; - //echo $customviewsql; $customviewresult = $adb->query($customviewsql); } - return $genCVid; } @@ -439,7 +436,6 @@ { $columnsql = "insert into cvcolumnlist (cvid,columnindex,columnname)"; $columnsql .= " values (".$CVid.",".$i.",'".$columnslist[$i]."')"; - //echo $columnsql; $columnresult = $adb->query($columnsql); } } @@ -455,7 +451,6 @@ $stdfiltersql .= "'".$filtercriteria."',"; $stdfiltersql .= "'".$startdate."',"; $stdfiltersql .= "'".$enddate."')"; - //echo $stdfiltersql; $stdfilterresult = $adb->query($stdfiltersql); } } @@ -468,23 +463,11 @@ foreach($filters as $i=>$filter) { $advfiltersql = "insert into cvadvfilter(cvid,columnindex,columnname,comparator,value)"; - $advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',"; - $advfiltersql .= "'".$filter['comparator']."',"; - $advfiltersql .= "'".$filter['value']."')"; - //echo $advfiltersql; - $advfilterresult = $adb->query($advfiltersql); + $advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',"; + $advfiltersql .= "'".$filter['comparator']."',"; + $advfiltersql .= "'".$filter['value']."')"; + $advfilterresult = $adb->query($advfiltersql); } - - /*for($i=0;$iquery($advfiltersql); - }*/ - } } ?> Modified: vtigercrm/trunk/modules/CustomView/Save.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Save.php (original) +++ vtigercrm/trunk/modules/CustomView/Save.php Mon Mar 27 22:22:35 2006 @@ -35,7 +35,6 @@ $setmetrics = 0; } - //echo $viewname.$setdefault; $allKeys = array_keys($HTTP_POST_VARS); //<<<<<<>>>>>>>>> @@ -94,108 +93,101 @@ if($genCVid != "") { - if($setdefault == 1) - { - $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; - $updatedefaultresult = $adb->query($updatedefaultsql); - } - $log->info("CustomView :: Save :: setdefault upated successfully"); + if($setdefault == 1) + { + $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; + $updatedefaultresult = $adb->query($updatedefaultsql); + } + $log->info("CustomView :: Save :: setdefault upated successfully"); - $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; - $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; - //echo $customviewsql; - $customviewresult = $adb->query($customviewsql); - $log->info("CustomView :: Save :: customview created successfully"); - if($customviewresult) - { - if(isset($columnslist)) + $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; + $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; + $customviewresult = $adb->query($customviewsql); + $log->info("CustomView :: Save :: customview created successfully"); + if($customviewresult) { - for($i=0;$iquery($columnsql); - } - $log->info("CustomView :: Save :: cvcolumnlist created successfully"); - - $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; - $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; - $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; - $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; - $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; - //echo $stdfiltersql; - $stdfilterresult = $adb->query($stdfiltersql); - $log->info("CustomView :: Save :: cvstdfilter created successfully"); - for($i=0;$iquery($advfiltersql); - } - $log->info("CustomView :: Save :: cvadvfilter created successfully"); + if(isset($columnslist)) + { + for($i=0;$iquery($columnsql); + } + $log->info("CustomView :: Save :: cvcolumnlist created successfully"); + + $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; + $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; + $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; + $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; + $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; + $stdfilterresult = $adb->query($stdfiltersql); + $log->info("CustomView :: Save :: cvstdfilter created successfully"); + for($i=0;$iquery($advfiltersql); + } + $log->info("CustomView :: Save :: cvadvfilter created successfully"); + } } - } - $cvid = $genCVid; + $cvid = $genCVid; } }else { - if($setdefault == 1) - { + if($setdefault == 1) + { $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; $updatedefaultresult = $adb->query($updatedefaultsql); - } - $log->info("CustomView :: Save :: setdefault upated successfully".$genCVid); - $updatecvsql = "update customview set viewname='".$viewname."',setdefault=".$setdefault.",setmetrics=".$setmetrics." where cvid=".$cvid; - $updatecvresult = $adb->query($updatecvsql); - $log->info("CustomView :: Save :: customview upated successfully".$genCVid); - $deletesql = "delete from cvcolumnlist where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); + } + $log->info("CustomView :: Save :: setdefault upated successfully".$genCVid); + $updatecvsql = "update customview set viewname='".$viewname."',setdefault=".$setdefault.",setmetrics=".$setmetrics." where cvid=".$cvid; + $updatecvresult = $adb->query($updatecvsql); + $log->info("CustomView :: Save :: customview upated successfully".$genCVid); + $deletesql = "delete from cvcolumnlist where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); - $deletesql = "delete from cvstdfilter where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); + $deletesql = "delete from cvstdfilter where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); - $deletesql = "delete from cvadvfilter where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); - $log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid); + $deletesql = "delete from cvadvfilter where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); + $log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid); - $genCVid = $cvid; - if($updatecvresult) - { - if(isset($columnslist)) - { - for($i=0;$iquery($columnsql); - } - $log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid); - $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; - $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; - $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; - $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; - $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; - //echo $stdfiltersql; - $stdfilterresult = $adb->query($stdfiltersql); - $log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid); - for($i=0;$iquery($advfiltersql); - } - $log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid); - } - } + $genCVid = $cvid; + if($updatecvresult) + { + if(isset($columnslist)) + { + for($i=0;$iquery($columnsql); + } + $log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid); + $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; + $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; + $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; + $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; + $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; + $stdfilterresult = $adb->query($stdfiltersql); + $log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid); + for($i=0;$iquery($advfiltersql); + } + $log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid); + } + } } } Modified: vtigercrm/trunk/modules/CustomView/SaveAction.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/SaveAction.php (original) +++ vtigercrm/trunk/modules/CustomView/SaveAction.php Mon Mar 27 22:22:35 2006 @@ -23,7 +23,7 @@ if($mode == "new") { $customactionsql = "insert into customaction(cvid,subject,module,content)"; - $customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')"; + $customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')"; $customactionresult = $adb->query($customactionsql); if($customactionresult == false) { @@ -34,21 +34,19 @@ echo $errormessage; } - //print_r($customactionsql); }elseif($mode == "edit") { $updatecasql = "update customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid; $updatecaresult = $adb->query($updatecasql); - if($updatecaresult == false) + if($updatecaresult == false) { include('themes/'.$theme.'/header.php'); - $errormessage = "Error Message
      -
    • Error while inserting the record -

    " ; - echo $errormessage; + $errormessage = "Error Message
      +
    • Error while inserting the record +

    " ; + echo $errormessage; } - //print_r($updatecasql); } } header("Location: index.php?action=index&module=$cvmodule&viewname=$cvid"); Modified: vtigercrm/trunk/modules/CustomView/SendMailAction.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/SendMailAction.php (original) +++ vtigercrm/trunk/modules/CustomView/SendMailAction.php Mon Mar 27 22:22:35 2006 @@ -31,87 +31,86 @@ if(trim($subject) != "") { -if(isset($storearray) && $camodule != "") -{ - foreach($storearray as $id) + if(isset($storearray) && $camodule != "") { - if($camodule == "Contacts") + foreach($storearray as $id) { - $sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) + if($camodule == "Contacts") { - $emailid = $camodulerow["email"]; - $otheremailid = $camodulerow["otheremail"]; - $yahooid = $camodulerow["yahooid"]; + $sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $otheremailid = $camodulerow["otheremail"]; + $yahooid = $camodulerow["yahooid"]; - if(trim($emailid) != "") + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + }elseif(trim($otheremailid) != "") + { + SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); + }elseif(trim($yahooid) != "") + { + SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Contact. Please give any email id."); + } + } + + }elseif($camodule == "Leads") + { + $sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - }elseif(trim($otheremailid) != "") + $emailid = $camodulerow["email"]; + $yahooid = $camodulerow["yahooid"]; + + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + } + elseif($trim($yahooid) != "") + { + SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Lead. Please give any email id."); + } + } + }elseif($camodule == "Accounts") + { + $sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) { - SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); - }elseif(trim($yahooid) != "") - { - SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Contact. Please give any email id."); - } + $emailid = $camodulerow["email1"]; + $otheremailid = $camodulerow["email2"]; + + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + } + elseif(trim($otheremailid) != "") + { + SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Account. Please give any email id."); + } + } } - - }elseif($camodule == "Leads") - { - $sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'"; - //echo $sql; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email"]; - $yahooid = $camodulerow["yahooid"]; - - if(trim($emailid) != "") - { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - } - elseif($trim($yahooid) != "") - { - SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Lead. Please give any email id."); - } - } - }elseif($camodule == "Accounts") - { - $sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email1"]; - $otheremailid = $camodulerow["email2"]; - - if(trim($emailid) != "") - { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - } - elseif(trim($otheremailid) != "") - { - SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Account. Please give any email id."); - } - } } } -} } function SendMailtoCustomView($module,$id,$to,$current_user_id,$subject,$contents) @@ -119,57 +118,57 @@ require_once("modules/Emails/class.phpmailer.php"); - $mail = new PHPMailer(); + $mail = new PHPMailer(); - $mail->Subject = $subject; - $mail->Body = nl2br($contents); - $mail->IsSMTP(); + $mail->Subject = $subject; + $mail->Body = nl2br($contents); + $mail->IsSMTP(); - if($current_user_id != '') - { - global $adb; - $sql = "select * from users where id= ".$current_user_id; - $result = $adb->query($sql); - $from = $adb->query_result($result,0,'email1'); - $initialfrom = $adb->query_result($result,0,'user_name'); - } - if($mail_server=='') - { - global $adb; - $mailserverresult=$adb->query("select * from systems where server_type='email'"); - $mail_server = $adb->query_result($mailserverresult,0,'server'); - $mail_server_username = $adb->query_result($mailserverresult,0,'server_username'); - $mail_server_password = $adb->query_result($mailserverresult,0,'server_password'); - $smtp_auth = $adb->query_result($mailserverresult,0,'smtp_auth'); + if($current_user_id != '') + { + global $adb; + $sql = "select * from users where id= ".$current_user_id; + $result = $adb->query($sql); + $from = $adb->query_result($result,0,'email1'); + $initialfrom = $adb->query_result($result,0,'user_name'); + } + if($mail_server=='') + { + global $adb; + $mailserverresult=$adb->query("select * from systems where server_type='email'"); + $mail_server = $adb->query_result($mailserverresult,0,'server'); + $mail_server_username = $adb->query_result($mailserverresult,0,'server_username'); + $mail_server_password = $adb->query_result($mailserverresult,0,'server_password'); + $smtp_auth = $adb->query_result($mailserverresult,0,'smtp_auth'); $adb->println("Mail Server Details : '".$mail_server."','".$mail_server_username."','".$mail_server_password."'"); - $_REQUEST['server']=$mail_server; - } - $mail->Host = $mail_server; - $mail->SMTPAuth = $smtp_auth; - $mail->Username = $mail_server_username; - $mail->Password = $mail_server_password; - $mail->From = $from; - $mail->FromName = $initialfrom; + $_REQUEST['server']=$mail_server; + } + $mail->Host = $mail_server; + $mail->SMTPAuth = $smtp_auth; + $mail->Username = $mail_server_username; + $mail->Password = $mail_server_password; + $mail->From = $from; + $mail->FromName = $initialfrom; - $mail->AddAddress($to); - $mail->AddReplyTo($from); - $mail->WordWrap = 50; + $mail->AddAddress($to); + $mail->AddReplyTo($from); + $mail->WordWrap = 50; - $mail->IsHTML(true); + $mail->IsHTML(true); $mail->AltBody = "This is the body in plain text for non-HTML mail clients"; $adb->println("Mail sending process : To => '".$to."', From => '".$from."'"); - if(!$mail->Send()) - { + if(!$mail->Send()) + { $adb->println("(CustomView/SendMailAction.php) Error in Mail Sending : ".$mail->ErrorInfo); - $errormsg = "Mail Could not be sent..."; - } + $errormsg = "Mail Could not be sent..."; + } else { $adb->println("(CustomView/SendMailAction.php) Mail has been Sent to => ".$to); } - + } header("Location: index.php?action=index&module=$camodule&viewname=$viewid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:23:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:23:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4512 - /vtigercrm/trunk/vtigerlogger.php Message-ID: <20060328052330.C3485505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:23:26 2006 New Revision: 4512 Log: file has been removed Removed: vtigercrm/trunk/vtigerlogger.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:35:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:35:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4513 - in /vtigercrm/trunk/modules/Dashboard: Entity_charts.php accumulated_bargraph.php display_charts.php line_graph.php pie_graph.php vertical_bargraph.php Message-ID: <20060328053511.0B829506512@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:35:01 2006 New Revision: 4513 Log: junk code removed in dashboards modules Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/line_graph.php vtigercrm/trunk/modules/Dashboard/pie_graph.php vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Mon Mar 27 22:35:01 2006 @@ -17,11 +17,10 @@ //To get the account names -/* - Function to get the Account name for a given account id - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. +/* Function to get the Account name for a given account id + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ function get_account_name($acc_id) @@ -45,163 +44,163 @@ return $name; } -/* Function returns the values to render the graph for a particular type - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/* Function returns the values to render the graph for a particular type + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. +*/ // TO get the Values for a particular graph type function module_Chart($user_id,$date_start="2000-01-01",$end_date="2017-01-01",$query,$graph_for,$title,$added_qry="",$module="",$graph_type) { - - global $adb; - global $days,$date_array,$period_type; - - $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; - $query.=$where; + + global $adb; + global $days,$date_array,$period_type; + + $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; + $query.=$where; if($added_qry!="") $query.=$added_qry; - $result=$adb->query($query); - $no_of_rows=$adb->num_rows($result); - $mod_count_array=array(); - $mod_name_array=array(); - $count_by_date[]=array(); - $mod_tot_cnt_array=array(); - - $mod_name_val=""; - $mod_cnt_crtd_date=""; + $result=$adb->query($query); + $no_of_rows=$adb->num_rows($result); + $mod_count_array=array(); + $mod_name_array=array(); + $count_by_date[]=array(); + $mod_tot_cnt_array=array(); + + $mod_name_val=""; + $mod_cnt_crtd_date=""; $target_val=""; $bar_target_val=""; $test_target_val=""; - if($no_of_rows!=0) - { - while($row = $adb->fetch_array($result)) - { - $mod_name= $row[$graph_for]; - if($mod_name=="") - $mod_name="Un Assigned"; - $crtd_time=$row['createdtime']; - $crtd_time_array=explode(" ",$crtd_time); - $crtd_date=$crtd_time_array[0]; - - if(!isset($mod_tot_cnt_array[$crtd_date])) - $mod_tot_cnt_array[$crtd_date]=0; - - $mod_tot_cnt_array[$crtd_date]+=1; - - if (in_array($mod_name,$mod_name_array) == false) - { - array_push($mod_name_array,$mod_name); // getting all the unique Names into the array - } - + if($no_of_rows!=0) + { + while($row = $adb->fetch_array($result)) + { + $mod_name= $row[$graph_for]; + if($mod_name=="") + $mod_name="Un Assigned"; + $crtd_time=$row['createdtime']; + $crtd_time_array=explode(" ",$crtd_time); + $crtd_date=$crtd_time_array[0]; + + if(!isset($mod_tot_cnt_array[$crtd_date])) + $mod_tot_cnt_array[$crtd_date]=0; + + $mod_tot_cnt_array[$crtd_date]+=1; + + if (in_array($mod_name,$mod_name_array) == false) + { + array_push($mod_name_array,$mod_name); // getting all the unique Names into the array + } + //Counting the number of values for a type of graph - if(!isset($mod_count_array[$mod_name])) - $mod_count_array[$mod_name]=0; - $mod_count_array[$mod_name]++; + if(!isset($mod_count_array[$mod_name])) + $mod_count_array[$mod_name]=0; + $mod_count_array[$mod_name]++; //Counting the number of values for a type of graph for a particular date - if(!isset($count_by_date[$mod_name][$crtd_date])) - $count_by_date[$mod_name][$crtd_date]=0; - - $count_by_date[$mod_name][$crtd_date]+=1; - } - $mod_by_mod_cnt=count($mod_name_array); - - if($mod_by_mod_cnt!=0) - { - $url_string=""; - - $mod_cnt_table="
    '; $list .= ''; $list .= $mod_strings['FieldType'].'
    - "; - - //Assigning the Header values to the table and giving the dates as graphformat - for($i=0; $i<$days; $i++) - { - $tdate=$date_array[$i]; - $values=Graph_n_table_format($period_type,$tdate); - $graph_format=$values[0]; - $table_format=$values[1]; - $mod_cnt_table.= ""; - - } - $mod_cnt_table .= "" ; + if(!isset($count_by_date[$mod_name][$crtd_date])) + $count_by_date[$mod_name][$crtd_date]=0; + + $count_by_date[$mod_name][$crtd_date]+=1; + } + $mod_by_mod_cnt=count($mod_name_array); + + if($mod_by_mod_cnt!=0) + { + $url_string=""; + + $mod_cnt_table="
    Status $table_formatTotal
    + "; + + //Assigning the Header values to the table and giving the dates as graphformat + for($i=0; $i<$days; $i++) + { + $tdate=$date_array[$i]; + $values=Graph_n_table_format($period_type,$tdate); + $graph_format=$values[0]; + $table_format=$values[1]; + $mod_cnt_table.= ""; + + } + $mod_cnt_table .= "" ; //For all type of the array - for ($i=0;$iTotal"; + $test_target_val.="K".$link_val; + } + $mod_cnt_table .=""; //For all Days getting the table - for($k=0; $k<$days;$k++) - { - $tdate=$date_array[$k]; - if(!isset($mod_tot_cnt_array[$tdate])) - $mod_tot_cnt_array[$tdate]="0"; - $tot= $mod_tot_cnt_array[$tdate]; - if($period_type!="yday") - $mod_cnt_table.=""; - } - $cnt_total=array_sum($mod_tot_cnt_array); - $mod_cnt_table.="
    Status $table_formatTotal
    Total$tot$cnt_total
    "; - $mod_cnt_table.="
    "; - $title_of_graph="$title : $cnt_total"; + for($k=0; $k<$days;$k++) + { + $tdate=$date_array[$k]; + if(!isset($mod_tot_cnt_array[$tdate])) + $mod_tot_cnt_array[$tdate]="0"; + $tot= $mod_tot_cnt_array[$tdate]; + if($period_type!="yday") + $mod_cnt_table.="    		$tot$cnt_total
    "; + $mod_cnt_table.="
    "; + $title_of_graph="$title : $cnt_total"; $bar_target_val=urlencode($bar_target_val); $test_target_val=urlencode($test_target_val); - - $Prod_mod_val=array($mod_name_val,$mod_cnt_val,$title_of_graph,$bar_target_val,$mod_graph_date,$urlstring,$mod_cnt_table,$test_target_val); - return $Prod_mod_val; - } - else - { - $data=0; - - } - - } + + $Prod_mod_val=array($mod_name_val,$mod_cnt_val,$title_of_graph,$bar_target_val,$mod_graph_date,$urlstring,$mod_cnt_table,$test_target_val); + return $Prod_mod_val; + } + else + { + $data=0; + + } + + } else - { - $data=0; + { + $data=0; echo "

    The data is not available with the specified time period

    "; - } - return $data; + } + return $data; } /** Saving the images of the graph in the /cache/images - otherwise it will render the graph with the given details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ + * otherwise it will render the graph with the given details + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. +*/ function save_image_map($filename,$image_map) { - - global $log; - - if (!$handle = fopen($filename, 'w')) { - $log->debug(" Cannot open file ($filename)"); - return; - } - - // Write $somecontent to our opened file. - if (fwrite($handle, $image_map) === FALSE) { - $log->debug(" Cannot write to file ($filename)"); - return false; - } - - fclose($handle); - return true; + + global $log; + + if (!$handle = fopen($filename, 'w')) { + $log->debug(" Cannot open file ($filename)"); + return; + } + + // Write $somecontent to our opened file. + if (fwrite($handle, $image_map) === FALSE) { + $log->debug(" Cannot write to file ($filename)"); + return false; + } + + fclose($handle); + return true; } ?> Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php Mon Mar 27 22:35:01 2006 @@ -13,72 +13,66 @@ $top=(isset($_REQUEST['top']))?$_REQUEST['top']:40; $bottom=(isset($_REQUEST['bottom']))?$_REQUEST['bottom']:50; $title=(isset($_REQUEST['title']))?$_REQUEST['title']:"Horizontal graph"; -//$target_val=(isset($_REQUEST['target_val']))?$_REQUEST['target_val']:""; $target_val=(isset($_REQUEST['test']))?$_REQUEST['test']:""; -/* -function accumlated_graph($refer_code,$referdata,$datavalue,$title,$target_val,$width,$height,$left,$right,$top,$bottom) -{ -*/ - //Exploding the data values - $datavalue=explode("K",$datavalue); - $name_value=explode(",",$referdata); - $datax=explode(",",$refer_code); //The values to the XAxis - $target_val=urldecode($target_val); - $target_val=explode("K",$target_val); +//Exploding the data values +$datavalue=explode("K",$datavalue); +$name_value=explode(",",$referdata); +$datax=explode(",",$refer_code); //The values to the XAxis +$target_val=urldecode($target_val); +$target_val=explode("K",$target_val); - $color_array=array("#FF8B8B","#8BFF8B","#A8A8FF","#FFFF6E","#C5FFFF","#FFA8FF","#FFE28B","lightpink","burlywood2","cadetblue"); +$color_array=array("#FF8B8B","#8BFF8B","#A8A8FF","#FFFF6E","#C5FFFF","#FFA8FF","#FFE28B","lightpink","burlywood2","cadetblue"); - // Create the graph. These two calls are always required - $graph = new Graph($width,$height,"auto"); - $graph->SetScale("textlin"); +// Create the graph. These two calls are always required +$graph = new Graph($width,$height,"auto"); +$graph->SetScale("textlin"); - $graph->SetShadow(); +$graph->SetShadow(); - // Create the lines of the Graph - for($i=0;$iSetFillColor($color_array[$i]); - $bplot[$i]->SetWidth(10); +// Create the lines of the Graph +for($i=0;$iSetFillColor($color_array[$i]); + $bplot[$i]->SetWidth(10); - $bplot[$i]->value->Show(); - $bplot[$i]->value->SetFont(FF_FONT1,FS_NORMAL,8); - $bplot[$i]->value->SetColor("black"); - $bplot[$i]->value->SetFormat('%d'); - $bplot[$i]->SetValuePos('max'); + $bplot[$i]->value->Show(); + $bplot[$i]->value->SetFont(FF_FONT1,FS_NORMAL,8); + $bplot[$i]->value->SetColor("black"); + $bplot[$i]->value->SetFormat('%d'); + $bplot[$i]->SetValuePos('max'); - } +} - $gbplot = new AccBarPlot($bplot); - $gbplot->SetWidth(0.7); +$gbplot = new AccBarPlot($bplot); +$gbplot->SetWidth(0.7); - // Add the bar to the graph - $graph->Add($gbplot); +// Add the bar to the graph +$graph->Add($gbplot); - $graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetTickLabels($datax); - $graph->title->Set($title); +$graph->title->Set($title); - $graph->Set90AndMargin($left,$right,$top,$bottom); - //$graph->SetFrame(false); - $graph->title->SetFont(FF_FONT1,FS_BOLD); - $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); - $graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Set90AndMargin($left,$right,$top,$bottom); +//$graph->SetFrame(false); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); - $graph->SetColor("#7D9CB8"); - $graph->SetMarginColor("#3D6A93"); +$graph->SetColor("#7D9CB8"); +$graph->SetMarginColor("#3D6A93"); - // Display the graph - $graph->Stroke(); -//} +// Display the graph +$graph->Stroke(); ?> Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Mar 27 22:35:01 2006 @@ -88,125 +88,6 @@ "ticketsbystatus" => "Tickets by status", "ticketsbypriority" => "Tickets by Priority", ); -/* -if($type == "leadsource") -{ - $graph_by="leadsource"; - $graph_title="Leads By Source"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -// To display the charts for Lead status -if ($type == "leadstatus") -{ - $graph_by="leadstatus"; - $graph_title="Leads By Status"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -//Charts for Lead Industry -if($type == "leadindustry") -{ - $graph_by="industry"; - $graph_title="Leads By Industry"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -//Sales by Lead Source -if($type == "salesbyleadsource") -{ - $graph_by="leadsource"; - $graph_title="Sales by LeadSource"; - $module="Potentials"; - $classsel_name = "dashMnuSel"; -} -//Sales by Account -if($type == "salesbyaccount") -{ - $graph_by="accountid"; - $graph_title="Sales by Accounts"; - $module="Potentials"; - $classsel_name = "dashMnuSel"; -} -//Charts for Account by Industry -if($type == "accountindustry") -{ - $graph_by="industry"; - $graph_title="Account By Industry"; - $module="Accounts"; - $classsel_name = "dashMnuSel"; -} -//Charts for Products by Category -if($type == "productcategory") -{ - $graph_by="productcategory"; - $graph_title="Products by Category"; - $module="Products"; -} -// Sales Order by Accounts -if($type == "sobyaccounts") -{ - $graph_by="accountid"; - $graph_title="Sales Order by Accounts"; - $module="SalesOrder"; -} -//Sales Order by Status -if($type == "sobystatus") -{ - $graph_by="sostatus"; - $graph_title="Sales Order by Status"; - $module="SalesOrder"; -} -//Purchase Order by Status -if($type == "pobystatus") -{ - $graph_by="postatus"; - $graph_title="Purchase Order by Status"; - $module="PurchaseOrder"; -} -//Quotes by Accounts -if($type == "quotesbyaccounts") -{ - $graph_by="accountid"; - $graph_title="Quotes by Accounts"; - $module="Quotes"; -} -//Quotes by Stage -if($type == "quotesbystage") -{ - $graph_by="quotestage"; - $graph_title="Quotes by Stage"; - $module="Quotes"; -} -//Invoice by Accounts -if($type == "invoicebyacnts") -{ - $graph_by="accountid"; - $graph_title="Invoices by Accounts"; - $module="Invoice"; -} -//Invoices by status -if($type == "invoicebystatus") -{ - $graph_by="invoicestatus"; - $graph_title="Invoices by status"; - $module="Invoice"; -} -//Tickets by Status -if($type == "ticketsbystatus") -{ - $graph_by="ticketstatus"; - $graph_title="Tickets by status"; - $module="HelpDesk"; -} -//Tickets by Priority -if($type == "ticketsbypriority") -{ - $graph_by="priority"; - $graph_title="Tickets by Priority"; - $module="HelpDesk"; -} - */ function get_graph_by_type($graph_by,$graph_title,$module,$where,$query) { global $user_id,$date_start,$end_date,$type; @@ -245,12 +126,12 @@ } - /** Returns the Horizontal,vertical, pie graphs and Accumulated Graphs - for the details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/** Returns the Horizontal,vertical, pie graphs and Accumulated Graphs +for the details +* Portions created by vtiger are Copyright (C) vtiger. +* All Rights Reserved. +* Contributor(s): ______________________________________.. +*/ // Function for get graphs @@ -262,7 +143,6 @@ $val=explode(":",$title); $display_title=$val[0]; - //$sHTML = "

    $display_title in between $date_start and $end_date

    "; $sHTML .= "
    @@ -336,12 +216,12 @@ return $sHTML; } - /** Returns graph, if the cached image is present it'll display that image, - otherwise it will render the graph with the given details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/** Returns graph, if the cached image is present it'll display that image, +otherwise it will render the graph with the given details +* Portions created by vtiger are Copyright (C) vtiger. +* All Rights Reserved. +* Contributor(s): ______________________________________.. +*/ // Function to get the chached image if exists function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type) Modified: vtigercrm/trunk/modules/Dashboard/line_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/line_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/line_graph.php Mon Mar 27 22:35:01 2006 @@ -40,23 +40,14 @@ // Setup the graph -//$graph = new Graph(300,200); $graph = new Graph($width,$height); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); -//$graph->SetFrame(false); -//$graph->SetMargin(30,50,30,30); $graph->SetMargin($left,$right,$top,$bottom); - $graph->tabtitle->Set($title ); $graph->tabtitle->SetFont(FF_FONT2,FS_BOLD,13); - - $graph->yaxis->HideZeroLabel(); -//$graph->ygrid->SetFill(true,'#EFEFEF at 0.5','#BBCCFF at 0.5'); -//$graph->ygrid->SetFill(true,'#E3FDFA at 0.5','#F4FDF5 at 0.5'); $graph->xgrid->Show(); -//$graph->xgrid->Show(); $thick=6; // Create the lines of the Graph @@ -66,8 +57,6 @@ $graph_data=explode(",",$data); $name=$name_value[$i]; - -// $lineplot ->SetWeight($i); $color_val=$color_array[$i]; $temp="p".$i; $$temp = new LinePlot($graph_data); @@ -102,9 +91,6 @@ // Set some other color then the boring default $graph->SetColor("#CCDFCC"); $graph->SetMarginColor("#98C098"); - - -//$graph->xaxis->SetTextAlign('center','top'); $graph->xaxis->SetTickLabels($datax); $graph->xaxis->SetLabelAngle(90); Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Mon Mar 27 22:35:01 2006 @@ -16,13 +16,13 @@ /** Function to render the Horizontal Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. + */ function pie_chart($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - + global $log,$root_directory; //We'll be getting the values in the form of a string separated by commas @@ -36,8 +36,8 @@ for($i=0;$iSetTheme("sand"); $p1->ExplodeSlice(1); $p1->SetCenter(0.45); - //$p1->SetLegends($gDateLocale->GetShortMonth()); $p1->SetLegends($datax); - //$p1->ShowBorder(false); - // Setup the labels $p1->SetLabelType(PIE_VALUE_PER); $p1->value->Show(); - //$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); - //$p1->value->SetFormat('%2.1f%%'); $p1->value->SetFormat('%2.1f%%'); - //$p1->value->SetFormat("$datax\n$datay('%2.1f%')"); - - $p1->SetCSIMTargets($target,$alts); // Don't display the border $graph->SetFrame(false); @@ -73,13 +65,13 @@ $graph->Add($p1); $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; - return $img; + $imgMap = $graph ->GetHTMLImageMap ($html_image_name); + save_image_map($cache_file_name.'.map', $imgMap); + $base_name_cache_file=basename($cache_file_name); + $ccc="cache/images/".$base_name_cache_file; + $img = "" ; + $img.=$imgMap; + return $img; } ?> Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Mon Mar 27 22:35:01 2006 @@ -15,9 +15,9 @@ include ("jpgraph/src/jpgraph_iconplot.php"); /** Function to render the Vertical Bar Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ function vertical_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) @@ -27,7 +27,7 @@ $datay=explode(",",$referdata); //The datay values $datax=explode(",",$refer_code); // The datax values $target_val=urldecode($target_val);// The links values for bar are given as string in the encoded form, here we are decoding it - $target=explode(",",$target_val); + $target=explode(",",$target_val); $alts=array(); //Array which contains the data which is displayed on the mouse over $temp=array(); @@ -97,7 +97,6 @@ $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); $graph->SetFrame(false); $graph->SetMarginColor('white'); - //$graph->ygrid->SetFill(true,'azure1','azure2'); $graph->xgrid->Show(); // To get the Targets @@ -120,18 +119,15 @@ $bplot->value->SetFormat('%d'); - // Display the graph -// $graph->Stroke(); - - //Getting the graph in the form of html page + //Getting the graph in the form of html page $graph-> Stroke( $cache_file_name ); $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img= "" ; - $img.=$imgMap; - return $img; + save_image_map($cache_file_name.'.map', $imgMap); + $base_name_cache_file=basename($cache_file_name); + $ccc="cache/images/".$base_name_cache_file; + $img= "" ; + $img.=$imgMap; + return $img; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:41:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:41:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4514 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060328054157.98A5C506548@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:41:53 2006 New Revision: 4514 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon Mar 27 22:41:53 2006 @@ -29,60 +29,59 @@ var $db; // Stored fields - var $leadid; - var $email; + var $leadid; + var $email; var $firstname; - var $salutation; + var $salutation; var $lastname; var $company; var $annualrevenue; - + var $industry; - var $campaign; - var $rating; - var $status; - var $leadsource; - var $designation; - var $licencekey; - var $region; - var $space; - var $comments; - var $priority; - var $partnercontact; - var $maildate; - var $nextstepdate; - var $fundingsituation; - var $deleted; - - var $description; - // These are for related fields - var $city; - var $code; - var $state; - var $country; - var $phone; - var $mobile; - var $fax; - var $lane; - var $leadaddresstype; - var $currency; - var $website; - var $callornot; - var $readornot; - var $empct; - - var $accountid; + var $campaign; + var $rating; + var $status; + var $leadsource; + var $designation; + var $licencekey; + var $region; + var $space; + var $comments; + var $priority; + var $partnercontact; + var $maildate; + var $nextstepdate; + var $fundingsituation; + var $deleted; + + var $description; + // These are for related fields + var $city; + var $code; + var $state; + var $country; + var $phone; + var $mobile; + var $fax; + var $lane; + var $leadaddresstype; + var $currency; + var $website; + var $callornot; + var $readornot; + var $empct; + + var $accountid; var $contactid; var $campaignid; - var $potentialid; - + var $potentialid; + var $module_id = "leadid"; - //var $tab_name = Array('crmentity','account','accountbillads','accountshipads'); var $tab_name = Array('crmentity','leaddetails','leadsubdetails','leadaddress','leadscf'); - var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid'); - - + var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid'); + + var $entity_table = "crmentity"; var $table_name = "leaddetails"; @@ -94,51 +93,50 @@ var $column_fields = Array(); var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid'); - + var $combofieldNames = Array('leadsource'=>'leadsource_dom' - ,'salutation'=>'salutation_dom' - ,'status'=>'leadstatus_dom' - ,'industry'=>'industry_dom' - ,'rating'=>'rating_dom' - ,'licencekey'=>'licensekey_dom'); - + ,'salutation'=>'salutation_dom' + ,'status'=>'leadstatus_dom' + ,'industry'=>'industry_dom' + ,'rating'=>'rating_dom' + ,'licencekey'=>'licensekey_dom'); + // This is used to retrieve related fields from form posts. - var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); - + // This is the list of fields that are in the lists. - var $list_fields = Array( - 'Last Name'=>Array('leaddetails'=>'lastname'), - 'First Name'=>Array('leaddetails'=>'firstname'), - 'Company'=>Array('leaddetails'=>'company'), - 'Phone'=>Array('leadaddress'=>'phone'), - 'Website'=>Array('leadsubdetails'=>'website'), - 'Email'=>Array('leaddetails'=>'email'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - var $list_fields_name = Array( - 'Last Name'=>'lastname', - 'First Name'=>'firstname', - 'Company'=>'company', - 'Phone'=>'phone', - 'Website'=>'website', - 'Email'=>'email', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'lastname'; + var $list_fields = Array( + 'Last Name'=>Array('leaddetails'=>'lastname'), + 'First Name'=>Array('leaddetails'=>'firstname'), + 'Company'=>Array('leaddetails'=>'company'), + 'Phone'=>Array('leadaddress'=>'phone'), + 'Website'=>Array('leadsubdetails'=>'website'), + 'Email'=>Array('leaddetails'=>'email'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + var $list_fields_name = Array( + 'Last Name'=>'lastname', + 'First Name'=>'firstname', + 'Company'=>'company', + 'Phone'=>'phone', + 'Website'=>'website', + 'Email'=>'email', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'lastname'; var $record_id; var $list_mode; - var $popup_type; + var $popup_type; var $search_fields = Array( - 'Name'=>Array('leaddetails'=>'lastname'), - 'Company'=>Array('leaddetails'=>'company') - ); - var $search_fields_name = Array( - 'Name'=>'lastname', - 'Company'=>'company' - ); + 'Name'=>Array('leaddetails'=>'lastname'), + 'Company'=>Array('leaddetails'=>'company') + ); + var $search_fields_name = Array( + 'Name'=>'lastname', + 'Company'=>'company' + ); var $required_fields = array("lastname"=>1, 'company'=>1); @@ -152,12 +150,7 @@ $this->column_fields = getColumnFields('Leads'); } - function get_summary_text() - { - return "$this->firstname $this->lastname"; - } - -//method added to construct the query to fetch the custom fields + //method added to construct the query to fetch the custom fields function constructCustomQueryAddendum() { global $adb; @@ -165,7 +158,7 @@ $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=7"; $result = $adb->query($sql1); $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel + //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel $sql3 = "select "; for($i=0; $i < $numRows;$i++) { @@ -384,100 +377,6 @@ - function save_relationship_changes($is_update) - { - if($this->task_id != "") - { - $this->set_lead_task_relationship($this->id, $this->task_id); - } - if($this->note_id != "") - { - $this->set_lead_note_relationship($this->id, $this->note_id); - } - if($this->meeting_id != "") - { - $this->set_lead_meeting_relationship($this->id, $this->meeting_id); - } - if($this->call_id != "") - { - $this->set_lead_call_relationship($this->id, $this->call_id); - } - if($this->email_id != "") - { - $this->set_lead_email_relationship($this->id, $this->email_id); - } - } - - - function set_lead_task_relationship($lead_id, $task_id) - { - $query = "UPDATE tasks set parent_id='$lead_id', parent_type='Lead' where id='$task_id'"; - $this->db->query($query) or die("Error setting lead to task relationship: ".mysql_error()); - } - - function clear_lead_task_relationship($lead_id) - { - $query = "update tasks set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to task relationship: ".mysql_error()); - } - - function set_lead_note_relationship($lead_id, $note_id) - { - $query = "UPDATE notes set parent_id='$lead_id', parent_type='Lead' where id='$note_id'"; - $this->db->query($query) or die("Error setting lead to note relationship: ".mysql_error()); - } - - function clear_lead_note_relationship($lead_id) - { - $query = "update notes set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to note relationship: ".mysql_error()); - } - - function set_lead_meeting_relationship($lead_id, $meeting_id) - { - $query = "UPDATE meetings set parent_id='$lead_id', parent_type='Lead' where id='$meeting_id'"; - $this->db->query($query) or die("Error setting lead to meeting relationship: ".mysql_error()); - } - - function clear_lead_meeting_relationship($lead_id) - { - $query = "update meetings set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to meeting relationship: ".mysql_error()); - } - - function set_lead_call_relationship($lead_id, $call_id) - { - $query = "UPDATE calls set parent_id='$lead_id', parent_type='Lead' where id='$call_id'"; - $this->db->query($query) or die("Error setting lead to call relationship: ".mysql_error()); - } - - function clear_lead_call_relationship($lead_id) - { - $query = "update calls set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to call relationship: ".mysql_error()); - } - - function set_lead_email_relationship($lead_id, $email_id) - { - $query = "UPDATE emails set parent_id='$lead_id', parent_type='Lead' where id='$email_id'"; - $this->db->query($query) or die("Error setting lead to email relationship: ".mysql_error()); - } - - function clear_lead_email_relationship($lead_id) - { - $query = "update emails set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to email relationship: ".mysql_error()); - } - - function mark_relationships_deleted($id) - { - - $this->clear_lead_task_relationship($id); - $this->clear_lead_note_relationship($id); - $this->clear_lead_meeting_relationship($id); - $this->clear_lead_call_relationship($id); - $this->clear_lead_email_relationship($id); - } // This method is used to provide backward compatibility with old data that was prefixed with http:// // We now automatically prefix http:// @@ -497,28 +396,12 @@ $this->remove_redundant_http(); } - function list_view_parse_additional_sections(&$list_form, $section){ - - if($list_form->exists($section.".row.yahoo_id") && isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse($section.".row.yahoo_id"); - elseif ($list_form->exists($section.".row.no_yahoo_id")) - $list_form->parse($section.".row.no_yahoo_id"); - return $list_form; - - - } function get_lead_field_options($list_option) { $comboFieldArray = getComboArray($this->combofieldNames); return $comboFieldArray[$list_option]; } - function get_list_view_data(){ - $temp_array = $this->get_list_view_array(); - $temp_array["ENCODED_NAME"]=htmlspecialchars($this->firstname.' '.$this->lastname, ENT_QUOTES); - return $temp_array; - - } - + //Used By vtigerCRM Word Plugin function getColumnNames_Lead() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:48:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:48:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4515 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060328054820.23EF24EBE2A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:48:14 2006 New Revision: 4515 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php (contents, props changed) Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 21:59:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:59:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4516 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060328055918.3AC7250655F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:59:12 2006 New Revision: 4516 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:02:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:02:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4517 - in /vtigercrm/trunk/modules/Quotes: Popup.html PopupSearchForm.html SearchForm.html Message-ID: <20060328060245.BC11D506583@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:02:36 2006 New Revision: 4517 Log: file has been removed Removed: vtigercrm/trunk/modules/Quotes/Popup.html vtigercrm/trunk/modules/Quotes/PopupSearchForm.html vtigercrm/trunk/modules/Quotes/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:04:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:04:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4518 - /vtigercrm/trunk/modules/Notes/SearchForm.html Message-ID: <20060328060431.8F4BB506582@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:04:26 2006 New Revision: 4518 Log: modules/notes/SearchForm.html file deleted Removed: vtigercrm/trunk/modules/Notes/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:04:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:04:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4519 - /vtigercrm/trunk/modules/Quotes/index.php Message-ID: <20060328060445.73A79506582@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:04:39 2006 New Revision: 4519 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/index.php Modified: vtigercrm/trunk/modules/Quotes/index.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/index.php (original) +++ vtigercrm/trunk/modules/Quotes/index.php Mon Mar 27 23:04:39 2006 @@ -50,10 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - - - include ('modules/Quotes/ListView.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:06:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:06:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4520 - /vtigercrm/trunk/modules/Quotes/Forms.php Message-ID: <20060328060612.64807506593@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:06:06 2006 New Revision: 4520 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Forms.php Modified: vtigercrm/trunk/modules/Quotes/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Forms.php (original) +++ vtigercrm/trunk/modules/Quotes/Forms.php Mon Mar 27 23:06:06 2006 @@ -173,60 +173,4 @@ return $the_script; } -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - -/* -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_quote_subject = $mod_strings['Subject']; -$lbl_pot_name = $mod_strings['Potential Name']; -$lbl_acct_name = $mod_strings['Account Name']; -$lbl_quote_stage = $mod_strings['Quote Stage']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$lbl_change_button_label = $app_strings['LBL_CHANGE_BUTTON_LABEL']; -$user_id = $current_user->id; -$comboFieldNames = Array('quotestage'=>'quotestage_dom' - ); -$comboFieldArray = getComboArray($comboFieldNames); -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - $lbl_required_symbol$lbl_quote_subject
    -
    - $lbl_pot_name
    -  
    - $lbl_quote_stage
    -

    - - - - -EOQ; -$the_form .= get_left_form_footer(); -$the_form .= get_validate_record_js(); - -return $the_form; -} -*/ ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:08:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:08:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4521 - in /vtigercrm/trunk/install: 2setConfig.php 3confirmConfig.php Message-ID: <20060328060837.2A0CF506593@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:08:26 2006 New Revision: 4521 Log: create database added in installation Modified: vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:10:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:10:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4522 - /vtigercrm/trunk/modules/Quotes/Save.php Message-ID: <20060328061044.CBC0650652A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:10:35 2006 New Revision: 4522 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Save.php Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Mon Mar 27 23:10:35 2006 @@ -23,7 +23,6 @@ require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); -//require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -45,18 +44,11 @@ $log->debug("Mode is ".$focus->mode); } - - -//$focus->retrieve($_REQUEST['record']); - foreach($focus->column_fields as $fieldname => $val) { if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } @@ -79,7 +71,6 @@ $log->debug("Deleting from quotesproductrel table "); $query1 = "delete from quotesproductrel where quoteid=".$focus->id; - //echo $query1; $adb->query($query1); } @@ -101,7 +92,6 @@ { $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; - //echo $query; $adb->query($query); //Checking the re-order level and sending mail updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); @@ -109,15 +99,6 @@ } -/* -echo 'rowid : '.$_REQUEST[$product_id_var]; -echo '
    '; -echo 'status : '.$_REQUEST['hdnRowStatus1']; -echo '
    '; -echo 'qty : '.$_REQUEST['txtQty1']; -echo '
    '; -echo 'LP: '.$_REQUEST['txtListPrice1']; -*/ $return_id = $focus->id; if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; @@ -150,8 +131,6 @@ $diff_qty = $old_qty - $qty; $upd_qty = $qtyinstk+$diff_qty; - //Updating the Product Quantity - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } @@ -159,7 +138,6 @@ { $diff_qty = $qty - $old_qty; $upd_qty = $qtyinstk-$diff_qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); @@ -168,7 +146,6 @@ else { $upd_qty = $qtyinstk-$qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } @@ -177,7 +154,6 @@ { $upd_qty = $qtyinstk-$qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:11:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:11:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4523 - /vtigercrm/trunk/themes/blue/header.html Message-ID: <20060328061155.CDE1250652A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:11:49 2006 New Revision: 4523 Log: file removed as header is smartified Removed: vtigercrm/trunk/themes/blue/header.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:14:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:14:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4524 - /vtigercrm/trunk/modules/Contacts/ContactFormBase.php Message-ID: <20060328061444.AEF4350652A@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:14:36 2006 New Revision: 4524 Log: ContactFormBase.php deleted Removed: vtigercrm/trunk/modules/Contacts/ContactFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:15:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:15:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4525 - /vtigercrm/trunk/modules/Accounts/AccountFormBase.php Message-ID: <20060328061516.81EF950659C@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:15:05 2006 New Revision: 4525 Log: AccountFormBase.php deleted Removed: vtigercrm/trunk/modules/Accounts/AccountFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:23:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:23:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4526 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060328062349.C31585065AB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:23:40 2006 New Revision: 4526 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Mon Mar 27 23:23:40 2006 @@ -114,12 +114,6 @@ $this->column_fields = getColumnFields('Quotes'); } - function create_tables () { - } - - function drop_tables () { - } - function get_summary_text() { return $this->name; @@ -146,10 +140,6 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:26:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:26:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4527 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060328062627.5BBB75065BA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:26:21 2006 New Revision: 4527 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon Mar 27 23:26:21 2006 @@ -25,20 +25,13 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('quote_list'); - -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -114,7 +107,6 @@ '.$cvHTML; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:30:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:30:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4528 - /vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Message-ID: <20060328063039.043295065C8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:30:33 2006 New Revision: 4528 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Mon Mar 27 23:30:33 2006 @@ -23,25 +23,15 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $app_strings,$current_language,$current_user; $current_module_strings = return_module_language($current_language, 'Quotes'); - global $list_max_entries_per_page; - global $urlPrefix; - global $adb; + global $list_max_entries_per_page,$adb,$theme,$mod_strings; $log = LoggerManager::getLogger('quote_list'); - - global $currentModule; - global $theme; // Get _dom arrays from Database $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -59,8 +49,6 @@ } $focus = new Quote(); - global $theme; - global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:34:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:34:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4529 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060328063415.7BAAC5065AD@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:34:08 2006 New Revision: 4529 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Mon Mar 27 23:34:08 2006 @@ -42,7 +42,6 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); $smarty->assign("BLOCKS", getBlocks("Campaigns","detail_view",'',$focus->column_fields)); -//echo '
    ';print_r($focus->column_fields); echo '
    '; $smarty->assign("CUSTOMFIELD", $cust_fld); $smarty->assign("SINGLE_MOD","Campaign"); @@ -68,5 +67,4 @@ $permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; - ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:35:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4530 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060328063519.49A125065ED@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:35:13 2006 New Revision: 4530 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Mon Mar 27 23:35:13 2006 @@ -19,7 +19,6 @@ global $mod_strings; global $current_user; global $currentModule; -//echo '+++++++++++++++++'.$currentModule; $focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); @@ -93,8 +92,6 @@ $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -//$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); - $campaign_tables = Array('campaign','crmentity'); $tabid = getTabid("Campaigns"); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:35:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:35:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4531 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060328063521.390AB5065D0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:35:14 2006 New Revision: 4531 Log: label changed from User Management tp Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Mon Mar 27 23:35:14 2006 @@ -306,7 +306,7 @@ //Fields for Settings -'LBL_USER_MANAGEMENT'=>'User Management', +'LBL_USER_MANAGEMENT'=>'Users & Access Management', 'LBL_USERS'=>'Users', From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:36:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:36:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4532 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060328063633.8345A5065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:36:27 2006 New Revision: 4532 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Mar 27 23:36:27 2006 @@ -140,7 +140,6 @@ $list_query = getListQuery("Campaigns"); } //<<<<<<<>>>>>>>> -//echo $listquery; if(isset($where) && $where != '') { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:36:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:36:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4533 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060328063636.9C6305065DD@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:36:29 2006 New Revision: 4533 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Mon Mar 27 23:36:29 2006 @@ -29,10 +29,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $log->debug("Inside Quote EditView"); @@ -89,7 +86,6 @@ $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array @@ -135,8 +131,7 @@ $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $num_of_products = getNoOfAssocProducts($module,$focus); $smarty->assign("ROWCOUNT", $num_of_products); - //$associated_prod = getAssociatedProducts("Quotes",$focus); - $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); //getAssociatedProducts("Quotes",$focus); + $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); @@ -164,35 +159,6 @@ $smarty->assign("ADJUSTMENTVALUE", "0.000"); $smarty->assign("SUBTOTAL", $InvTotal.".00"); $smarty->assign("GRANDTOTAL", $InvTotal.".00"); - -} -else -{ - $smarty->assign("ROWCOUNT", '1'); - $smarty->assign("TAXVALUE", '0'); - $smarty->assign("ADJUSTMENTVALUE", '0'); - //Setting the first row - $log->debug("Setting the first product row when the mode is create"); - $output =''; - $output .= '    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:38:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:38:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4534 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060328063844.660425065CE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:38:37 2006 New Revision: 4534 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Mon Mar 27 23:38:37 2006 @@ -21,11 +21,9 @@ require_once('modules/Contacts/Contact.php'); require_once('modules/Leads/Lead.php'); - class Campaign extends CRMEntity { var $log; var $db; - // Stored fields var $id; @@ -73,7 +71,6 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted=0 and contactdetails.campaignid = '.$id; - //echo $query; return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:38:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:38:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4535 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060328063854.7E6B45065CE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:38:48 2006 New Revision: 4535 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Mon Mar 27 23:38:48 2006 @@ -26,9 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; -global $currentModule; +global $mod_strings,$app_strings,$currentModule,$theme,$profile_id; $focus = new Quote(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { @@ -42,7 +40,6 @@ } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -80,20 +77,13 @@ $smarty->assign("CONVERTSALESORDER","permitted"); if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') -{ $smarty->assign("CONVERTINVOICE","permitted"); - //$smarty->assign("CONVERTINVOICE"," "); -} if(isPermitted("Quotes",2,$_REQUEST['record']) == 'yes') -{ $smarty->assign("DELETE","permitted"); - //$smarty->assign("DELETEBUTTON"," "); -} //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:42:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:42:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4536 - /vtigercrm/trunk/modules/Users/createemailtemplate.php Message-ID: <20060328064258.D60B65065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:42:53 2006 New Revision: 4536 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/createemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/createemailtemplate.php Mon Mar 27 23:42:53 2006 @@ -16,9 +16,7 @@ require_once('include/database/PearDatabase.php'); global $app_strings; -global $app_list_strings; global $mod_strings; -global $current_user; global $current_language; global $theme; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:43:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:43:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4537 - /vtigercrm/trunk/modules/Quotes/CreatePDF.php Message-ID: <20060328064343.C85985065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:43:39 2006 New Revision: 4537 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Mar 27 23:43:39 2006 @@ -3,9 +3,7 @@ require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -304,11 +302,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -517,7 +513,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:43:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:43:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4538 - /vtigercrm/trunk/modules/Users/createemailtemplate.html Message-ID: <20060328064357.622A95065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:43:53 2006 New Revision: 4538 Log: Deleted the file as it is no longer used after smartification Removed: vtigercrm/trunk/modules/Users/createemailtemplate.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:45:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:45:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4539 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060328064500.B83075065CC@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:44:56 2006 New Revision: 4539 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Mon Mar 27 23:44:56 2006 @@ -171,21 +171,6 @@ } - function resetPreferences(){ - if(!isset($this->user_preferences)){ - if(isset($_SESSION["USER_PREFERENCES"])){ - $this->user_preferences = $_SESSION["USER_PREFERENCES"]; - foreach($this->user_preferences as $key => $val){ - unset($_SESSION[$key]); - } - } - } - unset($this->user_preferences); - unset ($_SESSION["USER_PREFERENCES"]); - $query = "UPDATE $this->table_name SET user_preferences=NULL where id='$this->id'"; - $result =& $this->db->query($query); - $this->log->debug("RESETING: PREFERENCES ROWS AFFECTED WHILE UPDATING USER PREFERENCES:".$this->db->getAffectedRowCount($result)); - } function savePreferecesToDB(){ $data = base64_encode(serialize($this->user_preferences)); @@ -207,23 +192,7 @@ } } - function getPreference($name){ - if(array_key_exists($name,$this->user_preferences )) - return $this->user_preferences[$name]; - return ''; - } - function create_tables () { - - } - - function drop_tables () { - /*$query = 'DROP TABLE IF EXISTS '.$this->table_name; - $this->db->query($query, true); */ - - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - - } + function get_summary_text() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:45:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:45:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4540 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl Message-ID: <20060328064503.6DB775065ED@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:44:58 2006 New Revision: 4540 Log: assign module owner moved to usermanagemant Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Mon Mar 27 23:44:58 2006 @@ -41,6 +41,9 @@ + + @@ -147,8 +150,6 @@ - Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Mon Mar 27 23:44:58 2006 @@ -16,13 +16,14 @@
     
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS}     		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		{$MOD.LBL_CURRENCY_CONFIGURATION}
    {$MOD.LBL_CURRENCY_CONFIG}     		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS}     		{$MOD.LBL_MIGRATION_INFO}
    {$MOD.LBL_MIGRATION}
    -
    +
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS} {$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING} @@ -44,7 +45,7 @@
    -
    +
    {$MOD.EMAILTEMPLATES} {$MOD.WORDINTEGRATION} {$MOD.NOTIFICATIONSCHEDULERS} @@ -58,13 +59,12 @@
    - From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:46:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:46:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4541 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060328064601.9F7BD5065F7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:45:57 2006 New Revision: 4541 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Mon Mar 27 23:45:57 2006 @@ -15,7 +15,6 @@ global $mod_strings; global $app_strings; -global $app_list_strings; global $current_language; global $theme; $theme_path="themes/".$theme."/"; @@ -37,21 +36,6 @@ $tempid = $_REQUEST['templateid']; $sql = "select * from emailtemplates where templateid=".$tempid; $result = $adb->query($sql); -/* $temprow = $adb->fetch_array($result); - $cnt=1; - $selcount = $_REQUEST['templatename']; - do - { - if ($cnt == $selcount) - { - $templatename = $temprow["templatename"]; - } - $cnt++; - }while($temprow = $adb->fetch_array($result)); - - $result = fetchEmailTemplateInfo($templatename); -*/ -// $emailtemplateResult = $adb->fetch_array($result); } $smarty->assign("FOLDERNAME", $emailtemplateResult["foldername"]); @@ -65,7 +49,6 @@ $smarty->display("DetailViewEmailTemplate.tpl"); - ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:46:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:46:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4542 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060328064641.D97025065F7@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:46:37 2006 New Revision: 4542 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:47:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:47:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4543 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.html Message-ID: <20060328064734.934A15065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:47:30 2006 New Revision: 4543 Log: Deleted the file as it is no longer used after smartification Removed: vtigercrm/trunk/modules/Users/detailviewemailtemplate.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:49:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:49:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4544 - /vtigercrm/trunk/modules/Users/editemailtemplate.php Message-ID: <20060328064917.0D2DF506602@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:49:13 2006 New Revision: 4544 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:51:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:51:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4545 - in /vtigercrm/trunk/modules/Activities: GroupAllocationView.php SendReminder.php Message-ID: <20060328065128.4444350660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:51:23 2006 New Revision: 4545 Log: Unwanted contents removed Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php vtigercrm/trunk/modules/Activities/SendReminder.php Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Activities/SendReminder.php ============================================================================== --- vtigercrm/trunk/modules/Activities/SendReminder.php (original) +++ vtigercrm/trunk/modules/Activities/SendReminder.php Mon Mar 27 23:51:23 2006 @@ -30,8 +30,6 @@ global $adb; // Select the events with reminder -//$query="select crmentity.crmid,activity.*,activity_reminder.* from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id where ".$adb->getDBDateString("activity.date_start")." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0;"; - $query="select crmentity.crmid,activity.*,activity_reminder.*,recurringevents.activityid,recurringevents.recurringdate,recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left join recurringevents on activity.activityid=recurringevents.activityid where '".date('Y-m-d')."' between ".$adb->getDBDateString("activity.date_start")." and ". $adb->getDBDateString("activity.due_date") ." and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0;"; @@ -111,7 +109,7 @@ //Set the mail body/contents here #$contents ="Hi,\n\n This a activity reminder mail. Kindly visit the link for more details of the activity Click here\n\n Regards,\n Reminder Manager"; - $contents = nl2br($adb->query_result($result_main,0,'notificationbody')) ."\n\n Kindly visit the link for more details on the activity Click here"; + $contents = nl2br($adb->query_result($result_main,0,'notificationbody')) ."\n\n Kindly visit the link for more details on the activity Click here \n\n Regards,\n Reminder Manager"; if(count($to_addr) >=1) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:51:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:51:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4546 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060328065136.3B8B850660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:51:32 2006 New Revision: 4546 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Mon Mar 27 23:51:32 2006 @@ -16,8 +16,6 @@ $sql = "select * from emailtemplates order by templateid DESC"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); - //echo '
    '; print_r($temprow); echo '
    '; - $edit="Edit "; $del="Del "; @@ -31,7 +29,6 @@ global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; - $smarty = new vtigerCRM_Smarty; $smarty->assign("UMOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:52:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:52:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4547 - /vtigercrm/trunk/modules/Contacts/AddBusinessCard.php Message-ID: <20060328065226.BE4A750660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:52:22 2006 New Revision: 4547 Log: Unwanted tag removed Modified: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php Modified: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:54:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:54:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4548 - /vtigercrm/trunk/modules/Accounts/DeleteMemberAccountRelationship.php Message-ID: <20060328065400.C0536506609@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:53:55 2006 New Revision: 4548 Log: DeleteMemberAccountRelationship.php file removed Removed: vtigercrm/trunk/modules/Accounts/DeleteMemberAccountRelationship.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:58:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:58:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4550 - /vtigercrm/trunk/modules/Accounts/Forms.php Message-ID: <20060328065810.EC9C850661A@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:58:05 2006 New Revision: 4550 Log: junk code removal done Modified: vtigercrm/trunk/modules/Accounts/Forms.php Modified: vtigercrm/trunk/modules/Accounts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:00:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:00:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4551 - /vtigercrm/trunk/modules/Accounts/EditView.php Message-ID: <20060328070003.1B1F9506623@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:59:58 2006 New Revision: 4551 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Accounts/EditView.php Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:00:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:00:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4552 - /vtigercrm/trunk/modules/Vendors/PopupSearchForm.html Message-ID: <20060328070040.CC77A506618@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:00:36 2006 New Revision: 4552 Log: file has been removed Removed: vtigercrm/trunk/modules/Vendors/PopupSearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:01:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:01:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4553 - /vtigercrm/trunk/modules/Vendors/SearchForm.html Message-ID: <20060328070122.C1A7F50662D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:01:18 2006 New Revision: 4553 Log: file has been removed Removed: vtigercrm/trunk/modules/Vendors/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:02:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:02:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4554 - /vtigercrm/trunk/modules/Vendors/Vendor.js Message-ID: <20060328070236.3030F506629@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:02:31 2006 New Revision: 4554 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.js Modified: vtigercrm/trunk/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.js (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.js Tue Mar 28 00:02:31 2006 @@ -8,9 +8,6 @@ * ********************************************************************************/ -function set_focus() -{ -} function cancelForm(frm) { window.history.back(); @@ -124,8 +121,6 @@ var fldId = getOpenerObj("vendor_id"); fldName.value = vendor_name; fldId.value = vendor_id; - //window.opener.document.EditView.vendor_name.value = vendor_name; - //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_address(vendor_id, vendor_name, street, city, state, code, country,pobox ) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:03:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:03:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4555 - /vtigercrm/trunk/modules/Vendors/index.php Message-ID: <20060328070308.DB9B3506630@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:03:04 2006 New Revision: 4555 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/index.php Modified: vtigercrm/trunk/modules/Vendors/index.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/index.php (original) +++ vtigercrm/trunk/modules/Vendors/index.php Tue Mar 28 00:03:04 2006 @@ -16,8 +16,6 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/Vendors/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:07:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:07:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4556 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060328070722.D940250663E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:07:18 2006 New Revision: 4556 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Tue Mar 28 00:07:18 2006 @@ -59,10 +59,6 @@ 'Vendor Name'=>'vendorname', 'Phone'=>'phone' ); -/* -// var $combofieldNames = Array('manufacturer'=>'manufacturer_dom' - ,'productcategory'=>'productcategory_dom'); -*/ //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'vendorname'; @@ -86,19 +82,7 @@ $button = ''; - if(isPermitted("Products",1,"") == 'yes') - { - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - if($focus->product_novendor() !=0) - { - $button .= ' '; - } - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; - $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0'; return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); @@ -111,13 +95,7 @@ $button = ''; - if(isPermitted("PurchaseOrder",1,"") == 'yes') - { - - $button .= ' '; - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id; return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); @@ -129,10 +107,6 @@ $focus = new Contact(); $button = ''; - if(isPermitted("Contacts",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:09:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:09:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4557 - /vtigercrm/trunk/modules/Notes/NoteFormBase.php Message-ID: <20060328070905.3ED8450652A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:09:00 2006 New Revision: 4557 Log: Deleted the file as it is no longer uses Removed: vtigercrm/trunk/modules/Notes/NoteFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:14:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:14:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4558 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060328071419.E057D5065BE@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:14:15 2006 New Revision: 4558 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Tue Mar 28 00:14:15 2006 @@ -14,13 +14,8 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; -global $list_max_entries_per_page; -global $currentModule; - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:16:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:16:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4559 - /vtigercrm/trunk/modules/Vendors/EditView.php Message-ID: <20060328071618.CC35E50664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:16:13 2006 New Revision: 4559 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/EditView.php Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Tue Mar 28 00:16:13 2006 @@ -14,10 +14,7 @@ require_once('modules/Vendors/Vendor.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; +global $app_strings,$mod_strings,$theme; $focus = new Vendor(); $smarty = new vtigerCRM_Smarty(); @@ -35,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:17:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:17:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4560 - /vtigercrm/trunk/modules/Vendors/DetailView.php Message-ID: <20060328071749.C635650664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:17:45 2006 New Revision: 4560 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/DetailView.php Modified: vtigercrm/trunk/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailView.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailView.php Tue Mar 28 00:17:45 2006 @@ -10,7 +10,6 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('include/utils/utils.php'); require_once('modules/Vendors/Vendor.php'); require_once('include/utils/utils.php'); @@ -28,10 +27,8 @@ $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:20:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:20:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4561 - /vtigercrm/trunk/modules/Accounts/SearchForm.html Message-ID: <20060328072015.A118D506659@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 00:20:09 2006 New Revision: 4561 Log: SearchForm.html deleted Removed: vtigercrm/trunk/modules/Accounts/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:26:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:26:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4562 - in /vtigercrm/trunk/modules/Contacts: AddBusinessCard.php BusinessCard.html BusinessCard.php SaveBusinessCard.php Message-ID: <20060328072623.DD23B506667@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 00:26:18 2006 New Revision: 4562 Log: Business card info deleted Removed: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php vtigercrm/trunk/modules/Contacts/BusinessCard.html vtigercrm/trunk/modules/Contacts/BusinessCard.php vtigercrm/trunk/modules/Contacts/SaveBusinessCard.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:28:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:28:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4563 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl ListView.tpl Message-ID: <20060328072852.0EBBA50664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:28:47 2006 New Revision: 4563 Log: AddBusinesscard link removed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 28 00:28:47 2006 @@ -74,9 +74,6 @@ Import {$MODULE} | {/if} Export {$MODULE} - {if $MODULE eq 'Contacts'} -  | Add Business Card - {/if} {else}   Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Mar 28 00:28:47 2006 @@ -92,9 +92,6 @@ Import {$MODULE} | {/if} Export {$MODULE} - {if $MODULE eq 'Contacts'} -  | Add Business Card - {/if} {else}   From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:29:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:29:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4564 - in /vtigercrm/trunk/modules/Products: PopupVendorSearchForm.html SearchForm.html Message-ID: <20060328072903.33F08506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:28:58 2006 New Revision: 4564 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/PopupVendorSearchForm.html vtigercrm/trunk/modules/Products/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:29:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:29:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4565 - /vtigercrm/trunk/modules/Portal/ListView.php Message-ID: <20060328072935.55EA1506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:29:31 2006 New Revision: 4565 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Portal/ListView.php Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Mar 28 00:29:31 2006 @@ -33,7 +33,6 @@ $portal_array['portalurl'] = $portalurl; $portal_info[]=$portal_array; } -//echo '
    ';print_r($portal_array);echo '
    '; $smarty = new vtigerCRM_Smarty; $smarty->assign("IMAGEPATH", $image_path); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:30:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:30:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4566 - in /vtigercrm/trunk/modules/Leads: ConvertLead.php Lead.js Lead.php LeadConvertToEntities.php Save.php Message-ID: <20060328073004.7B1A0506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:29:55 2006 New Revision: 4566 Log: Unwanted Codes removed Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php vtigercrm/trunk/modules/Leads/Lead.js vtigercrm/trunk/modules/Leads/Lead.php vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php vtigercrm/trunk/modules/Leads/Save.php Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ConvertLead.php (original) +++ vtigercrm/trunk/modules/Leads/ConvertLead.php Tue Mar 28 00:29:55 2006 @@ -29,10 +29,6 @@ $log->debug(" the userid is ".$userid); $crmid = $adb->getUniqueID("crmentity"); -//$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted) values(".$id.",".$userid.",".$userid.",account,0,0)"; - -//$adb->query($sql_crmentity); - $sql = "SELECT firstname, lastname, company, smownerid from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.leadid =".$id; $result = $adb->query($sql); Modified: vtigercrm/trunk/modules/Leads/Lead.js ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.js (original) +++ vtigercrm/trunk/modules/Leads/Lead.js Tue Mar 28 00:29:55 2006 @@ -324,8 +324,6 @@ var fldId = getOpenerObj("lead_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.lead_name.value = product_name; - //window.opener.document.EditView.lead_id.value = product_id; } function add_data_to_relatedlist(entity_id,recordid) { Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Tue Mar 28 00:29:55 2006 @@ -186,8 +186,6 @@ //check if the custom table exists or not in the first place function checkIfCustomTableExists() { - //$result = mysql_query("select * from accountcf"); - //$testrow = mysql_num_fields($result); $result = $this->db->query("select * from leadscf"); $testrow = $this->db->num_fields($result); if($testrow > 1) Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Mar 28 00:29:55 2006 @@ -217,8 +217,6 @@ } - -//$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted) values(".$crmid.",".$current_user_id.",".$current_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0)"; $sql_crmentity = "insert into 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: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Tue Mar 28 00:29:55 2006 @@ -39,41 +39,10 @@ foreach($focus->column_fields as $fieldname => $val) { - /* - $tempvalue; - if($field == 'assigned_user_id') - { - //check which radio button the user has chosen - if($_REQUEST['assigntype'] == 'T') - { - $value='null'; - $focus->$field = $value; - } - else - { - $tempvalue = $_REQUEST['assigned_user_id']; - $value = $tempvalue; - $focus->$field = $value; - } - } - else if(isset($_REQUEST[$field])) - { - $value=$_REQUEST[$field]; - $focus->$field = $value; - } - - if(get_magic_quotes_gpc() == 1) - { - $focus->$field = stripslashes($focus->$field); - } - */ - if(isset($_REQUEST[$fieldname])) + if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; $log->info("the value is ".$value); - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } if(isset($_REQUEST['annualrevenue'])) @@ -84,73 +53,10 @@ } -/* -foreach($focus->additional_column_fields as $field) -{ - if(isset($_REQUEST[$field])) - { - if($field == 'assigned_user_id') - { - //check which radio button the user has chosen - if($_REQUEST['assigntype'] == 'T') - { - $value = 'null'; - } - else - { - $value = $_REQUEST['assigned_user_id']; - } - } - - else - { - $value = $_REQUEST[$field]; - } - $focus->$field = $value; - if(get_magic_quotes_gpc() == 1) - { - $focus->$field = stripslashes($focus->$field); - } - } -} -$createLeadFlag = true; -if($focus->id == "") -{ -} -else -{ -$createLeadFlag = false; -if($_REQUEST['assigntype'] == 'T') - { - $tempvalue = $_REQUEST['assigned_group_name']; - $value=$tempvalue; - updateLeadGroupRelation($focus->id,$value); - } -else -{ -updateLeadGroupRelation($focus->id,''); -} - - -} -*/ -//$focus->saveentity("Leads"); $focus->save("Leads"); $return_id = $focus->id; $log->info("the return id is ".$return_id); -/* -if($createLeadFlag) -{ - if($_REQUEST['assigntype'] == 'T') - { - $tempvalue = $_REQUEST['assigned_group_name']; - $value=$tempvalue; - insert2LeadGroupRelation($focus->id,$value); - } -} -save_customfields($focus->id); -*/ if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; else $return_module = "Leads"; if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; @@ -239,19 +145,5 @@ } } - /* srini patch - else - { - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0) - { - //Update Block - } - else - { - //Insert Block - $query = 'insert into leadcf ('.$columns.') values('.$values.')'; - $adb->query($query); - } - }*/ } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:36:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:36:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4567 - /vtigercrm/trunk/include/utils/DeleteUtils.php Message-ID: <20060328073621.93158506683@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:36:16 2006 New Revision: 4567 Log: comments removed Modified: vtigercrm/trunk/include/utils/DeleteUtils.php Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 28 00:36:16 2006 @@ -104,11 +104,8 @@ } elseif($return_module=="Products") { - //$relation_query = "DELETE from invoiceproductrel where productid=".$return_id." and invoiceid=".$record; - //$adb->query($relation_query); //Removing the relation from the quotes product rel $inv_query = "select * from invoiceproductrel where productid=".$return_id; - //echo $qt_query; $result = $adb->query($inv_query); $num_rows = $adb->num_rows($result); for($i=0; $i< $num_rows; $i++) @@ -220,11 +217,8 @@ } elseif($return_module == "Products") { - //$relation_query = "DELETE FROM quotesproductrel where productid=".$return_id." and quoteid=".$record; - //$adb->query($relation_query); //Removing the relation from the quotes product rel $qt_query = "select * from quotesproductrel where productid=".$return_id; - //echo $qt_query; $result = $adb->query($qt_query); $num_rows = $adb->num_rows($result); for($i=0; $i< $num_rows; $i++) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:37:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:37:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4568 - in /vtigercrm/trunk/modules/Calendar: dayview.php monthview.php weekview.php Message-ID: <20060328073719.95105506684@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:37:14 2006 New Revision: 4568 Log: file has been removed Removed: vtigercrm/trunk/modules/Calendar/dayview.php vtigercrm/trunk/modules/Calendar/monthview.php vtigercrm/trunk/modules/Calendar/weekview.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:38:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:38:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4569 - in /vtigercrm/trunk/modules: Accounts/Account.js Invoice/Invoice.js PurchaseOrder/PurchaseOrder.js Quotes/Quote.js Message-ID: <20060328073848.9E0B3506684@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:38:39 2006 New Revision: 4569 Log: copyAddress function moved to include/js/Inventory.js Modified: vtigercrm/trunk/modules/Accounts/Account.js vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js vtigercrm/trunk/modules/Quotes/Quote.js Modified: vtigercrm/trunk/modules/Accounts/Account.js ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.js (original) +++ vtigercrm/trunk/modules/Accounts/Account.js Tue Mar 28 00:38:39 2006 @@ -9,42 +9,7 @@ ********************************************************************************/ -function copyAddressRight(form) { - - form.ship_street.value = form.bill_street.value; - - form.ship_city.value = form.bill_city.value; - - form.ship_state.value = form.bill_state.value; - - form.ship_code.value = form.bill_code.value; - - form.ship_country.value = form.bill_country.value; - - form.ship_pobox.value = form.bill_pobox.value; - - return true; - -} - -function copyAddressLeft(form) { - - form.bill_street.value = form.ship_street.value; - - form.bill_city.value = form.ship_city.value; - - form.bill_state.value = form.ship_state.value; - - form.bill_code.value = form.ship_code.value; - - form.bill_country.value = form.ship_country.value; - - form.bill_pobox.value = form.ship_pobox.value; - - return true; - -} - +document.write(" - -EOQ; - -return $the_script; -} - - */ -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_first_name = $mod_strings['LBL_FIRST_NAME']; -$lbl_last_name = $mod_strings['LBL_LAST_NAME']; -$lbl_phone = $mod_strings['LBL_PHONE']; -$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$user_id = $current_user->id; - -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - - - $lbl_first_name
    -
    - $lbl_required_symbol$lbl_last_name
    -
    - $lbl_phone
    -
    - $lbl_email_address
    -

    - - - -EOQ; -$the_form .= get_left_form_footer(); -$the_form .= get_validate_record_js(); - -return $the_form; -} - - */ ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:41:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:41:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4571 - /vtigercrm/trunk/include/js/Inventory.js Message-ID: <20060328074116.D8F23506627@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:41:11 2006 New Revision: 4571 Log: js common for inventory has been moved to inventory.js file Added: vtigercrm/trunk/include/js/Inventory.js From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:44:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:44:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4572 - in /vtigercrm/trunk: include/utils/ modules/Emails/ modules/HelpDesk/ modules/Import/ modules/Migration/ Message-ID: <20060328074458.C95FD506627@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:44:43 2006 New Revision: 4572 Log: * Modified for junk code removal Modified: vtigercrm/trunk/include/utils/export.php vtigercrm/trunk/modules/Emails/Email.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/Import/ImportAccount.php vtigercrm/trunk/modules/Import/ImportContact.php vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportOpportunity.php vtigercrm/trunk/modules/Import/ImportSteplast.php vtigercrm/trunk/modules/Import/UsersLastImport.php vtigercrm/trunk/modules/Migration/Migration.php Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Tue Mar 28 00:44:43 2006 @@ -41,92 +41,21 @@ $result = $current_user->retrieve($_SESSION['authenticated_user_id']); if($result == null) { - session_destroy(); - header("Location: index.php?action=Login&module=Users"); + session_destroy(); + header("Location: index.php?action=Login&module=Users"); } } if ($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) { -die("you can't export!"); + die("you can't export!"); } - - -$contact_fields = array( -"id"=>"Contact ID" -,"lead_source"=>"Lead Source" -,"date_entered"=>"Date Entered" -,"date_modified"=>"Date Modified" -,"first_name"=>"First Name" -,"last_name"=>"Last Name" -,"salutation"=>"Salutation" -,"birthdate"=>"Lead Source" -,"do_not_call"=>"Do Not Call" -,"email_opt_out"=>"Email Opt Out" -,"title"=>"Title" -,"department"=>"Department" -,"birthdate"=>"Birthdate" -,"do_not_call"=>"Do Not Call" -,"phone_home"=>"Phone (Home)" -,"phone_mobile"=>"Phone (Mobile)" -,"phone_work"=>"Phone (Work)" -,"phone_other"=>"Phone (Other)" -,"phone_fax"=>"Fax" -,"email1"=>"Email" -,"email2"=>"Email (Other)" -,"yahoo_id"=>"Yahoo! ID" -,"assistant"=>"Assistant" -,"assistant_phone"=>"Assistant Phone" -,"primary_address_street"=>"Primary Address Street" -,"primary_address_city"=>"Primary Address City" -,"primary_address_state"=>"Primary Address State" -,"primary_address_postalcode"=>"Primary Address Postalcode" -,"primary_address_country"=>"Primary Address Country" -,"alt_address_street"=>"Other Address Street" -,"alt_address_city"=>"Other Address City" -,"alt_address_state"=>"Other Address State" -,"alt_address_postalcode"=>"Other Address Postalcode" -,"alt_address_country"=>"Other Address Country" -,"description"=>"Description" -); - -/*$account_fields = array( -"id"=>"Account ID", -"name"=>"Account Name", -"website"=>"Website", -"industry"=>"Industry", -"account_type"=>"Type", -"ticker_symbol"=>"Ticker Symbol", -"employees"=>"Employees", -"ownership"=>"Ownership", -"phone_office"=>"Phone", -"phone_fax"=>"Fax", -"phone_alternate"=>"Other Phone", -"email1"=>"Email", -"email2"=>"Other Email", -"rating"=>"Rating", -"sic_code"=>"SIC Code", -"annual_revenue"=>"Annual Revenue", -"billing_address_street"=>"Billing Address Street", -"billing_address_city"=>"Billing Address City", -"billing_address_state"=>"Billing Address State", -"billing_address_postalcode"=>"Billing Address Postalcode", -"billing_address_country"=>"Billing Address Country", -"shipping_address_street"=>"Shipping Address Street", -"shipping_address_city"=>"Shipping Address City", -"shipping_address_state"=>"Shipping Address State", -"shipping_address_postalcode"=>"Shipping Address Postalcode", -"shipping_address_country"=>"Shipping Address Country", -"description"=>"Description" -); - -*/ - //Function added to convert line breaks to space in description during export -function br2nl_vt($str) { - $str = preg_replace("/(\r\n)/", " ", $str); - return $str; +function br2nl_vt($str) +{ + $str = preg_replace("/(\r\n)/", " ", $str); + return $str; } function export_all($type) @@ -140,7 +69,7 @@ if ($type == "Contacts") { $focus = new Contact; - } + } else if ($type == "Accounts") { $focus = new Account; @@ -168,7 +97,6 @@ { $focus = new Lead; } - else if ($type == "Emails") { $focus = new Email; @@ -190,22 +118,10 @@ $where = $_SESSION['export_where']; } -/* - if ( isset( $_SESSION['order_by'] )) - { - $order_by = $_SESSION['order_by']; - } - else - { - $order_by = ""; - } - */ $order_by = ""; - $query = $focus->create_export_query($order_by,$where); + $query = $focus->create_export_query($order_by,$where); - //print $query; -//exit; $result = $adb->query($query,true,"Error exporting $type: "."
    $query"); @@ -222,7 +138,6 @@ { $new_arr = array(); - //foreach (array_values($val) as $value) foreach ($val as $key => $value) { if($key=="description") @@ -248,7 +163,7 @@ header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" ); header( "Cache-Control: post-check=0, pre-check=0", false ); header("Content-Length: ".strlen($content)); - print $content; +print $content; + exit; ?> - Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Tue Mar 28 00:44:43 2006 @@ -45,7 +45,6 @@ var $date_start; var $time_start; var $module_id="emailid"; - var $default_email_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote'); var $table_name = "activity"; var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel'); @@ -53,24 +52,20 @@ // This is the list of fields that are in the lists. var $list_fields = Array( - 'Subject'=>Array('activity'=>'subject'), - 'Related to'=>Array('seactivityrel'=>'activityid'), - 'Date Sent'=>Array('activity'=>'date_start'), - 'Assigned To'=>Array('crmentity','smownerid') - ); + 'Subject'=>Array('activity'=>'subject'), + 'Related to'=>Array('seactivityrel'=>'activityid'), + 'Date Sent'=>Array('activity'=>'date_start'), + 'Assigned To'=>Array('crmentity','smownerid') + ); var $list_fields_name = Array( - 'Subject'=>'subject', - 'Related to'=>'activityid', - 'Date Sent'=>'date_start', - 'Assigned To'=>'assigned_user_id'); + 'Subject'=>'subject', + 'Related to'=>'activityid', + 'Date Sent'=>'date_start', + 'Assigned To'=>'assigned_user_id' + ); var $list_link_field= 'subject'; - - - var $rel_users_table = "salesmanactivityrel"; - var $rel_contacts_table = "cntactivityrel"; - var $rel_serel_table = "seactivityrel"; var $object_name = "Email"; @@ -82,9 +77,6 @@ var $default_order_by = 'subject'; var $default_sort_order = 'ASC'; - function create_tables () { - - } function Email() { $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); @@ -106,12 +98,7 @@ $focus = new Contact(); - $button .= ' '; - - if(isPermitted("Contacts",3,"") == 'yes') - { - $button .= ' '; - } + $button = ''; $returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id; $query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.PearDatabase::quote($id).' and crmentity.deleted=0'; @@ -136,7 +123,7 @@ $result=$adb->query($query); $noofrows = $adb->num_rows($result); - $header[] = $app_strings['LBL_LIST_NAME']; + $header [] = $app_strings['LBL_LIST_NAME']; $header []= $app_strings['LBL_LIST_USER_NAME']; @@ -172,7 +159,7 @@ //Adding Security Check for User - $entries_list[] = entries; + $entries_list[] = $entries; } if($entries_list != '') @@ -198,7 +185,6 @@ left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".PearDatabase::quote($id); - //where crmentity.crmid=".$id; $query .= ' union all '; $query .= "select attachments.description title ,'Attachments' ActivityType, attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified, @@ -225,32 +211,33 @@ return $query; } - /** - * Used to releate email and contacts -- Outlook Plugin - */ - function set_emails_contact_invitee_relationship($email_id, $contact_id) - { - $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; - $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); - } + /** + * Used to releate email and contacts -- Outlook Plugin + */ + function set_emails_contact_invitee_relationship($email_id, $contact_id) + { + $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; + $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); + } - /** - * Used to releate email and salesentity -- Outlook Plugin - */ - function set_emails_se_invitee_relationship($email_id, $contact_id) - { - $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; - $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); - } + /** + * Used to releate email and salesentity -- Outlook Plugin + */ + function set_emails_se_invitee_relationship($email_id, $contact_id) + { + $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; + $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); + } - /** - * Used to releate email and Users -- Outlook Plugin - */ - function set_emails_user_invitee_relationship($email_id, $user_id) - { - $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; - $this->db->query($query,true,"Error setting email to user relationship: "."
    $query"); - } + /** + * Used to releate email and Users -- Outlook Plugin + */ + function set_emails_user_invitee_relationship($email_id, $user_id) + { + $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; + $this->db->query($query,true,"Error setting email to user relationship: "."
    $query"); + } + } ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAccount.php (original) +++ vtigercrm/trunk/modules/Import/ImportAccount.php Tue Mar 28 00:44:43 2006 @@ -24,8 +24,6 @@ require_once('data/SugarBean.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Potentials/Opportunity.php'); -//require_once('modules/Cases/Case.php'); -//require_once('modules/Calls/Call.php'); require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Accounts/Account.php'); @@ -35,15 +33,10 @@ class ImportAccount extends Account { var $db; -// Get _dom arrays from Database -//$comboFieldNames = Array('accounttype'=>'account_type_dom' -// ,'industry'=>'industry_dom'); -//$comboFieldArray = getComboArray($comboFieldNames); - - - // these are fields that may be set on import - // but are to be processed and incorporated - // into fields of the parent class + // Get _dom arrays from Database + //$comboFieldNames = Array('accounttype'=>'account_type_dom' + // ,'industry'=>'industry_dom'); + //$comboFieldArray = getComboArray($comboFieldNames); // This is the list of fields that are required. @@ -51,10 +44,10 @@ // This is the list of the functions to run when importing var $special_functions = array( - //"add_billing_address_streets" - //,"add_shipping_address_streets" - //,"fix_website" - ); + //"add_billing_address_streets" + //,"add_shipping_address_streets" + //,"fix_website" + ); function fix_website() Modified: vtigercrm/trunk/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportContact.php (original) +++ vtigercrm/trunk/modules/Import/ImportContact.php Tue Mar 28 00:44:43 2006 @@ -18,19 +18,6 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -/* -require_once('database/DatabaseConnection.php'); -require_once('data/SugarBean.php'); -require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Cases/Case.php'); -require_once('modules/Tasks/Task.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Meetings/Meeting.php'); -require_once('modules/Calls/Call.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -*/ require_once('modules/Contacts/Contact.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); @@ -54,16 +41,16 @@ // This is the list of the functions to run when importing var $special_functions = array( - //"get_names_from_full_name" - "add_create_account" - //,"add_salutation" - //,"add_lead_source" - //,"add_birthdate" - //,"add_do_not_call" - //,"add_email_opt_out" - //,"add_primary_address_streets" - //,"add_alt_address_streets" - ); + //"get_names_from_full_name" + "add_create_account" + //,"add_salutation" + //,"add_lead_source" + //,"add_birthdate" + //,"add_do_not_call" + //,"add_email_opt_out" + //,"add_primary_address_streets" + //,"add_alt_address_streets" + ); function add_salutation() { @@ -83,7 +70,6 @@ } } - function add_birthdate() { @@ -161,98 +147,6 @@ $this->last_name = join(' ',$name_arr); } - - /* function add_create_account() - { - global $adb; - // global is defined in UsersLastImport.php - global $imported_ids; - global $current_user; - - if ( (! isset($this->account_name) || $this->account_name == '') && - (! isset($this->account_id) || $this->account_id == '') ) - { - return; - } - - $arr = array(); - - // check if it already exists - $focus = new Account(); - - $query = ''; - - // if user is defining the account id to be associated with this contact.. - if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - } - - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); - - $row = $this->db->fetchByAssoc($result, -1, false); - - // we found a row with that id - if (isset($row['id']) && $row['id'] != -1) - { - // if it exists but was deleted, just remove it entirely - if ( isset($row['deleted']) && $row['deleted'] == 1) - { - $query2 = "delete from {$focus->table_name} WHERE id='". $row['id']."'"; - - $this->log->info($query2); - - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); - - } - // else just use this id to link the contact to the account - else - { - $focus->id = $row['id']; - } - } - - // if we didnt find the account, so create it - if (! isset($focus->id) || $focus->id == '') - { - $focus->name = $this->account_name; - $focus->assigned_user_id = $current_user->id; - $focus->modified_user_id = $current_user->id; - - if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save(); - // avoid duplicate mappings: - if (! isset( $imported_ids[$this->account_id]) ) - { - // save the new account as a users_last_import - $last_import = new UsersLastImport(); - $last_import->assigned_user_id = $current_user->id; - $last_import->bean_type = "Accounts"; - $last_import->bean_id = $focus->id; - $last_import->save(); - $imported_ids[$this->account_id] = 1; - } - } - - // now just link the account - $this->account_id = $focus->id; - - }*/ function add_create_account() { @@ -277,29 +171,13 @@ $query = ''; // if user is defining the account id to be associated with this contact.. - /*if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - }*/ - - //$query = "select * from {$focus->table_name} WHERE accountname='{$acc_name}' left join crmentity on crmentity.crmid =account.accountid"; //Modified to remove the spaces at first and last in account name -- after 4.2 patch 2 - $adb->println("Account name in csv file related to contact - to be search =>'".$acc_name."'"); $acc_name = trim(addslashes($acc_name)); - $adb->println("Account name going to search in database after addslashes, trim =>'".$acc_name."'"); $query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid"; - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); + $result = $adb->query($query) or die("Error selecting sugarbean: ".mysql_error()); $row = $this->db->fetchByAssoc($result, -1, false); @@ -317,8 +195,7 @@ $this->log->info($query2); - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); + $result2 = $adb->query($query2) or die("Error deleting existing sugarbean: ".mysql_error()); } // else just use this id to link the contact to the account @@ -343,14 +220,6 @@ $adb->println("New Account created id=".$focus->id); - /*if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save();*/ // avoid duplicate mappings: if (! isset( $imported_ids[$acc_id]) ) { @@ -377,7 +246,7 @@ // This is the list of fields that can be imported // some of these don't map directly to columns in the db -//we need to add two or more arrays as the columns are distributed across the tables now + //we need to add two or more arrays as the columns are distributed across the tables now /*var $importable_fields = array( "contactid"=>1, "firstname"=>1, Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Tue Mar 28 00:44:43 2006 @@ -72,69 +72,25 @@ return "Object:ImportMap id=$this->id name=$this->name module=$this->module content=$this->content"; } - function create_tables () - { - /* - $query = 'CREATE TABLE '.$this->table_name.' ( '; - $query .='id char(36) NOT NULL'; - $query .=', name char(36) NOT NULL'; - $query .=', module char(36) NOT NULL'; - $query .=', content blob'; - $query .=', has_header bool NOT NULL default 1'; - $query .=', deleted bool NOT NULL default 0'; - $query .=', date_entered datetime NOT NULL'; - $query .=', date_modified datetime NOT NULL'; - $query .=', assigned_user_id char(36)'; - $query .=', is_published char(3) NOT NULL default \'no\''; - $query .=', PRIMARY KEY ( ID ) )'; - - - - - $this->db->query($query,true,"Error creating table: ".$this->table_name. ":" ); - - - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - // Create the indexes - $this->create_index("create index idx_cont_owner_id_module_and_name on ".$this->table_name." (assigned_user_id, module, name, deleted)");*/ - } - - function drop_tables () - { - /* - $query = 'DROP TABLE IF EXISTS '.$this->table_name; - - - - $this->db->query($query); - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - - } - function save_map( $owner_id, $name, $module, $has_header,$content ) { - $query_arr = array( - 'assigned_user_id'=>$owner_id,'name'=>$name); + $query_arr = array('assigned_user_id'=>$owner_id,'name'=>$name); $this->retrieve_by_string_fields($query_arr, false); $result = 1; $this->assigned_user_id = $owner_id; - //$this->new_with_id=$this->db->getUniqueID("import_maps"); + $this->name = $name; $this->module = $module; - //$this->content = $content; + $this->content = "".$this->db->getEmptyBlob().""; $this->has_header = $has_header; $this->deleted = 0; $returnid = $this->save(); - //$this->db->println("save_map=".$this->new_with_id); + $this->db->updateBlob($this->table_name,"content","name='".$name."' and module='".$module."'",$content); - //$this->db->updateBlob($this->table_name,"content","id=".$this->new_with_id,$content); - + return $result; } Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Tue Mar 28 00:44:43 2006 @@ -24,8 +24,6 @@ require_once('data/SugarBean.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Potentials/Opportunity.php'); -//require_once('modules/Cases/Case.php'); -//require_once('modules/Calls/Call.php'); require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Accounts/Account.php'); @@ -41,28 +39,25 @@ class ImportOpportunity extends Potential { var $db; - // these are fields that may be set on import - // but are to be processed and incorporated - // into fields of the parent class - - // This is the list of fields that are required. - /*var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 -);*/ - + /* + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + */ + // This is the list of the functions to run when importing var $special_functions = array( - "add_create_account", - //"add_lead_source", - //"add_opportunity_type", - //"add_date_closed" - //"add_sales_stage" - ); + "add_create_account", + //"add_lead_source", + //"add_opportunity_type", + //"add_date_closed" + //"add_sales_stage" + ); function add_lead_source() { @@ -116,100 +111,7 @@ //exactly the same function from ImportAccount.php // lets put this in one place.. - /*function add_create_account() - { - global $adb; - // global is defined in UsersLastImport.php - global $imported_ids; - global $current_user; - - if ( (! isset($this->account_name) || $this->account_name == '') && - (! isset($this->account_id) || $this->account_id == '') ) - { - return; - } - - $arr = array(); - - // check if it already exists - $focus = new Account(); - - $query = ''; - - // if user is defining the account id to be associated with this contact.. - if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'" -; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - } - - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); - - $row = $this->db->fetchByAssoc($result, -1, false); - // if we found a row with that id - if (isset($row['id']) && $row['id'] != -1) - { - // if it exists but was deleted, just remove it entirely - if ( isset($row['deleted']) && $row['deleted'] == 1) - { - $query2 = "delete from {$focus->table_name} WHERE id='". $row['id']."'"; - - $this->log->info($query2); - - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); - - } - // else just use this id to link the contact to the account - else - { - $focus->id = $row['id']; - } - } - - // we didnt find the account, so create it - if (! isset($focus->id) || $focus->id == '') - { - $focus->name = $this->account_name; - $focus->assigned_user_id = $current_user->id; - $focus->modified_user_id = $current_user->id; - - if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save(); - // avoid duplicate mappings: - if (! isset( $imported_ids[$this->account_id]) ) - { - // save the new account as a users_last_import - $last_import = new UsersLastImport(); - $last_import->assigned_user_id = $current_user->id; - $last_import->bean_type = "Accounts"; - $last_import->bean_id = $focus->id; - $last_import->save(); - $imported_ids[$this->account_id] = 1; - } - } - - $this->account_id = $focus->id; - - } - */ - - -function add_create_account() + function add_create_account() { global $adb; // global is defined in UsersLastImport.php @@ -232,24 +134,12 @@ $query = ''; // if user is defining the account id to be associated with this contact.. - /*if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - }*/ - - //$query = "select * from {$focus->table_name} WHERE accountname='{$acc_name}' left join crmentity on crmentity.crmid =account.accountid"; - $acc_name = addslashes($acc_name); + $acc_name = trim(addslashes($acc_name)); $query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid"; $this->log->info($query); - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); + $result = $adb->query($query) or die("Error selecting sugarbean: ".mysql_error()); $row = $this->db->fetchByAssoc($result, -1, false); @@ -267,8 +157,7 @@ $this->log->info($query2); - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); + $result2 = $adb->query($query2) or die("Error deleting existing sugarbean: ".mysql_error()); } // else just use this id to link the contact to the account @@ -287,20 +176,11 @@ $focus->column_fields['assigned_user_id'] = $current_user->id; $focus->column_fields['modified_user_id'] = $current_user->id; - //$focus->saveentity("Accounts"); $focus->save("Accounts"); $acc_id = $focus->id; $adb->println("New Account created id=".$focus->id); - /*if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save();*/ // avoid duplicate mappings: if (! isset( $imported_ids[$acc_id]) ) { @@ -321,7 +201,6 @@ $adb->println("curr contact accid=".$this->column_fields["account_id"]); } - function fix_website() Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportSteplast.php (original) +++ vtigercrm/trunk/modules/Import/ImportSteplast.php Tue Mar 28 00:44:43 2006 @@ -61,23 +61,22 @@ if ( isset($_REQUEST['message'])) { -?> - -
    - - - - - -
    -
    - -
    -
    -
    - +
    + + + + + +
    +
    + +
    +
    +
    +
    @@ -89,29 +88,31 @@ - - +
    + + - +
    + - - - - - - - - - + + + + + + + + + - +
    - -
    + + +
    - - + bean_type = "Contacts"; $contact_query = $seedUsersLastImport->create_list_query($o,$w); $current_module_strings = return_module_language($current_language, 'Contacts'); -/*$seedUsersLastImport->list_fields = Array('id', 'first_name', 'last_name', 'account_name', 'account_id', 'title', 'yahoo_id', 'email1', 'phone_work', 'assigned_user_name', 'assigned_user_id'); - -$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Contacts' and users_last_import.bean_id=contactdetails.contactid AND users_last_import.deleted=0"; -*/ - $contact = new Contact(); -//$seedUsersLastImport->list_fields = $contact->column_fields; $seedUsersLastImport->list_fields = $contact->list_fields; $list_result = $adb->query($contact_query); @@ -143,6 +139,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Contacts','', false); $xtpl=new XTemplate ('modules/Contacts/ListView.html'); @@ -150,7 +147,6 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { @@ -166,8 +162,8 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); $adb->println("IMPLST Naviga"); $adb->println($navigation_array); + //Retreive the List View Table Header - $listview_header = getListViewHeader($contact,"Contacts"); $xtpl->assign("LISTHEADER", $listview_header); @@ -219,24 +215,15 @@ $xtpl->out("main"); - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Contacts/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Contacts" ); - #$ListView->setQuery($where, "", "","CONTACT"); - #$ListView->processListView($seedUsersLastImport, "main", "CONTACT"); - - echo "
    "; } -//opps list +//To display the list of Potentials imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Potentials"; -#$seedUsersLastImport->list_fields = Array('id', 'name','account_id','account_name','amount','date_closed','assigned_user_name', 'assigned_user_id'); - $current_module_strings = return_module_language($current_language, 'Potentials'); $potential_query = $seedUsersLastImport->create_list_query($o,$w); @@ -250,6 +237,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Potentials','', false); $xtpl=new XTemplate ('modules/Potentials/ListView.html'); @@ -257,7 +245,6 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { @@ -271,7 +258,6 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($potential,"Potentials"); $xtpl->assign("LISTHEADER", $listview_header); @@ -317,27 +303,17 @@ $xtpl->assign("Prev", $prevoutput); $xtpl->parse("main"); - $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Potentials' and users_last_import.bean_id=potential.potentialid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Potentials/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Potentials" ); - #$ListView->setQuery($where, "", "","POTENTIAL"); - #$ListView->processListView($seedUsersLastImport, "main", "POTENTIAL"); echo "
    "; } -//leads list +//To display the list of Leads imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Leads"; -#$seedUsersLastImport->list_fields = Array('id', 'name','account_id','account_name','amount','date_closed','assigned_user_name', 'assigned_user_id'); - $current_module_strings = return_module_language($current_language, 'Potentials'); $lead_query = $seedUsersLastImport->create_list_query($o,$w); @@ -351,6 +327,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Leads','', false); $xtpl=new XTemplate ('modules/Leads/ListView.html'); @@ -371,7 +348,6 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($lead,"Leads"); $xtpl->assign("LISTHEADER", $listview_header); @@ -417,26 +393,16 @@ $xtpl->assign("Prev", $prevoutput); $xtpl->parse("main"); - $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Potentials' and users_last_import.bean_id=potential.potentialid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Potentials/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Potentials" ); - #$ListView->setQuery($where, "", "","POTENTIAL"); - #$ListView->processListView($seedUsersLastImport, "main", "POTENTIAL"); echo "
    "; } - +//To display the list of Accounts imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Accounts"; $account_query = $seedUsersLastImport->create_list_query($o,$w); -//$seedUsersLastImport->list_fields = Array('id', 'name', 'website', 'phone_office', 'billing_address_city', 'assigned_user_name', 'assigned_user_id'); -//$seedUsersLastImport->list_fields = Array('accountid', 'accountname', 'website', 'phone', 'email1', 'assigned_user_name', 'fax'); $current_module_strings = return_module_language($current_language, 'Accounts'); @@ -449,6 +415,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty if($implict_account==true) echo get_form_header('Newly created Accounts','', false); else @@ -457,7 +424,6 @@ $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') @@ -472,9 +438,7 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($account,"Accounts"); - //$xtpl->assign("LISTHEADER", $listview_header); $listview_entries = getListViewEntries($account,"Accounts",$list_result,$navigation_array); $xtpl->assign("LISTHEADER", $listview_header); @@ -521,14 +485,6 @@ $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Accounts' and users_last_import.bean_id=account.accountid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Accounts/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Accounts" ); - #$ListView->setQuery($where, "", "name"); - #$ListView->setQuery($where, "", "","ACCOUNT"); - #$ListView->processListView($seedUsersLastImport, "main", "ACCOUNT"); } ?> Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/trunk/modules/Import/UsersLastImport.php (original) +++ vtigercrm/trunk/modules/Import/UsersLastImport.php Tue Mar 28 00:44:43 2006 @@ -40,12 +40,13 @@ var $table_name = "users_last_import"; var $object_name = "UsersLastImport"; - var $column_fields = Array("id" - ,"assigned_user_id" - ,"bean_type" - ,"bean_id" - ,"deleted" - ); + var $column_fields = Array( + "id" + ,"assigned_user_id" + ,"bean_type" + ,"bean_id" + ,"deleted" + ); var $new_schema = true; @@ -65,21 +66,10 @@ } - function create_tables () - { - } - - function drop_tables () - { - } - - function mark_deleted_by_user_id($user_id) { - $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'"; $this->db->query($query,true,"Error marking last imported accounts deleted: "); - } @@ -92,48 +82,6 @@ if ($this->bean_type == 'Contacts') { - /*$query = "SELECT distinct - account.accountname as account_name, - account.accountid as account_id, - contactdetails.contactid, - crmentity.smownerid, - contactdetails.yahooid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import - LEFT JOIN users ON contactdetails.contactid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - inner join crmentity on crmentity.crmid=contactdetails.contactid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0"; - */ - /*$query = "SELECT distinct crmid, - account.accountname as account_name, - contactdetails.contactid, - contactdetails.accountid, - contactdetails.yahooid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.id as assigned_user_id, - smownerid, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import - LEFT JOIN users ON contactdetails.contactid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - inner join crmentity on crmentity.crmid=contactdetails.contactid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0";*/ $query = "SELECT distinct crmid, account.accountname as account_name, contactdetails.contactid, @@ -159,19 +107,6 @@ } else if ($this->bean_type == 'Accounts') { - /*$query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM accounts, users_last_import - LEFT JOIN users - ON accounts.assigned_user_id=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=accounts.id - AND users_last_import.deleted=0 - AND accounts.deleted=0 - AND users.status='ACTIVE'";*/ $query = "SELECT distinct account.*, accountbillads.city, users.user_name assigned_user_name, crmid, smownerid @@ -191,29 +126,6 @@ else if ($this->bean_type == 'Potentials') { - /*$query = "SELECT distinct - accounts.id account_id, - accounts.name account_name, - users.user_name assigned_user_name, - opportunities.* - FROM opportunities, users_last_import - LEFT JOIN users - ON opportunities.assigned_user_id=users.id - LEFT JOIN accounts_opportunities - ON opportunities.id=accounts_opportunities.opportunity_id - LEFT JOIN accounts - ON accounts_opportunities.account_id=accounts.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Potentials' - AND users_last_import.bean_id=opportunities.id - AND users_last_import.deleted=0 - AND accounts_opportunities.deleted=0 - AND accounts.deleted=0 - AND opportunities.deleted=0 - AND users.status='ACTIVE'";*/ - $query = "SELECT distinct account.accountid account_id, account.accountname account_name, @@ -254,109 +166,10 @@ } - - /*if(! empty($order_by)) - { - $query .= " ORDER BY $order_by"; - }*/ - return $query; } - - - -/* function create_list_query(&$order_by, &$where) - { - - echo 'the bean type is >>>>>>>>>>>>>>>>>>>>>>>>>>>> ' .$this->bean_type; - global $current_user; - $query = ''; - - if ($this->bean_type == 'Contacts') - { - $query = "SELECT distinct - account.accountname as account_name, - account.accountid as account_id, - contactdetails.contactid, - crmentity.smownerid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import inner join crmentity on crmentity.crmid=contactdetails.contactid - LEFT JOIN users ON crmentity.smownerid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0 AND users.status='ACTIVE'"; - - echo 'Contacts >>>>>>>>>>>>>>>> '.$query; - } - else if ($this->bean_type == 'Accounts') - { - /*$query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM account, users_last_import - LEFT JOIN users - ON account.assigned_user_id=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=accounts.id - AND users_last_import.deleted=0 - AND accounts.deleted=0 - AND users.status='ACTIVE'"; - - $query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM account, users_last_import inner join crmentity on crmentity.crmid=account.accountid left join users - ON crmentity.smownerid=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=crmentity.crmid - AND users_last_import.deleted=0 - AND crmentity.deleted=0 - AND users.status='ACTIVE'"; - echo '
    Accounts >>>>>>>>>>>>>>>> '.$query; - } - else if ($this->bean_type == 'Potentials') - { - - $query = "SELECT distinct - account.accountid account_id, - account.accountname account_name, - users.user_name assigned_user_name - FROM potential, users_last_import inner join crmentity on crmentity.crmid=potential.potentialdid left join users - ON crmentity.smownerid=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Potentials' - AND users_last_import.bean_id=crmentity.crmid - AND users_last_import.deleted=0 - AND crmentity.deleted=0 - AND users.status='ACTIVE'"; - - - echo '
    Potentials >>>>>>>>>>>>>>>> '.$query; - } - - if(! empty($order_by)) - { - $query .= " ORDER BY $order_by"; - } - - return $query; - - }*/ function list_view_parse_additional_sections(&$list_form) { @@ -391,42 +204,22 @@ function undo_contacts($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Contacts' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; - /*$query2 = "update crmentity set crmentity.deleted=1 inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.contactid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2);*/ - - //TODO WELL BEFORE RELEASE RICHIE - //$query4 = "update contpotentialrel"; - - //$this->log->info($query4); - - // $result4 = $this->db->query($query4) - // or die("Error undoing last import: ".mysql_error()); - } return $count; } @@ -434,42 +227,22 @@ function undo_leads($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Leads' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; - /*$query2 = "update crmentity set crmentity.deleted=1 inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.contactid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2);*/ - - //TODO WELL BEFORE RELEASE RICHIE - //$query4 = "update contpotentialrel"; - - //$this->log->info($query4); - - // $result4 = $this->db->query($query4) - // or die("Error undoing last import: ".mysql_error()); - } return $count; } @@ -478,57 +251,21 @@ { // this should just be a loop foreach module type $count = 0; - $query1 = "select bean_id from users_last_import - where assigned_user_id='$user_id' - AND bean_type='Accounts' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count++; - //$count = $this->db->getAffectedRowCount($result2); - - - /*$query2 = "update accounts set accounts.deleted=1 - where accounts.id='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2); - - $query3 = "update accounts_contacts set accounts_contacts.deleted=1 - where accounts_contacts.account_id='{$row1['bean_id']}' - AND accounts_contacts.deleted=0"; - - $this->log->info($query3); - - $result3 = $this->db->query($query3) - or die("Error undoing last import: ".mysql_error()); - - $query4 = "update accounts_opportunities set accounts_opportunities.deleted=1 - where accounts_opportunities.account_id='{$row1['bean_id']}' - AND accounts_opportunities.deleted=0"; - - $this->log->info($query4); - - $result4 = $this->db->query($query4) - or die("Error undoing last import: ".mysql_error()); - */ + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); + + $count++; } return $count; @@ -538,54 +275,21 @@ { // this should just be a loop foreach module type $count = 0; - $query1 = "select bean_id from users_last_import - where assigned_user_id='$user_id' - AND bean_type='Potentials' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count++; - - /*$query2 = "update opportunities set opportunities.deleted=1 - where opportunities.id='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2); - - $query3 = "update opportunities_contacts set opportunities_contacts.deleted=1 - where opportunities_contacts.opportunity_id='{$row1['bean_id']}' - AND opportunities_contacts.deleted=0"; - - $this->log->info($query3); - - $result3 = $this->db->query($query3) - or die("Error undoing last import: ".mysql_error()); - - - $query4 = "update accounts_opportunities set accounts_opportunities.deleted=1 - where accounts_opportunities.opportunity_id='{$row1['bean_id']}' - AND accounts_opportunities.deleted=0"; - - $this->log->info($query4); - - $result4 = $this->db->query($query4) - or die("Error undoing last import: ".mysql_error()); */ + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); + + $count++; } return $count; @@ -594,22 +298,19 @@ function undo_products($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Products' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; } Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Tue Mar 28 00:44:43 2006 @@ -100,22 +100,6 @@ echo '
    Current Database has been created.'; } - function dropAllData($conn) - { - $tables_list = $conn->get_tables(); - foreach($tables_list as $key) - { - //if the table name has _seq, the let it pass - if(strpos($key,"_seq")) - { - $conn->println('
    skipping table '.$key .' for truncation '); - continue; - } - $sql = "delete from ".$key; - $conn->query($sql); - } - } - function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile) { if($mysql_password != '') @@ -149,7 +133,7 @@ //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release - //Mickie -- Handle Here + //Handle Here -- Mickie include("ModifyDatabase/42P2_to_50Alpha.php"); $conn->println("Mickie ---- Ends\n\n\n"); @@ -202,9 +186,6 @@ $this->conn->println("Going to Create the current Database"); $this->createDatabase($conn,$new_dbname); - //Drop all the values from the tables - //$this->dropAllData($conn); - //Apply the dump of the old database to the current database $this->conn->println("Going to apply the old database dump to the new database."); $this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:44:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:44:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4573 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060328074459.C407F50668B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:44:54 2006 New Revision: 4573 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Tue Mar 28 00:44:54 2006 @@ -164,12 +164,7 @@ if ( isset($_GET['team']) ) { $team = $_GET['team']; $x = $user->set_prefteam($team); - } //else { - /* Get the last used team */ - //$team = $user->get_prefteam(); - //} - //$user->readKnownParties(); - + } /* Get group or user whose calendar should be displayed */ /* default to current checked in user */ if ( ($team == CAL_EVERYTHING) && ! is_admin($current_user) ) { @@ -339,18 +334,12 @@ */ class appointment extends tutos_base { - /* --------------------------------------------------------------------------- - */ var $db; function appointment() { global $table,$current_user; - #$this->init($dbconn); $this->db = new PearDatabase(); - # if ( ! class_exists ("product") ) { - # require_once 'product.pinc'; - # } $this->descr = ""; $this->trace = 0; $this->outside = 0; @@ -359,7 +348,6 @@ $this->end = new DateTime(); $this->t_ignore = 0; $this->visitor = -1; - #$this->product = new product($this->dbconn); $this->remember = 0; $this->remembered = 0; $this->email = 0; @@ -373,7 +361,6 @@ $this->init_custom("appointment1"); - # Repeat stuff $this->repeat = APP_NOREP; $this->r_arg = 0; $this->r_ignore = 0; @@ -383,21 +370,6 @@ $this->tablename = $this->dbconn->prefix .$table['appointment1'][name]; } - /** - * fill the object data with a given resultset - * - * @param Object $r a result set object - * @param int $pos a index in the resultset - */ - - /* function getUserName($userid) - { - //require_once("modules/Users/User.php"); - $user = new User(); - $user->retrieve($userid); - return $user->first_name." ".$user->last_name; - } -*/ function getContactName($contactid) { require_once("modules/Contacts/Contact.php"); @@ -409,10 +381,7 @@ // srini read_result function read_result ($val_array, $pos=-1) { - // print("
    GS --> read_result pos=".$pos); - // print_r($val_array); if($pos!=-1) return; - //print("GS --> continuing"); $fmt_sthr=''; $fmt_stm=''; list($sthr,$stmn,$stsc) = split(":",$val_array["time_start"]); @@ -461,10 +430,8 @@ $this->subject = $val_array["subject"]; $this->module_name = $val_array["activitytype"]; $this->record_id = $val_array["activityid"]; - #$this->creator = getObject($this->dbconn,$r->get($pos, "creator")); $obj->creator->id = $val_array["smownerid"]; - #$this->creator = $val_array["creator"]; $this->creator = getUserName($val_array["smownerid"]); //For displaying the group name in the calendar -Jaguar @@ -958,19 +925,11 @@ function getLink($text = -1) { global $lang,$mod_strings; - // commented temporary srini - /*if ( ($this->mod_ok()) && ($this->end->getTimestamp() - time() > 0 ) ) {*/ // commented and added by raj #$url = $this->getModURL(); - // $url = "../../index.php?module=Activities&action=DetailView&actvity_mode=Events&record=".$this->record_id; $url = "index.php?action=DetailView&module=Activities&record=".$this->record_id ."&activity_mode=Events"; - // $info = $mod_strings['LBL_CHANGE_APPNT']; - /*} else { - $url = $this->getURL(); - $info = $lang['seeapp']; - }*/ if ( $this->repeat == APP_NOREP ) { if ( $this->t_ignore == 0) { $info = sprintf ($info,$this->start->getDateTimeShort(),$this->end->getDateTimeShort()); @@ -1074,8 +1033,6 @@ } else if ($fld == "end") { $d = new DateTime($data); $this->setEndTime($d); -# } else if ($fld == "participant") { -# $this->setLName($data); } else if ($fld == "t_ignore") { $this->t_ignore = $data; } else if ($fld == "r_ignore") { @@ -1244,9 +1201,7 @@ $end = $app->end; $start->setDateTime($app->start->getYYYYMMDD()); $end->setDateTime($app->end->getYYYYMMDD()); -# if ( $start->getDate() == $end->GetDate() ) { $end->addDays(1); -# } $start_ts2 = $start->getTimestamp(); $end_ts2 = $end->getTimestamp(); } else { @@ -1322,7 +1277,6 @@ */ function getLocation() { global $lang; - #return "outside ."\">". $lang['AppLoc'][$this->outside] .""; return "". $this->outside .""; } /** @@ -1415,8 +1369,6 @@ //added from Fredy's patch echo " ". $this->creator ."  \n"; - #echo " ". $this->getLocation() ."\n"; - #echo " ". $this->outside ."\n"; echo " \n"; //added account names to the calendar entry given by Fredy @@ -1484,10 +1436,8 @@ //Added for description $descr = eregi_replace("\n","
    ",$this->descr); if ($descr != "" ) { - //echo " module_name."s.gif\" border=\"0\">  echo " "; echo "".$this->getLink(urlReplace($descr))." \n"; - //echo " ". $this->creator ." \n"; } @@ -1513,11 +1463,6 @@ echo "
    ". $this->visitor->getLink() ."\n"; } - /*product::small_infolist($current_user,$this,3,$class); - foreach($tutos[activemodules] as $i => $f) { - $x = new $tutos[modules][$f][name]($this->dbconn); - $x->small_infolist($current_user,$this,3,$class); - }*/ } return; } @@ -1678,24 +1623,6 @@ info => $lang['NewAppointInfo'], category => array("app","new","obj") ); - /* if ( ($obj->getType() == "company") || - ($obj->getType() == "department") - ) { - $x[0][url] = addUrlParameter($x[0][url],"vid=".$obj->id); - $x[0][category] = array("app","new","module"); - $x[0][text] = $lang['NewAppoint']; - } else if ( ($obj->getType() == "product") ) { - $x[0][url] = addUrlParameter($x[0][url],"pid=".$obj->id); - $x[0][category] = array("app","new","module"); - $x[0][text] = $lang['NewAppoint']; - } else { - $x[1] = array( url => "app_new_r.php", - text => $lang['NewAppointR'], - info => $lang['NewAppointInfoR'], - category => array("app","new","obj") - ); - } -*/ return $x; } /** From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:45:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:45:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4574 - /vtigercrm/trunk/modules/Import/SugarFile.php Message-ID: <20060328074556.61ECD506695@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:45:49 2006 New Revision: 4574 Log: * Removed the file as it is not used anywhere Removed: vtigercrm/trunk/modules/Import/SugarFile.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:46:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:46:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4575 - /vtigercrm/trunk/include/js/clock.js Message-ID: <20060328074659.9E48F506693@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:46:55 2006 New Revision: 4575 Log: common function related to cookies has been removed Modified: vtigercrm/trunk/include/js/clock.js Modified: vtigercrm/trunk/include/js/clock.js ============================================================================== --- vtigercrm/trunk/include/js/clock.js (original) +++ vtigercrm/trunk/include/js/clock.js Tue Mar 28 00:46:55 2006 @@ -203,39 +203,6 @@ ClockAndAssign(); } -// Setting cookies -function set_cookie ( name, value, exp_y, exp_m, exp_d, path, domain, secure ) -{ - var cookie_string = name + "=" + escape ( value ); - - if (exp_y) //delete_cookie(name) - { - var expires = new Date ( exp_y, exp_m, exp_d ); - cookie_string += "; expires=" + expires.toGMTString(); - } - - if (path) cookie_string += "; path=" + escape ( path ); - if (domain) cookie_string += "; domain=" + escape ( domain ); - if (secure) cookie_string += "; secure"; - - document.cookie = cookie_string; -} - -// Retrieving cookies -function get_cookie(cookie_name) -{ - var results = document.cookie.match(cookie_name + '=(.*?)(;|$)'); - if (results) return (unescape(results[1])); - else return null; -} - -// Delete cookies -function delete_cookie( cookie_name ) -{ - var cookie_date = new Date ( ); // current date & time - cookie_date.setTime ( cookie_date.getTime() - 1 ); - document.cookie = cookie_name += "=; expires=" + cookie_date.toGMTString(); -} if (get_cookie("timezone")==null || get_cookie("timezone")==false || get_cookie("timezone")<0 || get_cookie("timezone")=="1") { lcl(0,true) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:47:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:47:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4576 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060328074726.276BF506695@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:47:22 2006 New Revision: 4576 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Tue Mar 28 00:47:22 2006 @@ -32,14 +32,10 @@ include_once $calpath .'webelements.p3'; include_once $calpath .'permission.p3'; include_once $calpath .'preference.pinc'; - #include_once $calpath .'task.pinc'; include_once $calpath .'appointment.pinc'; include_once $calpath .'addEventUI.php'; require_once('modules/Calendar/UserCalendar.php'); - #include_once $calpath .'product.pinc'; - - /* Check if user is allowed to use it */ - #check_user(); + loadmodules("appointment","show"); loadlayout(); /** @@ -51,7 +47,6 @@ $this->pref = new preference(); $this->db = new PearDatabase(); $calobj = new UserCalendar(); -// $this->tablename = $calobj->table_name; } /** @@ -65,8 +60,6 @@ */ function getHourList($hour,$maxcol,$table,$i) { - //echo '
    ';print_r($table);echo '
    '; - //echo $maxcol; global $adb; echo ""; echo " @@ -94,7 +87,7 @@ } echo "\n"; echo $table[$i][$c]->formatted(); - echo "
    ";//\n"; + echo " "; } else if ( $table[$i][$c] = -1 ) { # SKIP occupied by rowspan } @@ -115,7 +108,6 @@ "; } - //end @@ -316,10 +308,6 @@ global $tutos, $lang,$msg; $this->name = $mod_strings['LBL_MODULE_NAME']; - #if ( ! $this->user->feature_ok(usecalendar,PERM_SEE) ) { - # $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); - # $this->stop = true; - #} $this->teamname = ""; $this->t = Date("Ymd"); @@ -337,22 +325,11 @@ } $this->addHidden("t", $this->t); $this->uids = cal_parse_options($this->pref,$this->teamname); - #$this->team = $this->user->get_prefteam(); - # menu - #$m = appointment::getSelectLink($this->user); - #$m[category][] = "obj"; - #$this->addmenu($m); - #$m = appointment::getAddLink($this->user,$this->user); - #$this->addMenu($m); } } - -# info($t,$this->user->get_prefteam(),$teamname,$uids); - $l = new calendar_day($current_user); $l->display(); - #$dbconn->Close(); ?> - - -EOQ; - -return $the_script; -} - ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:13:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:13:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4598 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060328101320.32D4D506771@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:13:15 2006 New Revision: 4598 Log: get_set_focus_js() has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Tue Mar 28 03:13:15 2006 @@ -168,7 +168,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if(isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:26:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:26:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4599 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060328102658.6C1DF5067BB@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:26:52 2006 New Revision: 4599 Log: changes made for multiselect combo box Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Tue Mar 28 03:26:52 2006 @@ -8,22 +8,22 @@ * All Rights Reserved. * ********************************************************************************/ + +require_once('include/CustomFieldUtil.php'); +require_once('XTemplate/xtpl.php'); -require_once ($theme_path."layout_utils.php"); -require_once('include/CustomFieldUtil.php'); -global $mod_strings,$adb; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings['NEW']." ".$mod_strings[$_REQUEST['fld_module']]." ".$mod_strings['CUSTOMFIELD'], true); -require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; -global $theme; +global $mod_strings,$app_strings,$app_list_strings,$theme,$adb; + $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; + require_once($theme_path.'layout_utils.php'); + $tabid=$_REQUEST['tabid']; $fieldid=$_REQUEST['fieldid']; + $xtpl=new XTemplate ('modules/Settings/customfield.html'); if(isset($fieldid) && $fieldid!='') { @@ -37,7 +37,8 @@ $xtpl->assign("LABELVALUE",$customfield_fieldlabel); $xtpl->assign("LENGTHVALUE",$fieldlength); $xtpl->assign("DECIMALVALUE",$decimalvalue); - if($fieldtype == '7') + $xtpl->assign("READ","readonly"); + if($fieldtype == '7' || $fieldtype == '11') { $query = "select * from ".$customfield_columnname; $result = $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:29:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:29:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4600 - /vtigercrm/trunk/install/2setConfig.php Message-ID: <20060328102952.C706A5067C5@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:29:48 2006 New Revision: 4600 Log: width for dbtype is removed Modified: vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:32:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:32:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4601 - /vtigercrm/trunk/modules/Settings/customfield.html Message-ID: <20060328103203.12B745067D2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:31:59 2006 New Revision: 4601 Log: readonly permission is given for decimal,length and picklist filed Modified: vtigercrm/trunk/modules/Settings/customfield.html Modified: vtigercrm/trunk/modules/Settings/customfield.html ============================================================================== --- vtigercrm/trunk/modules/Settings/customfield.html (original) +++ vtigercrm/trunk/modules/Settings/customfield.html Tue Mar 28 03:31:59 2006 @@ -280,7 +280,7 @@ - +
    {APP.LBL_REQUIRED_SYMBOL}{MOD.LBL_LENGTH}
    @@ -288,7 +288,7 @@ - +
    {MOD.LBL_DECIMAL_PLACES}
    @@ -296,7 +296,7 @@ - +
    {APP.LBL_REQUIRED_SYMBOL}{MOD.LBL_PICK_LIST_VALUES}
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 03:14:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 11:14:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4602 - /vtigercrm/trunk/pkg/php/php.ini Message-ID: <20060328111453.BEFD85067E2@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 04:14:49 2006 New Revision: 4602 Log: mysql dll entry added extensions renamed to ext as in php5 Modified: vtigercrm/trunk/pkg/php/php.ini Modified: vtigercrm/trunk/pkg/php/php.ini ============================================================================== --- vtigercrm/trunk/pkg/php/php.ini (original) +++ vtigercrm/trunk/pkg/php/php.ini Tue Mar 28 04:14:49 2006 @@ -425,7 +425,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "VTIGER_HOME\php\extensions" +extension_dir = "VTIGER_HOME\php\ext" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically @@ -563,6 +563,7 @@ ;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll +extension=php_mysql.dll ;extension=php_msql.dll ;extension=php_oci8.dll ;extension=php_openssl.dll From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 06:30:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 14:30:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4603 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060328143026.DED235076E2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 07:30:21 2006 New Revision: 4603 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Tue Mar 28 07:30:21 2006 @@ -4,7 +4,6 @@ /** * Copyright 1999 - 2004 by Gero Kohnert */ -//global $calpath,$callink,$current_user; global $calpath,$callink,$current_user,$adb; $callink = "index.php?module=Calendar&action="; include_once $calpath .'webelements.p3'; @@ -68,7 +67,6 @@ $y = Date("Y"); } -#echo "\n"; echo ""; echo "\n"; @@ -120,7 +116,6 @@ echo ""; echo "\n"; - //echo "\n"; for ( $i = $current_user->weekstart;$i<=6;$i++ ) { @@ -154,15 +149,6 @@ $xxd = Date("d",$ts); // day of month with leading zero $xm = Date("n",$ts); // month (1-12 $xy = Date("Y",$ts); // Year (2005) - -/* if ( $wd == $l->user->weekstart ) { - # new week - echo "\n"; - $w0 = (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3; - $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) ); - echo " \n"; - } -*/ // Overlapping days -starts by Fredy @@ -173,11 +159,9 @@ // break; //commented as january is not coming for all the even years } # new week - //echo "******************************"; echo "\n"; $w0 = (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3; $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) ); - //echo " \n"; } // check for overlapping days @@ -240,22 +224,18 @@ echo "\n"; echo " \n"; } - #echo "1 ".$this->user->weekstart ."
    "; $color = ""; $username=$pref->callist[$idx]->creator; @@ -330,8 +305,6 @@ echo "\n
    ". $mod_strings['LBL_WEEK'] ."
    ". $wn ." 
    ". $wn ." \n"; if (($xm == $m ) || $month_overlap) { - #echo " ". $xxd .""; // added by raj /* Select appointments for this day */ $from = new DateTime(); $to = new DateTime(); $from->setDateTimeTS($ts - 12 * 3600); $to->setDateTimeTS($ts - 12 * 3600); - #$to->addDays(7); $pref->callist = array(); $app = new appointment(); $app->readCal($pref,$from,$to); - // appointment::readCal($pref,$from,$to); $dd = new DateTime(); - # $d = strftime($lang['DateFormatStr'],$ts); $dd->setDateTimeTS($ts); $d = $dd->getDate(); $tref = Date("Ymd",$ts); @@ -265,7 +245,6 @@ if ($col=="today") { echo $xd; - //echo " ". $xd .""; echo "
    "; echo "+"; echo "
    "; @@ -273,12 +252,10 @@ else { echo $xd; - //echo " ". $xd .""; echo "
    "; echo "+"; echo "
    "; } - // $next = NextDay($ts); # Check for workday @@ -308,11 +285,9 @@ } else { - //echo "
    \"--------\"
    \n"; $pref->callist[$idx]->formatted(); - //echo "\n
    "; - #echo "2 ".$this->user->weekstart ."
    "; $a++; } @@ -340,7 +313,6 @@ echo "
    \n"; } - // } else { @@ -359,10 +331,8 @@ } $a++; $w++; - // $ts += 86400; //changed for fixing the Daylight Saving Time issue as per suggestion by Bushwack post id - //http://forums.vtiger.com/viewtopic.php?p=14967#14967 $ts = strtotime('+1 day', $ts); } if ( $n == 1 ) @@ -371,15 +341,6 @@ } echo "\n"; -//echo ""; -//echo ""; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "
     
    \n"; echo "\n"; echo ""; echo " @@ -418,8 +379,6 @@ # selection of none allowed echo "
    \n"; -#echo "\n"; -#echo "\n"; ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 07:00:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:00:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4606 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060328150013.8D289508ADA@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:00:07 2006 New Revision: 4606 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue Mar 28 08:00:07 2006 @@ -1,3 +1,54 @@ +function DisableSharing() +{ + + x = document.SharedList.selected_id.length; + idstring = ""; + xx = 0; + if ( x == undefined) + { + + if (document.SharedList.selected_id.checked) + { + document.SharedList.idlist.value=document.SharedList.selected_id.value; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + else + { + for(i = 0; i < x ; i++) + { + if(document.SharedList.selected_id[i].checked) + { + idstring = document.SharedList.selected_id[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.SharedList.idlist.value=idstring; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + { + document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; + } + else + { + return false; + } +} + + + function showhide(argg) { var x=document.getElementById(argg).style; @@ -83,7 +134,7 @@ function check_form() { - if(trim(document.appSave.subject.value) == "") + if(document.appSave.subject.value == "") { alert("Missing Event Name"); document.appSave.subject.focus() @@ -104,51 +155,108 @@ } -function DisableSharing() -{ - - x = document.SharedList.selected_id.length; - idstring = ""; - xx = 0; - if ( x == undefined) - { - - if (document.SharedList.selected_id.checked) - { - document.SharedList.idlist.value=document.SharedList.selected_id.value; - } - else - { - alert("Please select atleast one user"); - return false; - } - } - else - { - for(i = 0; i < x ; i++) - { - if(document.SharedList.selected_id[i].checked) - { - idstring = document.SharedList.selected_id[i].value +";"+idstring - xx++ - } - } - if (xx != 0) - { - document.SharedList.idlist.value=idstring; - } - else - { - alert("Please select atleast one user"); - return false; - } - } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) - { - document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; - } - else - { - return false; - } -} + +var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; +function setObjects() +{ + availListObj=getObj("available") + selectedColumnsObj=getObj("selectedusers") + +} + +function addColumn() +{ + var selectlength=selectedColumnsObj.length + var availlength=availListObj.length + var s=0 + for (i=0;i Author: saraj Date: Tue Mar 28 08:01:19 2006 New Revision: 4607 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_share.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_share.php Tue Mar 28 08:01:19 2006 @@ -156,108 +156,5 @@ return true; } -var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; -function setObjects() -{ - availListObj=getObj("available") - selectedColumnsObj=getObj("selectedusers") - -} -function addColumn() -{ - var selectlength=selectedColumnsObj.length - var availlength=availListObj.length - var s=0 - for (i=0;i From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 07:13:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:13:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4608 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060328151321.7F720508D8C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:13:17 2006 New Revision: 4608 Log: error in javascript has been fixed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 28 08:13:17 2006 @@ -500,7 +500,7 @@ {ldelim} var item = response.responseText; getObj('tagfields').innerHTML = item; - document.getElementById(txtBox).value =''; + document.getElementById('txtbox_tagfields').value =''; {rdelim} From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 07:49:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4609 - in /vtigercrm/trunk/include/fpdf: pdf.php templates/ templates/body.php Message-ID: <20060328154941.8FBF250A041@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:49:34 2006 New Revision: 4609 Log: files added as the common files moved Added: vtigercrm/trunk/include/fpdf/pdf.php vtigercrm/trunk/include/fpdf/templates/ vtigercrm/trunk/include/fpdf/templates/body.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 07:51:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:51:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4610 - in /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php Message-ID: <20060328155124.7397050A210@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:51:16 2006 New Revision: 4610 Log: common code moved to include/pdf/body.php and the include statement changed to include/fpdf/templates/body.php as body.php has been moved from pdf_templates/body.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ column_fields[account_id]); -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - - // **************** BEGIN POPULATE DATA ******************** // populate data -$so_name = getSoName($focus->column_fields["salesorder_id"]); +if($focus->column_fields["salesorder_id"] != '') + $so_name = getSoName($focus->column_fields["salesorder_id"]); +else + $so_name = ''; $po_name = $focus->column_fields["purchaseorder"]; $valid_till = $focus->column_fields["duedate"]; @@ -444,7 +46,7 @@ $conditions = $focus->column_fields["terms_conditions"]; $description = $focus->column_fields["description"]; -$invoice_status = $focus->column_fields["invoicestatus"]; +$status = $focus->column_fields["invoicestatus"]; // Company information $add_query = "select * from organizationdetails"; @@ -462,7 +64,6 @@ $org_phone = $adb->query_result($result,0,"phone"); $org_fax = $adb->query_result($result,0,"fax"); $org_website = $adb->query_result($result,0,"website"); - $logo_name = $adb->query_result($result,0,"logoname"); } @@ -535,7 +136,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); - -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** @@ -537,7 +134,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 4.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -// add a line to the invoice/estimate -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** $focus = new Quote(); @@ -441,7 +38,7 @@ $conditions = $focus->column_fields["terms_conditions"]; $description = $focus->column_fields["description"]; -$quote_status = $focus->column_fields["quotestage"]; +$status = $focus->column_fields["quotestage"]; // Company information $add_query = "select * from organizationdetails"; @@ -532,7 +129,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Mar 28 08:51:16 2006 @@ -1,6 +1,6 @@ retrieve_entity_info($_REQUEST['record'],"SalesOrder"); $account_name = getAccountName($focus->column_fields[account_id]); -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** - - // populate data -$quote_name = getQuoteName($focus->column_fields["quote_id"]); +if($focus->column_fields["quote_id"] != '') + $quote_name = getQuoteName($focus->column_fields["quote_id"]); +else + $quote_name = ''; $po_name = $focus->column_fields["purchaseorder"]; $subject = $focus->column_fields["subject"]; @@ -535,7 +136,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 07:59:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:59:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4611 - in /vtigercrm/trunk/modules: Invoice/pdf_templates/body.php PurchaseOrder/pdf_templates/body.php Quotes/pdf_templates/body.php SalesOrder/pdf_templates/body.php Message-ID: <20060328155908.C34C350A607@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:58:59 2006 New Revision: 4611 Log: common files removed as body.php moved include/fpdf/templates/body.php Removed: vtigercrm/trunk/modules/Invoice/pdf_templates/body.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/body.php vtigercrm/trunk/modules/Quotes/pdf_templates/body.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/body.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 20:33:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 04:33:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4612 - /vtigercrm/trunk/include/js/dtlviewajax.js Message-ID: <20060329043335.2AA5550D19D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 21:33:30 2006 New Revision: 4612 Log: junk code removed Modified: vtigercrm/trunk/include/js/dtlviewajax.js Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Mar 28 21:33:30 2006 @@ -22,8 +22,6 @@ { showHide(valuespanid,textareapanid); - //fieldLabelObj = getObj(fieldlabel); - //fieldLabelObj.className="label"; itsonview=false; return false; } @@ -39,13 +37,9 @@ } show("crmspanid"); - //globalfieldlabel=fieldLabel; globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid; - //globalsubvaluespanid="subvalue_"+ fieldLabel;//subvaluespanid; globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid; - //globaluitype=uitype; globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid; - //globalismandatory=ismandatory; divObj = getObj('crmspanid'); crmy = findPosY(getObj(mouseArea)); crmx = findPosX(getObj(mouseArea)); @@ -63,25 +57,18 @@ function handleEdit() { - //setValue(globalvaluespanid,globaltextboxpanid,globalsubvaluespanid,globaluitype,globalfieldlabel); - //setValue(globalvaluespanid,globaltextboxpanid,globalsubvaluespanid,globaluitype,globalfieldlabel,globalismandatory); show(globaleditareaspanid) ; hide(globaldtlviewspanid); getObj(globaltxtboxid).focus(); hide('crmspanid'); itsonview=true; - //if(dhtmlHistory.currentLocation!="start") - //{ - // window.historyStorage.put("start",getObj('show').innerHTML); - //} return false; } function dtlViewAjaxResponse(response) { var item = response.responseText; - alert(response.responseText) - if(item.indexOf(":#:FAILURE")>-1) + if(item.indexOf(":#:FAILURE")>-1) { alert("Error while Editing"); } @@ -114,7 +101,6 @@ var ajaxObj = new Ajax(dtlViewAjaxResponse); ajaxObj.process("index.php?",data); - //alert(getObj(popupTxt)); if(uitype == '13') { getObj(dtlView).innerHTML = "    "+tagValue+" "; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 21:47:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:47:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4613 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060329054731.81CA050D458@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:47:26 2006 New Revision: 4613 Log: alert removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Tue Mar 28 22:47:26 2006 @@ -210,12 +210,10 @@ } } if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) - { + { show("status"); - alert("in fn") var ajaxObj = new Ajax(ajaxSaveResponse); var urlstring ="module=Users&action=massdelete&return_module=PriceBooks&viewname="+viewid+"&idlist="+idstring; - alert(urlstring) ajaxObj.process("index.php?",urlstring); } else From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 21:50:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:50:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4614 - in /vtigercrm/trunk/include/Ajax: ./ CommonAjax.php Message-ID: <20060329055026.D7F9450D4BD@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:50:22 2006 New Revision: 4614 Log: new commonfile added for ajax operations Added: vtigercrm/trunk/include/Ajax/ vtigercrm/trunk/include/Ajax/CommonAjax.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 21:52:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:52:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4615 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ Emails/ Faq/ HelpDesk/ Invoice/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060329055255.8DF6550D32C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:52:31 2006 New Revision: 4615 Log: duplicate code moved to include/Ajax/CommonAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Contacts/ContactsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Leads/LeadsAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,19 +17,14 @@ $local_log =& LoggerManager::getLogger('AccountsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/Accounts/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { + { $acntObj = new Account(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; @@ -46,51 +41,10 @@ }else { echo ":#:FAILURE"; - } + } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - + require_once('include/Ajax/CommonAjax.php'); } -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } -} - ?> Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('ActivitiesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Activities/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $actObj = new Activity(); - $actObj->retrieve_entity_info($crmid,"Activities"); - $actObj->column_fields[$fieldname] = $fieldvalue; - $actObj->id = $crmid; - $actObj->mode = "edit"; - $actObj->save("Activities"); - if($actObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else + { + $actObj = new Activity(); + $actObj->retrieve_entity_info($crmid,"Activities"); + $actObj->column_fields[$fieldname] = $fieldvalue; + $actObj->id = $crmid; + $actObj->mode = "edit"; + $actObj->save("Activities"); + if($actObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else { echo ":#:FAILURE"; } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } + require_once('include/Ajax/CommonAjax.php'); } ?> Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('CampaignsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Campaigns/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Campaign(); - $modObj->retrieve_entity_info($crmid,"Campaigns"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Campaigns"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Campaign(); + $modObj->retrieve_entity_info($crmid,"Campaigns"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Campaigns"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Tue Mar 28 22:52:31 2006 @@ -18,81 +18,34 @@ $local_log =& LoggerManager::getLogger('ContactsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Contacts/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $cntObj = new Contact(); - $cntObj->retrieve_entity_info($crmid,"Contacts"); - $cntObj->column_fields[$fieldname] = $fieldvalue; - $cntObj->id = $crmid; - $cntObj->mode = "edit"; - $cntObj->save("Contacts"); - if($cntObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } + { + $cntObj = new Contact(); + $cntObj->retrieve_entity_info($crmid,"Contacts"); + $cntObj->column_fields[$fieldname] = $fieldvalue; + $cntObj->id = $crmid; + $cntObj->mode = "edit"; + $cntObj->save("Contacts"); + if($cntObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else + { + echo ":#:FAILURE"; + } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - + require_once('include/Ajax/CommonAjax.php'); } -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } -} - ?> Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('EmailsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Emails/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Email(); - $modObj->retrieve_entity_info($crmid,"Emails"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Emails"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Email(); + $modObj->retrieve_entity_info($crmid,"Emails"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Emails"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Faq/FaqAjax.php ============================================================================== --- vtigercrm/trunk/modules/Faq/FaqAjax.php (original) +++ vtigercrm/trunk/modules/Faq/FaqAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('FaqAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Faq/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Faq(); - $modObj->retrieve_entity_info($crmid,"Faq"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Faq"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Faq(); + $modObj->retrieve_entity_info($crmid,"Faq"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Faq"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,35 @@ $local_log =& LoggerManager::getLogger('HelpDeskAjax'); $ajaxaction = $_REQUEST["ajxaction"]; +if($ajaxaction == "DETAILVIEW") +{ + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/HelpDesk/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new HelpDesk(); - $modObj->retrieve_entity_info($crmid,"HelpDesk"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("HelpDesk"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new HelpDesk(); + $modObj->retrieve_entity_info($crmid,"HelpDesk"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("HelpDesk"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Invoice/InvoiceAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/InvoiceAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,35 @@ $local_log =& LoggerManager::getLogger('InvoiceAjax'); $ajaxaction = $_REQUEST["ajxaction"]; +if($ajaxaction == "DETAILVIEW") +{ + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/Invoice/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Invoice(); - $modObj->retrieve_entity_info($crmid,"Invoice"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Invoice"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Invoice(); + $modObj->retrieve_entity_info($crmid,"Invoice"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Invoice"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Tue Mar 28 22:52:31 2006 @@ -15,29 +15,22 @@ global $adb; $local_log =& LoggerManager::getLogger('LeadsAjax'); - $ajaxaction = $_REQUEST["ajxaction"]; -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Leads/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - //$columname = $_REQUEST["clmnName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $leadObj = new Lead(); - $leadObj->retrieve_entity_info($crmid,"Leads"); - $leadObj->column_fields[$fieldname] = $fieldvalue; - $leadObj->id = $crmid; - $leadObj->mode = "edit"; - $leadObj->save("Leads"); - if($leadObj->id != "") + $leadObj = new Lead(); + $leadObj->retrieve_entity_info($crmid,"Leads"); + $leadObj->column_fields[$fieldname] = $fieldvalue; + $leadObj->id = $crmid; + $leadObj->mode = "edit"; + $leadObj->save("Leads"); + if($leadObj->id != "") { echo ":#:SUCCESS"; }else @@ -46,52 +39,11 @@ } }else { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; + echo ":#:FAILURE"; } } - +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('NotesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Notes/'.$_REQUEST['file'].'.php'); -} if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $modObj = new Note(); - $modObj->retrieve_entity_info($crmid,"Notes"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Notes"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else + { + $modObj = new Note(); + $modObj->retrieve_entity_info($crmid,"Notes"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Notes"); + if($modObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else { echo ":#:FAILURE"; } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } + require_once('include/Ajax/CommonAjax.php'); } ?> Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,81 +17,34 @@ $local_log =& LoggerManager::getLogger('PotentialsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Potentials/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Potential(); - $modObj->retrieve_entity_info($crmid,"Potentials"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Potentials"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Potential(); + $modObj->retrieve_entity_info($crmid,"Potentials"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Potentials"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } - +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('PriceBooksAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/PriceBooks/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new PriceBook(); - $modObj->retrieve_entity_info($crmid,"PriceBooks"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("PriceBooks"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new PriceBook(); + $modObj->retrieve_entity_info($crmid,"PriceBooks"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("PriceBooks"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('ProductsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Products/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Product(); - $modObj->retrieve_entity_info($crmid,"Products"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Products"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Product(); + $modObj->retrieve_entity_info($crmid,"Products"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Products"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('PurchaseOrderAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/PurchaseOrder/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Order(); - $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("PurchaseOrder"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Order(); + $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("PurchaseOrder"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Quotes/QuotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/QuotesAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/QuotesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('QuotesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Quotes/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Quote(); - $modObj->retrieve_entity_info($crmid,"Quotes"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Quotes"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Quote(); + $modObj->retrieve_entity_info($crmid,"Quotes"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Quotes"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('SalesOrderAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/SalesOrder/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new SalesOrder(); - $modObj->retrieve_entity_info($crmid,"SalesOrder"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("SalesOrder"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new SalesOrder(); + $modObj->retrieve_entity_info($crmid,"SalesOrder"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("SalesOrder"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Vendors/VendorsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/VendorsAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/VendorsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('VendorsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Vendors/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Vendor(); - $modObj->retrieve_entity_info($crmid,"Vendors"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Vendors"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Vendor(); + $modObj->retrieve_entity_info($crmid,"Vendors"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Vendors"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:05:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:05:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4616 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060329070514.2AEDD50D55D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:05:09 2006 New Revision: 4616 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Wed Mar 29 00:05:09 2006 @@ -114,15 +114,6 @@ $this->log =LoggerManager::getLogger('SalesOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('SalesOrder'); - } - - -/** Function to get summary text - * This function returns name property(ie.,summary text) of the SalesOrder class. -*/ - function get_summary_text() - { - return $this->name; } /** Function to get activities associated with the id From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:08:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:08:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4617 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060329070834.C9D0650D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:08:28 2006 New Revision: 4617 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Mar 29 00:08:28 2006 @@ -257,7 +257,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE","SalesOrder"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4618 - /vtigercrm/trunk/modules/SalesOrder/Forms.php Message-ID: <20060329071000.89ED650D4A5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:09:54 2006 New Revision: 4618 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/Forms.php Modified: vtigercrm/trunk/modules/SalesOrder/Forms.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Forms.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Forms.php Wed Mar 29 00:09:54 2006 @@ -1,178 +1,2 @@ - - - -EOQ; - -return $the_script; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:11:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:11:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4619 - /vtigercrm/trunk/modules/SalesOrder/PopupSearchForm.html Message-ID: <20060329071118.D8E2550D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:11:14 2006 New Revision: 4619 Log: file has been removed Removed: vtigercrm/trunk/modules/SalesOrder/PopupSearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:13:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:13:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4620 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060329071332.8F36150D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:13:27 2006 New Revision: 4620 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Mar 29 00:13:27 2006 @@ -24,7 +24,6 @@ require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Quotes/Quote.php'); -require_once('modules/SalesOrder/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:14:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:14:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4621 - in /vtigercrm/trunk/smiletag: admin/ config/ data/ documentation/ images/ lib/ Message-ID: <20060329071423.704BF50D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:14:15 2006 New Revision: 4621 Log: Not in use Removed: vtigercrm/trunk/smiletag/admin/ vtigercrm/trunk/smiletag/config/ vtigercrm/trunk/smiletag/data/ vtigercrm/trunk/smiletag/documentation/ vtigercrm/trunk/smiletag/images/ vtigercrm/trunk/smiletag/lib/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:17:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:17:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4622 - /vtigercrm/trunk/smiletag/ Message-ID: <20060329071723.5513850D576@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:17:17 2006 New Revision: 4622 Log: not in use Removed: vtigercrm/trunk/smiletag/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:20:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:20:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4623 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060329072002.CC82650D576@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:19:52 2006 New Revision: 4623 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Mar 29 00:19:52 2006 @@ -23,7 +23,6 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); -require_once('modules/PurchaseOrder/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -161,7 +160,6 @@ if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE","PurchaseOrder"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:21:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4624 - /vtigercrm/trunk/modules/PurchaseOrder/Forms.php Message-ID: <20060329072115.E747D50D584@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:21:08 2006 New Revision: 4624 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/Forms.php Modified: vtigercrm/trunk/modules/PurchaseOrder/Forms.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Forms.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Forms.php Wed Mar 29 00:21:08 2006 @@ -1,179 +1,2 @@ - - - -EOQ; - -return $the_script; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:21:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:21:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4625 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329072125.D926A50D584@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:21:17 2006 New Revision: 4625 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:24:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:24:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4626 - /vtigercrm/trunk/modules/Potentials/updateRelations.php Message-ID: <20060329072449.51AA150D584@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:24:39 2006 New Revision: 4626 Log: junk code removal done Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:25:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:25:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4627 - /vtigercrm/trunk/modules/Potentials/SearchForm.html Message-ID: <20060329072543.D4E1A50D594@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:25:35 2006 New Revision: 4627 Log: Deleted Search Form Removed: vtigercrm/trunk/modules/Potentials/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:26:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:26:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4628 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060329072602.E36A250D594@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:25:56 2006 New Revision: 4628 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Wed Mar 29 00:25:56 2006 @@ -110,14 +110,6 @@ $this->column_fields = getColumnFields('PurchaseOrder'); } -/** Function to get summary text - * This function returns name property(ie.,summary text) of the Order class. -*/ - function get_summary_text() - { - return $this->name; - } - /** Function to get activities associated with the id * This function accepts the id as arguments and execute the MySQL query using the id * and sends the query and the id as arguments to renderRelatedActivities() method From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:37:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:37:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4629 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060329073736.E6AEB50D5A6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:37:31 2006 New Revision: 4629 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Mar 29 00:37:31 2006 @@ -23,7 +23,6 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Quotes/Quote.php'); -require_once('modules/Accounts/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -161,6 +160,13 @@ $smarty->assign("GRANDTOTAL", $InvTotal.".00"); } +else +{ + $smarty->assign("ROWCOUNT", '1'); + $smarty->assign("TAXVALUE", '0'); + $smarty->assign("ADJUSTMENTVALUE", '0'); +} + if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); else $smarty->assign("RETURN_MODULE","Quotes"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4630 - /vtigercrm/trunk/modules/Users/TabMenu.php Message-ID: <20060329073958.6D65050D530@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:39:52 2006 New Revision: 4630 Log: junk code removed Modified: vtigercrm/trunk/modules/Users/TabMenu.php Modified: vtigercrm/trunk/modules/Users/TabMenu.php ============================================================================== --- vtigercrm/trunk/modules/Users/TabMenu.php (original) +++ vtigercrm/trunk/modules/Users/TabMenu.php Wed Mar 29 00:39:52 2006 @@ -30,7 +30,6 @@ else { $sql="SELECT name from tab where tabid in (" .$permittedModuleList .") and presence = 0 order by tabsequence"; - //echo $sql; } $tabrow=$conn->query($sql); @@ -47,62 +46,5 @@ } -// TabMenu shown in the header page. -class Tab extends CRMEntity { - var $log; - var $db; - // Stored fields - var $tabid; - var $name; - var $presence; - var $tabsequence; - var $label; - var $modifiedby; - var $modifiedtime; - var $customized; - - //var $default_task_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote'); - - var $table_name = "tab"; - - var $object_name = "Tab"; - - var $column_fields = Array("tabid" - , "name" - , "presence" - , "tabsequence" - , "label" - , "modifiedby" - , "modifiedtime" - , "customized" - ); - - // This is used to retrieve related fields from form posts. - //var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contact_name', 'contact_phone', 'contact_email', 'parent_name'); - - // This is the list of fields that are in the lists. - //var $list_fields = Array('id', 'status', 'name', 'parent_type', 'parent_name', 'parent_id', 'date_due', 'contact_id', 'contact_name', 'assigned_user_name', 'assigned_user_id'); - - function Tab() { - $this->log = LoggerManager::getLogger('tab'); - $this->db = new PearDatabase(); - } - - var $new_schema = true; - - function create_tables () { - global $app_strings; - } - - function drop_tables () { - - - } - - function get_summary_text() - { - return "$this->name"; - } -} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:40:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:40:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4631 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060329074023.60D5A50D5C3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:40:16 2006 New Revision: 4631 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Wed Mar 29 00:40:16 2006 @@ -114,11 +114,6 @@ $this->column_fields = getColumnFields('Quotes'); } - function get_summary_text() - { - return $this->name; - } - function get_salesorder($id) { require_once('modules/SalesOrder/SalesOrder.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:40:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:40:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4632 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060329074024.97EC550D5B0@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:40:17 2006 New Revision: 4632 Log: Removed Junk Code Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Wed Mar 29 00:40:17 2006 @@ -194,11 +194,6 @@ } - function get_summary_text() - { - return "$this->first_name $this->last_name"; - } - /** * @return string encrypted password for storage in DB and comparison against DB password. * @param string $user_name - Must be non null and at least 2 characters @@ -375,7 +370,6 @@ $this->loadPreferencesFromDB($row['user_preferences']); - $this->fill_in_additional_detail_fields(); if ($this->status != "Inactive") $this->authenticated = true; unset($_SESSION['loginattempts']); @@ -437,29 +431,6 @@ return $this->authenticated; } - function fill_in_additional_list_fields() - { - $this->fill_in_additional_detail_fields(); - } - - function fill_in_additional_detail_fields() - { - //$query = "SELECT u1.first_name, u1.last_name from users as u1, users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0"; - $query = "SELECT u1.first_name, u1.last_name from users u1, users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0"; - $result =$this->db->query($query, true, "Error filling in additional detail fields") ; - - $row = $this->db->fetchByAssoc($result); - $this->log->debug("additional detail query results: $row"); - - if($row != null) - { - $this->reports_to_name = stripslashes($row['first_name'].' '.$row['last_name']); - } - else - { - $this->reports_to_name = ''; - } - } function retrieve_user_id($user_name) { @@ -512,15 +483,7 @@ if ($this->is_admin == 'on') $user_fields['IS_ADMIN'] = 'X'; return $user_fields; } - function list_view_parse_additional_sections(&$list_form, $xTemplateSection){ - - if($list_form->exists($xTemplateSection.".row.yahoo_id") && isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse($xTemplateSection.".row.yahoo_id"); - elseif ($list_form->exists($xTemplateSection.".row.no_yahoo_id")) - $list_form->parse($xTemplateSection.".row.no_yahoo_id"); - return $list_form; - - } + function getColumnNames_User() { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:42:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:42:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4633 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060329074221.C337050D5B0@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:42:14 2006 New Revision: 4633 Log: Junk code remvoed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Mar 29 00:42:14 2006 @@ -2091,14 +2091,5 @@ } - - - function drop_tables () { - } - - function get_summary_text() - { - return "$this->name"; - } } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:43:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:43:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4634 - /vtigercrm/trunk/modules/PriceBooks/DetailView.php Message-ID: <20060329074352.95D1550D5B4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:43:45 2006 New Revision: 4634 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Mar 29 00:43:45 2006 @@ -10,7 +10,6 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('include/utils/utils.php'); require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); @@ -28,10 +27,8 @@ $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:46:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:46:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4635 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060329074619.CBB7850D5C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:46:13 2006 New Revision: 4635 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Wed Mar 29 00:46:13 2006 @@ -64,12 +64,6 @@ $this->column_fields = getColumnFields('PriceBooks'); } - function get_summary_text() - { - return $this->name; - } - - function get_pricebook_products($id) { global $app_strings; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:50:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:50:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4636 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060329075005.D976150D5C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:49:57 2006 New Revision: 4636 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Mar 29 00:49:57 2006 @@ -160,7 +160,6 @@ $listview_entries = getListViewEntries($focus,"Vendors",$list_result,$navigation_array,'','&return_module=Vendors&return_action=index','EditView','Delete',$oCustomView); $smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("SELECT_SCRIPT", $view_script); $smarty->assign("CUSTOMVIEW",$customviewstrings); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Vendors","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','vendorname','true','basic',"","","","",$viewid); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:54:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:54:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4637 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060329075423.121D6188ACF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:54:17 2006 New Revision: 4637 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Wed Mar 29 00:54:17 2006 @@ -70,10 +70,6 @@ $this->column_fields = getColumnFields('Vendors'); } - function get_summary_text() - { - return $this->name; - } function get_products($id) { global $app_strings; @@ -113,31 +109,4 @@ return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } - function get_related_contacts($id) - { - $query = 'SELECT vendorcontactrel.*, crmentity.crmid from vendorcontactrel inner join crmentity on crmentity.crmid = vendorcontactrel.contactid where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; - $result = $this->db->query($query); - $cnt_id = array(); - $cnt_list = ''; - if($this->db->num_rows($result)!=0) - { - while($row = $this->db->fetch_array($result)) - { - $cnt_id[] = $row['contactid']; - } - for ($i = 0; $i < count($cnt_id); $i++) - { - $cnt_list .= $cnt_id[$i] . ','; - } - - if ($cnt_list) - { - $cnt_list = substr($cnt_list, 0, strlen($cnt_list) -1); - } - - } - return $cnt_list; - } - -} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:56:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:56:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4638 - /vtigercrm/trunk/modules/Users/LoginHistory.php Message-ID: <20060329075621.E2E242B7B51@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:56:14 2006 New Revision: 4638 Log: junk code removed Modified: vtigercrm/trunk/modules/Users/LoginHistory.php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/LoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/LoginHistory.php Wed Mar 29 00:56:14 2006 @@ -13,8 +13,6 @@ include_once('config.php'); require_once('include/logging.php'); require_once('data/SugarBean.php'); -#require_once('data/CRMEntity.php'); -#require_once('include/utils/utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -58,46 +56,10 @@ var $default_order_by = "login_id"; - function create_tables () { - /*$query = 'CREATE TABLE '.$this->table_name.' ( '; - $query .='login_id int(11) NOT NULL auto_increment'; - $query .=', user_name varchar(25) NOT NULL'; - $query .=', user_ip varchar(25) NOT NULL'; - $query .=', login_time datetime NOT NULL default 0'; - $query .=', logout_time datetime NOT NULL default 0'; - $query .=', status enum(\'Signedin\',\'Signedoff\') default \'Signedin\''; - $query .=', PRIMARY KEY ( login_id ) )'; - - $this->log->info($query); - - mysql_query($query) or die("Error creating table: ".mysql_error());*/ - - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - } - - function drop_tables () { - /* - $query = 'DROP TABLE IF EXISTS '.$this->table_name; - - $this->log->info($query); - - mysql_query($query); - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - - } - - function get_summary_text() - { - return "$this->first_name $this->last_name"; - } /** Records the Login info */ function user_login(&$usname,&$usip,&$intime) { - //print("GS --> intime=".$intime); $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); @@ -109,7 +71,6 @@ { $logid_qry = "SELECT max(login_id) login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; $result = $this->db->query($logid_qry); - //if($this->db->num_rows($result) !=1 ) return; $loginid = $this->db->query_result($result,0,"login_id"); if ($loginid == '') { @@ -124,7 +85,6 @@ function create_list_query(&$order_by, &$where) { // Determine if the account name is present in the where clause. - // $query = "SELECT * from loginhistory order by login_time"; global $current_user; $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; if($where != "") @@ -145,17 +105,6 @@ return $query; } - - - function list_view_pare_additional_sections(&$list_form){ - if(isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse("main.row.yahoo_id"); - else - $list_form->parse("main.row.no_yahoo_id"); - return $list_form; - - } - } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:58:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:58:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4639 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329075851.F1E712B7B52@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:58:44 2006 New Revision: 4639 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 00:58:44 2006 @@ -93,12 +93,6 @@ $this->column_fields = getColumnFields('Products'); } - function get_summary_text() - { - return $this->name; - } - - function get_attachments($id) { // Armando L?scher 18.10.2005 -> ?visibleDescription From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:04:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:04:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4640 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060329080450.8966A2B7B62@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:04:44 2006 New Revision: 4640 Log: junk code removed Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Wed Mar 29 01:04:44 2006 @@ -16,67 +16,36 @@ class PopulateComboValues { - - //var $table_name="lead_source"; var $app_list_strings; - function insertComboValues($values, $tableName) + function insertComboValues($values, $tableName) { - global $adb; -// global $log; -// $log->info("in insertComboValues ".$tableName); - $i=0; - foreach ($values as $val => $cal) - { - if($val != '') - { - $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); - } - else - { - $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); - } - $i++; - } + global $adb; + $i=0; + foreach ($values as $val => $cal) + { + if($val != '') + { + $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); + } + else + { + $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); + } + $i++; + } } - function create_tables () { + function create_tables () + { global $app_list_strings,$adb; - global $combo_strings; + global $combo_strings; $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); foreach ($comboTables as $comTab) { - /*$result = mysql_query("show tables like '%".$comTab."%'"); - if(mysql_num_rows($result) == 0) - { - $query = 'CREATE TABLE '.$comTab.' ('; - $query .=$comTab.' varchar(200) NOT NULL'; - $query .=', PRIMARY KEY ('.$comTab.'))'; - - mysql_query($query) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - echo("Created table ".$comTab); - echo("
    "); - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); - } - else - { - echo("Table ".$comTab." already exists"); - echo("
    "); - $tableRows = mysql_query("select * from ".$comTab); - if(mysql_num_rows($tableRows) == 0) - { - - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); - } - }*/ - - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); + $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } - } - - - } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:08:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:08:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4641 - /vtigercrm/trunk/modules/Products/ProductDetailView.html Message-ID: <20060329080806.65CBF2B7BA3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:08:01 2006 New Revision: 4641 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductDetailView.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:10:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:10:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4642 - /vtigercrm/trunk/modules/Products/ProductsPopupList.html Message-ID: <20060329081018.F27332B7BB3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:10:12 2006 New Revision: 4642 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductsPopupList.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4643 - /vtigercrm/trunk/modules/Products/binaryfilelist.php Message-ID: <20060329081950.967862B7C6B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:19:44 2006 New Revision: 4643 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/binaryfilelist.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:24:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:24:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4644 - /vtigercrm/trunk/modules/Products/ProductsList.html Message-ID: <20060329082441.6B5032B7C82@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:24:34 2006 New Revision: 4644 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductsList.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:28:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:28:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4645 - /vtigercrm/trunk/modules/Products/downloadfile.php Message-ID: <20060329082813.830792B7C87@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:28:05 2006 New Revision: 4645 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/downloadfile.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:09:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:09:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4646 - /vtigercrm/trunk/include/RelatedTicketListUtil.php Message-ID: <20060329090911.C517E2B7BA3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:09:02 2006 New Revision: 4646 Log: file has been removed Removed: vtigercrm/trunk/include/RelatedTicketListUtil.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:12:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:12:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4647 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060329091248.A51C92B7D11@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:12:39 2006 New Revision: 4647 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Wed Mar 29 02:12:39 2006 @@ -64,10 +64,6 @@ $focus = new Contact(); $button = ''; - if(isPermitted("Contacts",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted=0 and contactdetails.campaignid = '.$id; @@ -81,10 +77,6 @@ $focus = new Lead(); $button = ''; - if(isPermitted("Leads",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT leaddetails.*, crmentity.crmid, crmentity.smownerid from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted=0 and leaddetails.campaignid = '.$id; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:16:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:16:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4648 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060329091628.D0DBB2B7D35@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:16:24 2006 New Revision: 4648 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Mar 29 02:16:24 2006 @@ -11,7 +11,6 @@ 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('include/utils/utils.php'); @@ -27,10 +26,8 @@ { $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme,$profile_id;; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -62,7 +59,6 @@ $smarty->assign("MODULE","Campaigns"); $smarty->display("DetailView.tpl"); //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:20:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:20:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4649 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060329092030.8ECB951048B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:20:23 2006 New Revision: 4649 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Mar 29 02:20:23 2006 @@ -14,11 +14,7 @@ require_once('modules/Campaigns/Campaign.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; -global $currentModule; +global $app_strings,$mod_strings,$currentModule,$theme; $focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); @@ -36,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:36:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:36:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4650 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060329093623.9F0EB5158F6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:35:54 2006 New Revision: 4650 Log: function getParentId removed Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Mar 29 02:35:54 2006 @@ -1204,16 +1204,5 @@ return $calist; } - function getParentId($fields,$values) - { - global $adb; - - if($fields = 'crmentity.smownerid') - { - $sSQL = " left join users on users".$value; - $result = $adb->query($sSQL); - } - } - } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 01:41:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:41:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4651 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060329094105.06C852B7D4D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:40:51 2006 New Revision: 4651 Log: action has been changed for custom field mapping Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Wed Mar 29 02:40:51 2006 @@ -28,7 +28,7 @@ if($_REQUEST['fld_module']=="Leads") { - echo ''; //button for custom field mapping + echo ''; //button for custom field mapping } echo ''; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:41:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:41:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4652 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329104152.2CBA22BF2CC@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:41:46 2006 New Revision: 4652 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 03:41:46 2006 @@ -255,28 +255,6 @@ return $response; } - - -function save_relationship_changes($is_update) - { - - $query = "UPDATE tasks set contact_id=null where id='". $this->id ."' and deleted=0"; - $this->db->query($query,true,"Error clearing contact to task relationship: "); - - // echo "\n Quwry is " .$query; - // echo "\ncontact_id is " .$this->contact_id; - - - if($this->contact_id != "") - { - $query = "UPDATE tasks set contact_id='" .$this->contact_id ."' where id='" .$this->id ."' and deleted=0"; - //echo $query; - $this->db->query($query,true,"Error setting contact to task relationship: "."
    $query"); - } - - } - - function get_list_view_data(){ global $action, $currentModule, $focus, $app_list_strings; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:45:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:45:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4653 - /vtigercrm/trunk/modules/Activities/SendReminder.php Message-ID: <20060329104557.1B1B553C4FC@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:45:53 2006 New Revision: 4653 Log: file has been removed Removed: vtigercrm/trunk/modules/Activities/SendReminder.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:48:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:48:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4654 - /vtigercrm/trunk/SendReminder.php Message-ID: <20060329104815.538E653CBEA@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:48:08 2006 New Revision: 4654 Log: junk code has been removed Modified: vtigercrm/trunk/SendReminder.php Modified: vtigercrm/trunk/SendReminder.php ============================================================================== --- vtigercrm/trunk/SendReminder.php (original) +++ vtigercrm/trunk/SendReminder.php Wed Mar 29 03:48:08 2006 @@ -87,22 +87,7 @@ } } - // Selecting contacts to send reminder /*commented as the customer need not receive the mail - /* - $query_cnt="SELECT contactdetails.email,cntactivityrel.contactid,crmentity.crmid FROM cntactivityrel inner join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=cntactivityrel.contactid where cntactivityrel.activityid =".$activity_id." and crmentity.deleted=0"; - $cnt_result = $adb->query($query_cnt); - if($adb->num_rows($cnt_result)>=1) - { - while($cnt_result_row = $adb->fetch_array($cnt_result)) - { - if($cnt_result_row['email']!='' || $cnt_result_row['email'] !=NULL) - { - $to_addr[] = $cnt_result_row['email']; - } - } - } - */ //Comments ends - // Set the preferred email id + // Set the preferred email id $from ="reminders at localserver.com"; // Retriving the Subject and message from reminder table @@ -160,7 +145,6 @@ $mail->IsSMTP(); // set mailer to use SMTP - //$mail->Host = "smtp1.example.com;smtp2.example.com"; // specify main and backup server if($mail_server=='') { @@ -188,7 +172,6 @@ $log->info("Mail sending process : To Email id = '".$addr."' (set in the mail object)"); } - //$mail->AddReplyTo($from); $mail->WordWrap = 50; // set word wrap to 50 characters $mail->IsHTML(true); // set email format to HTML From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:51:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:51:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4655 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060329105112.C3347544AA5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:50:47 2006 New Revision: 4655 Log: Unwanted functions removed Modified: vtigercrm/trunk/data/SugarBean.php Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:58:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:58:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4656 - /vtigercrm/trunk/modules/Contacts/Forms.php Message-ID: <20060329105842.BE75154C7E1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:58:37 2006 New Revision: 4656 Log: Removed function trim() from Forms.php Ahmed Modified: vtigercrm/trunk/modules/Contacts/Forms.php Modified: vtigercrm/trunk/modules/Contacts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:01:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:01:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4657 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060329110126.7781B54C7ED@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:01:22 2006 New Revision: 4657 Log: Removed function trim() from Forms.php Ahmed Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Wed Mar 29 04:01:22 2006 @@ -44,17 +44,6 @@ - - {$JAVASCRIPT} {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:33:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:33:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4671 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060329113325.7243F55B40F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:33:17 2006 New Revision: 4671 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Mar 29 04:33:17 2006 @@ -131,7 +131,7 @@ } $customviewstrings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:39:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:39:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4672 - /vtigercrm/trunk/modules/Settings/CurrencyInfo.php Message-ID: <20060329113948.985A52CA1A1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:39:40 2006 New Revision: 4672 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/CurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyInfo.php Wed Mar 29 04:39:40 2006 @@ -10,15 +10,11 @@ ********************************************************************************/ require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; +global $mod_strings,$app_strings,$adb,$theme; echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_CURRENCY_CONFIG'], true); echo '

    '; -global $adb; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:40:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:40:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4673 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060329114005.939702CA1A8@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:40:00 2006 New Revision: 4673 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Mar 29 04:40:00 2006 @@ -131,7 +131,7 @@ } $customviewstrings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:41:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4674 - /vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Message-ID: <20060329114126.65B6C2CA1B4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:41:16 2006 New Revision: 4674 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Wed Mar 29 04:41:16 2006 @@ -10,15 +10,11 @@ ********************************************************************************/ require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; +global $mod_strings,$app_strings,$adb,$theme; echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_CURRENCY_CONFIG'], true); echo '

    '; -global $adb; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:45:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:45:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4675 - /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Message-ID: <20060329114525.578F454E499@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:45:15 2006 New Revision: 4675 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Wed Mar 29 04:45:15 2006 @@ -18,12 +18,6 @@ $conversion_rate= $_REQUEST['conversion_rate']; $currency_status= $_REQUEST['currency_status']; - -//$sql1 = "delete from currency_info"; -//$adb->query($sql1); - -//$sql2 = "insert into currency_info values('".$currency_name."','".$currency_code."','".$currency_symbol."')"; -//$adb->query($sql2); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $sql = "update currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record']; @@ -32,7 +26,6 @@ { $sql = "insert into currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')"; } -//echo $sql; $adb->query($sql); $loc = "Location: index.php?module=Settings&action=CurrencyListView"; header($loc); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:46:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:46:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4676 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060329114623.C87E851F228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:46:14 2006 New Revision: 4676 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Mar 29 04:46:14 2006 @@ -112,7 +112,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:46:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:46:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4677 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329114634.8707B54E8EB@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:46:28 2006 New Revision: 4677 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:52:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:52:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4678 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060329115254.BB1BD560BEF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:52:45 2006 New Revision: 4678 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Mar 29 04:52:45 2006 @@ -137,7 +137,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:54:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:54:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4679 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060329115433.9AAC3560BEF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:54:28 2006 New Revision: 4679 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Wed Mar 29 04:54:28 2006 @@ -158,7 +158,7 @@ $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:57:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:57:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4680 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060329115723.F23472CA1D1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:57:16 2006 New Revision: 4680 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Mar 29 04:57:16 2006 @@ -110,7 +110,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:59:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:59:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4681 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060329115921.41BFD2CA1D2@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:59:14 2006 New Revision: 4681 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Mar 29 04:59:14 2006 @@ -94,7 +94,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:00:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:00:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4682 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060329120035.84D9156140B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:00:21 2006 New Revision: 4682 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Mar 29 05:00:21 2006 @@ -168,7 +168,7 @@ } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:01:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:01:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4683 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060329120153.97395563A36@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:01:29 2006 New Revision: 4683 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Wed Mar 29 05:01:29 2006 @@ -109,7 +109,7 @@ $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:03:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4684 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060329120330.1950D567466@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:03:23 2006 New Revision: 4684 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Mar 29 05:03:23 2006 @@ -130,7 +130,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:04:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:04:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4685 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060329120440.CC97655B40F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:04:35 2006 New Revision: 4685 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Wed Mar 29 05:04:35 2006 @@ -88,7 +88,7 @@ $customviewstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:05:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:05:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4686 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060329120538.6844056746E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:05:33 2006 New Revision: 4686 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Mar 29 05:05:33 2006 @@ -108,7 +108,7 @@ $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:06:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:06:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4687 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060329120642.8894356746E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:06:37 2006 New Revision: 4687 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Mar 29 05:06:37 2006 @@ -98,7 +98,7 @@ } $custom_view_strings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:08:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:08:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4688 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060329120807.F3087567918@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:07:50 2006 New Revision: 4688 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Mar 29 05:07:50 2006 @@ -101,7 +101,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4689 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060329121019.CC76A56886B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:10:00 2006 New Revision: 4689 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Wed Mar 29 05:10:00 2006 @@ -125,7 +125,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:11:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:11:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4690 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329121132.38EC356B7BB@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:11:15 2006 New Revision: 4690 Log: unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 05:11:15 2006 @@ -96,99 +96,6 @@ } - function fill_in_additional_list_fields() - { - $this->fill_in_additional_detail_fields(); - } - - function fill_in_additional_detail_fields() - { - // Fill in the assigned_user_name - $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id); - - global $app_strings; - - if (isset($this->contact_id)) { - require_once("modules/Contacts/Contact.php"); - $contact = new Contact(); - $query = "SELECT firstname, lastname, phone, email from $contact->table_name where contactid = '$this->contact_id'"; - - $result =$this->db->query($query,true,$app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - $this->contact_name = return_name($row, 'first_name', 'last_name'); - if ($row['phone_work'] != '') $this->contact_phone = $row['phone_work']; - if ($row['email1'] != '') $this->contact_email = $row['email1']; - } - } - if ($this->parent_type == "Potentials") { - require_once("modules/Potentials/Opportunity.php"); - $parent = new Potential(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true, $app_strings['ERR_CREATING_FIELDS']); - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - if ($this->parent_type == "Cases") { - require_once("modules/Cases/Case.php"); - $parent = new aCase(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true,$app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - if ($this->parent_type == "Accounts") { - require_once("modules/Accounts/Account.php"); - $parent = new Account(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true, $app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - } - - function delete($id) - { - - $this->db->query("update tasks set deleted=1 where id = '" . $id . "'"); - } - function getCount($user_name) { $query = "select count(*) from tasks inner join users on users.id=tasks.assigned_user_id where user_name='" .$user_name ."' and tasks.deleted=0"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:13:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:13:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4691 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060329121316.36C4456B7E0@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:13:08 2006 New Revision: 4691 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Mar 29 05:13:08 2006 @@ -93,7 +93,7 @@ } $customviewstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4692 - in /vtigercrm/trunk/modules/Import: ImportMap.php UsersLastImport.php Message-ID: <20060329122007.70D3C2CA1ED@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:19:52 2006 New Revision: 4692 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/UsersLastImport.php Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Wed Mar 29 05:19:52 2006 @@ -148,7 +148,6 @@ $focus->$field = $row[$field]; } } - $focus->fill_in_additional_detail_fields(); array_push($obj_arr,$focus); } return $obj_arr; Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/trunk/modules/Import/UsersLastImport.php (original) +++ vtigercrm/trunk/modules/Import/UsersLastImport.php Wed Mar 29 05:19:52 2006 @@ -61,11 +61,6 @@ $this->db = new PearDatabase(); } - function fill_in_additional_detail_fields() - { - - } - function mark_deleted_by_user_id($user_id) { $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:24:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:24:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4693 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329122455.372C751F216@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:24:48 2006 New Revision: 4693 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 05:24:48 2006 @@ -373,27 +373,6 @@ return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); } - - - - // This method is used to provide backward compatibility with old data that was prefixed with http:// - // We now automatically prefix http:// - function remove_redundant_http() - { - if(eregi("http://", $this->website)) - { - $this->website = substr($this->website, 7); - } - } - - function fill_in_additional_list_fields() - { - // Fill in the assigned_user_name - $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id); - - $this->remove_redundant_http(); - } - function get_lead_field_options($list_option) { $comboFieldArray = getComboArray($this->combofieldNames); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:42:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:42:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4694 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060329124229.1D62A5850DF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:42:14 2006 New Revision: 4694 Log: Removed Unused functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:48:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:48:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4695 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060329124822.600102CA228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:48:16 2006 New Revision: 4695 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Mar 29 05:48:16 2006 @@ -236,26 +236,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= '
     '; - $output .= ''; - $output .= ''; - $output .=''; - $output .= '
     '; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= '
    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } if(isset($cust_fld)) @@ -271,7 +251,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:49:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:49:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4696 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329124904.251462CA229@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:48:58 2006 New Revision: 4696 Log: unwanted functions removed Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4697 - /vtigercrm/trunk/modules/Invoice/Forms.php Message-ID: <20060329125105.574F52CA29B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:51:00 2006 New Revision: 4697 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Forms.php Modified: vtigercrm/trunk/modules/Invoice/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Forms.php (original) +++ vtigercrm/trunk/modules/Invoice/Forms.php Wed Mar 29 05:51:00 2006 @@ -1,163 +1,2 @@ - - - -EOQ; - -return $the_script; -} - ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:55:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:55:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4698 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060329125507.47D5750DC96@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:54:57 2006 New Revision: 4698 Log: Removed Unused functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:57:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4699 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329125737.02FA350DCA4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:57:29 2006 New Revision: 4699 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 05:57:29 2006 @@ -109,60 +109,6 @@ return $row["count(*)"]; } - function get_tasks($user_name,$from_index,$offset) - { - $query = "select tasks.*, contacts.first_name cfn, contacts.last_name cln from tasks inner join users on users.id=tasks.assigned_user_id left join contacts on contacts.id=tasks.contact_id where user_name='" .$user_name ."' and tasks.deleted=0 limit " .$from_index ."," .$offset; - - return $this->process_list_query1($query); - - } - - - function process_list_query1($query) - { - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - - { - foreach($this->list_fields as $field) - { - if (isset($row[$field])) { - $this->$field = $row[$field]; - } - else - { - $this->$field = ""; - } - } - - // TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every contacts and hence - // account query goes for ecery single account row - - // $this->fill_in_additional_list_fields(); - //$this->account_name = $row['accountname']; - //$this->account_id = $row['accountid']; - $this->contact_name = return_name($row, 'cfn', 'cln'); - - - $list[] = $this; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - - - - return $response; - } - function get_list_view_data(){ global $action, $currentModule, $focus, $app_list_strings; $today = date("Y-m-d", time()); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:21:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 13:21:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4700 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060329132158.14A5C50D31C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 06:21:48 2006 New Revision: 4700 Log: changes made for multiselectcombo box Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Wed Mar 29 06:21:48 2006 @@ -74,10 +74,11 @@ 'Email'=>'5', 'Phone'=>'6', 'Picklist'=>'7', - 'URL'=>'8'); + 'URL'=>'8', + 'MultiSelectCombo'=>'11'); $xtpl->assign("FLDTYPEVALUE", $typeVal[$_REQUEST["fldType"]]); } -else +elseif($fieldid == '') { $xtpl->assign("FLDTYPEVALUE", "0"); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:04:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:04:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4701 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329140455.678B958BB1D@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:04:47 2006 New Revision: 4701 Log: Added function checkIfCustomTableExists() Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:07:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:07:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4702 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329140750.44D4A58BB2D@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:07:44 2006 New Revision: 4702 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:09:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:09:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4703 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060329140920.C65A62B7B60@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:09:16 2006 New Revision: 4703 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Mar 29 07:09:16 2006 @@ -454,26 +454,12 @@ return $sql3; } -//check if the custom table exists or not in the first place -function checkIfCustomTableExists() -{ - $result = $this->db->query("select * from contactscf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } -return $exists; -} + function create_export_query(&$order_by, &$where) { global $log; - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('contactscf')) { $query = $this->constructCustomQueryAddendum() .", contactdetails.*, contactaddress.*, From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:10:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:10:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4704 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329141032.AEF242CA229@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:10:28 2006 New Revision: 4704 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 07:10:28 2006 @@ -265,28 +265,10 @@ } - - //check if the custom table exists or not in the first place - function checkIfCustomTableExists() - { - $result = $this->db->query("select * from productcf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } - return $exists; - } - - function create_export_query(&$order_by, &$where) { - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('productcf')) { $query = $this->constructCustomQueryAddendum() . From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:12:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:12:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4705 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329141210.40E3150D20F@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:12:05 2006 New Revision: 4705 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 07:12:05 2006 @@ -183,26 +183,12 @@ } -//check if the custom table exists or not in the first place -function checkIfCustomTableExists() -{ - $result = $this->db->query("select * from leadscf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } -return $exists; -} + function create_export_query(&$order_by, &$where) { - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('leadscf')) { $query = $this->constructCustomQueryAddendum() . " From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:15:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:15:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4706 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329141548.D47D95858F8@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:15:35 2006 New Revision: 4706 Log: code clean up in security module Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:16:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:16:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4707 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329151604.6A2AC50D328@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 08:16:00 2006 New Revision: 4707 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 08:16:00 2006 @@ -83,18 +83,6 @@ var $new_schema = true; - function create_tables () { - global $app_strings; - } - - function drop_tables () { - } - - function get_summary_text() - { - return "$this->name"; - } - function getCount($user_name) { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:26:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:26:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4708 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329152630.0DD5250D3AC@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:26:26 2006 New Revision: 4708 Log: added module constructCustomQueryAddendum Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:30:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:30:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4709 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329153042.0C70F50D3FA@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:30:38 2006 New Revision: 4709 Log: code duplication removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:33:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:33:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4710 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060329153320.78B1550D421@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:33:16 2006 New Revision: 4710 Log: code duplication removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Mar 29 08:33:16 2006 @@ -424,44 +424,13 @@ -//method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - - global $log; - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=4"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "contactscf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", contactscf.".$columnName. " '" .$fieldlable."'"; - } - - } - $log->info("Custom Query successfully Constructed in constructCustomQueryAddendum()"); - return $sql3; - } - - function create_export_query(&$order_by, &$where) { global $log; if($this->checkIfCustomTableExists('contactscf')) { - $query = $this->constructCustomQueryAddendum() .", + $query = $this->constructCustomQueryAddendum('contactscf','Contacts') .", contactdetails.*, contactaddress.*, account.accountname account_name, users.user_name assigned_user_name From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:33:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:33:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4711 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329153358.63DFD50D474@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:33:54 2006 New Revision: 4711 Log: code duplication removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 08:33:54 2006 @@ -229,6 +229,7 @@ $query = 'select crmentity.crmid, pricebook.*,pricebookproductrel.productid as prodid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id; return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); } + function product_novendor() { $query = "SELECT products.productname,crmentity.deleted from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and products.vendor_id=''"; @@ -236,42 +237,13 @@ return $this->db->num_rows($result); } - //method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=14"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "productcf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", productcf.".$columnName. " '" .$fieldlable."'"; - } - - } - return $sql3; - - } - function create_export_query(&$order_by, &$where) { if($this->checkIfCustomTableExists('productcf')) { - $query = $this->constructCustomQueryAddendum() . + $query = $this->constructCustomQueryAddendum('productcf','Products') . ", products.productid productid, products.productname productname, From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:34:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:34:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4712 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329153450.A17E050D483@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:34:46 2006 New Revision: 4712 Log: code duplication removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 08:34:46 2006 @@ -150,89 +150,56 @@ $this->column_fields = getColumnFields('Leads'); } - //method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=7"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "leadscf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", leadscf.".$columnName. " '" .$fieldlable."'"; - } - - } - if ($numRows > 0) - { - $sql3=$sql3.','; - } - return $sql3; - - } - - + function create_export_query(&$order_by, &$where) - { + { if($this->checkIfCustomTableExists('leadscf')) { - - $query = $this->constructCustomQueryAddendum() . " - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status - FROM ".$this->entity_table." - INNER JOIN leaddetails - ON crmentity.crmid=leaddetails.leadid - LEFT JOIN leadaddress - ON leaddetails.leadid=leadaddress.leadaddressid - LEFT JOIN leadsubdetails - ON leaddetails.leadid=leadsubdetails.leadsubscriptionid - LEFT JOIN leadscf - ON leadscf.leadid=leaddetails.leadid - LEFT JOIN users - ON crmentity.smownerid = users.id "; + + $query = $this->constructCustomQueryAddendum('leadscf','Leads') . " + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status + FROM ".$this->entity_table." + INNER JOIN leaddetails + ON crmentity.crmid=leaddetails.leadid + LEFT JOIN leadaddress + ON leaddetails.leadid=leadaddress.leadaddressid + LEFT JOIN leadsubdetails + ON leaddetails.leadid=leadsubdetails.leadsubscriptionid + LEFT JOIN leadscf + ON leadscf.leadid=leaddetails.leadid + LEFT JOIN users + ON crmentity.smownerid = users.id "; } else { - $query = "SELECT - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." - INNER JOIN leaddetails - ON crmentity.crmid=leaddetails.leadid - LEFT JOIN leadsubdetails - ON leaddetails.leadid = leadsubdetails.leadsubscriptionid - LEFT JOIN leadaddress - ON leaddetails.leadid=leadaddress.leadaddressid - LEFT JOIN users - ON crmentity.smownerid = users.id "; + $query = "SELECT + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." + INNER JOIN leaddetails + ON crmentity.crmid=leaddetails.leadid + LEFT JOIN leadsubdetails + ON leaddetails.leadid = leadsubdetails.leadsubscriptionid + LEFT JOIN leadaddress + ON leaddetails.leadid=leadaddress.leadaddressid + LEFT JOIN users + ON crmentity.smownerid = users.id "; } - $where_auto = " users.status='Active' - AND crmentity.deleted=0 AND leaddetails.converted =0"; - - if($where != "") - $query .= "where ($where) AND ".$where_auto; - else - $query .= "where ".$where_auto; - - if(!empty($order_by)) - $query .= " ORDER BY $order_by"; - - return $query; - } + $where_auto = " users.status='Active' + AND crmentity.deleted=0 AND leaddetails.converted =0"; + + if($where != "") + $query .= "where ($where) AND ".$where_auto; + else + $query .= "where ".$where_auto; + + if(!empty($order_by)) + $query .= " ORDER BY $order_by"; + + return $query; + } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:36:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:36:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4713 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329153600.286C150D3FA@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:35:55 2006 New Revision: 4713 Log: code duplication removed Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:36:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:36:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4714 - in /vtigercrm/trunk/modules: Accounts/Account.js Contacts/Contact.js HelpDesk/HelpDesk.js Leads/Lead.js SalesOrder/SalesOrder.js Message-ID: <20060329153646.A772950D43E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 08:36:37 2006 New Revision: 4714 Log: mass mail fns moved to Mail.js and massmerge fns moved to Merge.js Modified: vtigercrm/trunk/modules/Accounts/Account.js vtigercrm/trunk/modules/Contacts/Contact.js vtigercrm/trunk/modules/HelpDesk/HelpDesk.js vtigercrm/trunk/modules/Leads/Lead.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/Accounts/Account.js ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.js (original) +++ vtigercrm/trunk/modules/Accounts/Account.js Wed Mar 29 08:36:37 2006 @@ -10,163 +10,9 @@ document.write(" + {if $MODULE eq 'Contacts'}
    @@ -272,11 +273,11 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} - + {elseif $button_check eq 's_cmail'} - + {elseif $button_check eq 'c_owner'} {elseif $button_check eq 'c_status'} @@ -321,11 +322,11 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} - + {elseif $button_check eq 's_cmail'} - + {elseif $button_check eq 'c_owner'} {elseif $button_check eq 'c_status'} From vtiger-tickets at vtiger.fosslabs.com Wed Mar 29 12:27:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 29 Mar 2006 20:27:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2373=3A_D?= =?utf-8?q?isplay_a_blank_date_custom_field=2E?= Message-ID: <076.2b2db2198c1a9f6e4698fd7863871479@vtiger.fosslabs.com> #73: Display a blank date custom field. --------------------------+------------------------------------------------- Reporter: bluebird972 | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: custom field | --------------------------+------------------------------------------------- It's look like not possible to display a blank date custom field. How i can do? Cause some of my custom Date field not need to be set in the same time or day (ex : if i want to set a return's date for a product. Thanks a lot!! Regards -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 19:38:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 03:38:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4720 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060330033805.D7BF450D5A5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 20:38:01 2006 New Revision: 4720 Log: missed } has been included Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Wed Mar 29 20:38:01 2006 @@ -109,4 +109,5 @@ return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 21:26:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:26:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4721 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060330052633.C765557A3FD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:26:27 2006 New Revision: 4721 Log: function split_validationdataArray() has been defined Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Mar 29 22:26:27 2006 @@ -737,7 +737,6 @@ { $mycrmid=$adb->query_result($myresult,$i,'crmid'); $parent_module = getSalesEntityType($mycrmid); - //echo $mycrmid.'id
    '.$parent_module; if($parent_module == "Leads") { $sql = "select firstname,lastname,email from leaddetails where leadid=".$mycrmid; @@ -1184,12 +1183,7 @@ function getBlockInformation($module, $block, $mode, $col_fields,$tabid,$info_type='') { - //echo '*******************************
    '; - //echo '
    ';print_r($col_fields);echo '
    '; - //echo '*******************************
    '; - //retreive the tabid global $adb; - //$tabid = getTabid($module); $editview_arr = Array(); global $current_user; @@ -1226,7 +1220,6 @@ $result = $adb->query($sql); $noofrows = $adb->num_rows($result); - //$output=''; if (($module == 'Accounts' || $module == 'Contacts' || $module == 'Quotes' || $module == 'PurchaseOrder' || $module == 'SalesOrder'|| $module == 'Invoice') && $block == 2) { global $log; @@ -1248,12 +1241,9 @@ $maxlength = $adb->query_result($result,$i,"maximumlength"); $generatedtype = $adb->query_result($result,$i,"generatedtype"); - //$output .= ''; $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); - //$output .= $custfld; $editview_arr[]=$custfld; if ($mvAdd_flag == true) - //$output .= $moveAddress; $mvAdd_flag = false; $i++; if($i<$noofrows) @@ -1265,18 +1255,10 @@ $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); $maxlength = $adb->query_result($result,$i,"maximumlength"); $generatedtype = $adb->query_result($result,$i,"generatedtype"); - //$output .= ''; $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); - //$output .= $custfld; - //echo '
    ';print_r($custfld);echo '
    '; - //die; $editview_arr[]=$custfld; } - //$output .= ''; - //echo '
    ';print_r($editview_arr);echo '
    '; - - } - //return $output; + } for ($i=0,$j=0;$i $key1,1 => $key2); } return $return_data; - //return $editview_arr; - } +function split_validationdataArray($validationData) +{ + $fieldName = ''; + $fieldLabel = ''; + $fldDataType = ''; + $rows = count($validationData); + foreach($validationData as $fldName => $fldLabel_array) + { + if($fieldName == '') + { + $fieldName="'".$fldName."'"; + } + else + { + $fieldName .= ",'".$fldName ."'"; + } + foreach($fldLabel_array as $fldLabel => $datatype) + { + if($fieldLabel == '') + { + $fieldLabel = "'".$fldLabel ."'"; + } + else + { + $fieldLabel .= ",'".$fldLabel ."'"; + } + if($fldDataType == '') + { + $fldDataType = "'".$datatype ."'"; + } + else + { + $fldDataType .= ",'".$datatype ."'"; + } + } + } + $data['fieldname'] = $fieldName; + $data['fieldlabel'] = $fieldLabel; + $data['datatype'] = $fldDataType; + return $data; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 21:32:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:32:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4722 - in /vtigercrm/trunk/modules: Campaigns/Save.php Faq/Save.php HelpDesk/Save.php Invoice/Save.php Potentials/Save.php PriceBooks/Save.php PurchaseOrder/Save.php SalesOrder/Save.php Vendors/Save.php Message-ID: <20060330053221.8574758C8B6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:31:55 2006 New Revision: 4722 Log: * Removed the lines which are used to assign the REQUEST values to focus->column_fileds and make it as a common function call Modified: vtigercrm/trunk/modules/Campaigns/Save.php vtigercrm/trunk/modules/Faq/Save.php vtigercrm/trunk/modules/HelpDesk/Save.php vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Potentials/Save.php vtigercrm/trunk/modules/PriceBooks/Save.php vtigercrm/trunk/modules/PurchaseOrder/Save.php vtigercrm/trunk/modules/SalesOrder/Save.php vtigercrm/trunk/modules/Vendors/Save.php Modified: vtigercrm/trunk/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Save.php (original) +++ vtigercrm/trunk/modules/Campaigns/Save.php Wed Mar 29 22:31:55 2006 @@ -26,24 +26,8 @@ require_once('include/database/PearDatabase.php'); $focus = new Campaign(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); $focus->save("Campaigns"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Faq/Save.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Save.php (original) +++ vtigercrm/trunk/modules/Faq/Save.php Wed Mar 29 22:31:55 2006 @@ -28,23 +28,8 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Faq(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } -} +setObjectValuesFromRequest(&$focus); $focus->save("Faq"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/HelpDesk/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Wed Mar 29 22:31:55 2006 @@ -29,24 +29,8 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Invoice(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} - -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} + +setObjectValuesFromRequest(&$focus); $focus->save("Invoice"); Modified: vtigercrm/trunk/modules/Potentials/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Save.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Save.php Wed Mar 29 22:31:55 2006 @@ -26,25 +26,9 @@ require_once('include/database/PearDatabase.php'); $focus = new PriceBook(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} -//$focus->saveentity("PriceBooks"); +setObjectValuesFromRequest(&$focus); + $focus->save("PriceBooks"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Mar 29 22:31:55 2006 @@ -28,25 +28,9 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Order(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} +setObjectValuesFromRequest(&$focus); -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} //Added code for auto product stock updation on receiving goods $update_prod_stock=''; if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') @@ -103,8 +87,9 @@ $local_log->debug("Saved record with id of ".$return_id); - //code added for returning back to the current view after edit from list view - if($_REQUEST['return_viewname'] == '') $return_viewname='0'; - if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; + header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname"); ?> Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Wed Mar 29 22:31:55 2006 @@ -30,27 +30,10 @@ $focus = new SalesOrder(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} - -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} - +setObjectValuesFromRequest(&$focus); $focus->save("SalesOrder"); + //Checking if quote_id is present and updating the quote status if($focus->column_fields["quote_id"] != '') { @@ -58,7 +41,6 @@ $query1 = "update quotes set quotestage='Accepted' where quoteid=".$qt_id; $adb->query($query1); } - $ext_prod_arr = Array(); if($focus->mode == 'edit') Modified: vtigercrm/trunk/modules/Vendors/Save.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Save.php (original) +++ vtigercrm/trunk/modules/Vendors/Save.php Wed Mar 29 22:31:55 2006 @@ -26,25 +26,8 @@ require_once('include/database/PearDatabase.php'); $focus = new Vendor(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); -//$focus->saveentity("Vendors"); $focus->save("Vendors"); $return_id = $focus->id; @@ -53,6 +36,7 @@ if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; else $return_action = "DetailView"; if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 21:50:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:50:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4723 - /vtigercrm/trunk/modules/Accounts/EditView.php Message-ID: <20060330055059.1D15958E83C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:50:48 2006 New Revision: 4723 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Accounts/EditView.php Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 21:51:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:51:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4724 - /vtigercrm/trunk/modules/Activities/EditView.php Message-ID: <20060330055158.5FFA558FE95@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:51:54 2006 New Revision: 4724 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Activities/EditView.php Modified: vtigercrm/trunk/modules/Activities/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 21:54:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:54:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4725 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060330055439.9173F49A816@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:54:35 2006 New Revision: 4725 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Mar 29 22:54:35 2006 @@ -91,47 +91,11 @@ $campaign_tables = Array('campaign','crmentity'); $tabid = getTabid("Campaigns"); $validationData = getDBValidationData($campaign_tables,$tabid); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; +$data = split_validationdataArray($validationData); -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:01:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:01:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4726 - /vtigercrm/trunk/modules/Contacts/EditView.php Message-ID: <20060330060137.24C3F586640@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:01:29 2006 New Revision: 4726 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Contacts/EditView.php Modified: vtigercrm/trunk/modules/Contacts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:06:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:06:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4727 - /vtigercrm/trunk/modules/Emails/EditView.php Message-ID: <20060330060601.C36EC590011@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:05:57 2006 New Revision: 4727 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Emails/EditView.php Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:07:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:07:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4728 - /vtigercrm/trunk/modules/Faq/EditView.php Message-ID: <20060330060753.6B2D2590011@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:07:44 2006 New Revision: 4728 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Faq/EditView.php Modified: vtigercrm/trunk/modules/Faq/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/EditView.php (original) +++ vtigercrm/trunk/modules/Faq/EditView.php Wed Mar 29 23:07:44 2006 @@ -97,47 +97,11 @@ $faq_tables = Array('faq'); $validationData = getDBValidationData($faq_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; + $data = split_validationdataArray($validationData); -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:13:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:13:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4729 - /vtigercrm/trunk/modules/HelpDesk/EditView.php Message-ID: <20060330061313.C59CF5886C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:13:08 2006 New Revision: 4729 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:13:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:13:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4730 - /vtigercrm/trunk/modules/HelpDesk/Forms.php Message-ID: <20060330061354.E82475886C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:13:50 2006 New Revision: 4730 Log: junk code has been removed Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:16:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:16:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4731 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060330061658.8037A590025@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:16:52 2006 New Revision: 4731 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Mar 29 23:16:52 2006 @@ -266,48 +266,13 @@ $invoice_tables = Array('invoice','invoicebillads','invoiceshipads'); $tabid = getTabid("Invoice"); $validationData = getDBValidationData($invoice_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } + $data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4732 - /vtigercrm/trunk/modules/Leads/EditView.php Message-ID: <20060330061950.5FD25590025@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:19:46 2006 New Revision: 4732 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Leads/EditView.php Modified: vtigercrm/trunk/modules/Leads/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/EditView.php (original) +++ vtigercrm/trunk/modules/Leads/EditView.php Wed Mar 29 23:19:46 2006 @@ -22,10 +22,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $mod_strings; -global $app_list_strings; -global $app_strings; -global $current_user; +global $mod_strings,$app_strings,$theme; $focus = new Lead(); $smarty = new vtigerCRM_Smarty; @@ -53,7 +50,6 @@ $smarty->assign("OP_MODE",$disp_view); -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array @@ -107,46 +103,11 @@ $lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf'); $tabid = getTabid("Leads"); $validationData = getDBValidationData($lead_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; + $data = split_validationdataArray($validationData); - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:23:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:23:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4733 - /vtigercrm/trunk/modules/Notes/EditView.php Message-ID: <20060330062356.19B30590070@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:23:52 2006 New Revision: 4733 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Notes/EditView.php Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:17:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:17:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4734 - /vtigercrm/trunk/modules/Potentials/EditView.php Message-ID: <20060330071717.4E9285900D5@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:17:13 2006 New Revision: 4734 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Potentials/EditView.php Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:18:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:18:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4735 - /vtigercrm/trunk/modules/PriceBooks/EditView.php Message-ID: <20060330071852.036C75900D5@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:18:49 2006 New Revision: 4735 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Thu Mar 30 00:18:49 2006 @@ -77,51 +77,13 @@ $pb_tables = Array('pricebook'); $validationData = getDBValidationData($pb_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; - -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - - +$data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:20:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:20:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4736 - /vtigercrm/trunk/modules/Products/EditView.php Message-ID: <20060330072026.312C054EB62@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:20:21 2006 New Revision: 4736 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Products/EditView.php Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Thu Mar 30 00:20:21 2006 @@ -127,43 +127,7 @@ $product_tables = Array('products','productcf','productcollaterals'); $validationData = getDBValidationData($product_tables); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - + $data = split_validationdataArray($validationData); if($errormessage==2) { $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; @@ -194,10 +158,9 @@ $smarty->assign("ERROR_MESSAGE",$errormessage); } -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:21:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:21:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4737 - /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Message-ID: <20060330072136.AD8505901A3@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 00:21:31 2006 New Revision: 4737 Log: Removed Junk Code Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Thu Mar 30 00:21:31 2006 @@ -43,7 +43,6 @@ $user_role_info=getRoleInformation($user_role); $user_role_parent=$user_role_info[$user_role][1]; $userGroupFocus=new GetUserGroups(); - //$userGroupFocus->userRole=$user_role; $userGroupFocus->getAllUserGroups($userid); $subRoles=getRoleSubordinates($user_role); $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); @@ -336,7 +335,7 @@ } } } -//print_r(getCombinedUserGlobalPermissions($userid)); + function getUserModuleSharingObjects($module,$userid,$def_org_share,$current_user_roles,$parent_roles,$current_user_groups) { global $adb; @@ -696,11 +695,7 @@ } $mod_share_read_permission['ROLE']=$role_read_per; $mod_share_write_permission['ROLE']=$role_write_per; - //echo '
    //////////////////////////
    '; - //print_r($mod_share_read_permission); - //echo '
    //////////////////////////
    '; - //print_r($mod_share_write_permission); - + //Retreiving from the grp2role sharing $query="select datashare_grp2role.* from datashare_grp2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2role.to_roleid='".$current_user_roles."'"; $result=$adb->query($query); @@ -901,9 +896,7 @@ { foreach($shareEntArr as $key=>$shareEntId) { - //echo '

    '; - //print_r($shareEntId); - //echo '

    '; + if($shareType == 'ROLE') { if($share_permission == 1) @@ -1235,7 +1228,6 @@ global $adb; require('user_privileges/sharing_privileges_'.$userid.'.php'); $tabid=getTabid($module); - //echo $module.' '.$enttype.' '.$pertype.'
    '; if($enttype=='USER') { if($pertype =='read') @@ -1252,10 +1244,6 @@ $user_arr=Array(); if(sizeof($var_name_arr['ROLE']) > 0) { - //echo '
    '; - //print_r('
    ');
-			//print_r($var_name_arr['ROLE']);
-			//print_r('
    '); foreach($var_name_arr['ROLE'] as $roleid=>$roleusers) { @@ -1344,10 +1332,6 @@ $user_arr=Array(); if(sizeof($var_name_arr['ROLE']) > 0) { - //echo '
    '; - //print_r('
    ');
-			//print_r($var_name_arr['ROLE']);
-			//print_r('
    '); foreach($var_name_arr['ROLE'] as $roleid=>$roleusers) { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:23:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:23:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4738 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060330072305.F215E5901A3@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:23:01 2006 New Revision: 4738 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Thu Mar 30 00:23:01 2006 @@ -177,46 +177,11 @@ $po_tables = Array('purchaseorder','pobillads','poshipads'); $tabid = getTabid("PurchaseOrder"); $validationData = getDBValidationData($po_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; + $data = split_validationdataArray($validationData); - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:24:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:24:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4739 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060330072442.452F15901A3@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:24:38 2006 New Revision: 4739 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Mar 30 00:24:38 2006 @@ -273,46 +273,11 @@ $so_tables = Array('salesorder','sobillads','soshipads'); $tabid = getTabid("SalesOrder"); $validationData = getDBValidationData($so_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4740 - /vtigercrm/trunk/modules/Vendors/EditView.php Message-ID: <20060330072744.640BD5901B8@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:27:39 2006 New Revision: 4740 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Vendors/EditView.php Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Thu Mar 30 00:27:39 2006 @@ -79,51 +79,12 @@ $vendor_tables = Array('vendor'); $validationData = getDBValidationData($vendor_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; - -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - - +$data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:35:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:35:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4741 - /vtigercrm/trunk/config.template.php Message-ID: <20060330073540.E065A5901D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:35:36 2006 New Revision: 4741 Log: page navigation parameter added Modified: vtigercrm/trunk/config.template.php Modified: vtigercrm/trunk/config.template.php ============================================================================== --- vtigercrm/trunk/config.template.php (original) +++ vtigercrm/trunk/config.template.php Thu Mar 30 00:35:36 2006 @@ -120,6 +120,9 @@ // list_max_entries_per_page default value = 20 $list_max_entries_per_page = '20'; +// limitpage_navigation default value = 5 +$limitpage_navigation = '5'; + // history_max_viewed default value = 5 $history_max_viewed = '5'; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 23:54:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:54:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4742 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060330075422.29B9F59018F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:54:17 2006 New Revision: 4742 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:00:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 08:00:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4743 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060330080017.6B8205901F0@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 01:00:13 2006 New Revision: 4743 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Thu Mar 30 01:00:13 2006 @@ -97,22 +97,6 @@ return $row["count(*)"]; } - function get_list_view_data(){ - global $action, $currentModule, $focus, $app_list_strings; - $today = date("Y-m-d", time()); - $task_fields =$this->get_list_view_array(); - if (isset($this->parent_type)) - $task_fields['PARENT_MODULE'] = $this->parent_type; - if ($this->status != "Completed" && $this->status != "Deferred" ) { - $task_fields['SET_COMPLETE'] = "X"; - } - - - if ($this->duedate < $toDAy) { - $task_fields['DATE_DUE'] = "".$task_fields['DATE_DUE'].""; - } - return $task_fields; - } - + } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:25:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:25:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4744 - in /vtigercrm/trunk: data/CRMEntity.php data/SugarBean.php modules/Contacts/Contact.php modules/Notes/Note.php Message-ID: <20060330092551.95C62590275@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:25:42 2006 New Revision: 4744 Log: Unwanted functions removed Modified: vtigercrm/trunk/data/CRMEntity.php vtigercrm/trunk/data/SugarBean.php vtigercrm/trunk/modules/Contacts/Contact.php vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Mar 30 02:25:42 2006 @@ -461,14 +461,6 @@ } - function get_list_view_data(){ - $temp_array = $this->get_list_view_array(); - $temp_array["ENCODED_NAME"]=htmlspecialchars($this->first_name.' '.$this->last_name, ENT_QUOTES); - return $temp_array; - - } - - //Used By vtigerCRM Word Add-In function getColumnNames() { Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:30:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:30:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4745 - /vtigercrm/trunk/class_http/example.php Message-ID: <20060330093034.371CD590283@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:30:30 2006 New Revision: 4745 Log: file has been removed Removed: vtigercrm/trunk/class_http/example.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:31:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:31:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4746 - /vtigercrm/trunk/class_http/index.htm Message-ID: <20060330093107.EA96C590285@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:31:04 2006 New Revision: 4746 Log: file has been removed Removed: vtigercrm/trunk/class_http/index.htm From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:33:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:33:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4747 - /vtigercrm/trunk/cron/syntax.txt Message-ID: <20060330093308.3C7A4590285@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:33:03 2006 New Revision: 4747 Log: file has been removed Removed: vtigercrm/trunk/cron/syntax.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:34:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:34:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4748 - /vtigercrm/trunk/cron/examples.txt Message-ID: <20060330093446.6FA4F590288@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:34:42 2006 New Revision: 4748 Log: file has been removed Removed: vtigercrm/trunk/cron/examples.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:47:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:47:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4749 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060330094757.BFC91590258@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:47:53 2006 New Revision: 4749 Log: * Modified the functions insertIntoAttachment1 and insertIntoAttachment Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:09:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:09:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4750 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060330100928.C3C745901C6@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:09:22 2006 New Revision: 4750 Log: made facility to take data from file instead of db from the second instance onwards Modified: vtigercrm/trunk/include/utils/utils.php Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Thu Mar 30 03:09:22 2006 @@ -742,12 +742,22 @@ function getTabModuleName($tabid) { + if (file_exists('tabdata.php')) + { + global $log; + $log->info("the file exists"); + include('tabdata.php'); + $tabname = array_search($tabid,$tab_info_array); + } + else + { global $log; $log->info("tab id is ".$tabid); global $adb; $sql = "select name from tab where tabid='".$tabid."'"; $result = $adb->query($sql); $tabname= $adb->query_result($result,0,"name"); + } return $tabname; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:10:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:10:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4751 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060330101052.68BBB59026F@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:10:46 2006 New Revision: 4751 Log: method added to create tabdata in file also made facility to read data from file the second time onwards Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Mar 30 03:10:46 2006 @@ -255,12 +255,24 @@ function getTabid($module) { + + if (file_exists('tabdata.php')) + { + global $log; + $log->info("the file exists"); + include('tabdata.php'); + $tabid= $tab_info_array[$module]; + } + else + { + global $log; $log->info("module is ".$module); global $adb; $sql = "select tabid from tab where name='".$module."'"; $result = $adb->query($sql); $tabid= $adb->query_result($result,0,"tabid"); + } return $tabid; } @@ -1247,4 +1259,77 @@ } + + + + /** + * Function to write the tabid and name to a flat file tabdata.txt so that the data + * is obtained from the file instead of repeated queries + * returns null + */ + +function create_tab_data_file() +{ + global $log; + $log->info("creating tabdata file"); + global $adb; + $sql = "select * from tab"; + $result = $adb->query($sql); + $num_rows=$adb->num_rows($result); + $result_array=Array(); + for($i=0;$i<$num_rows;$i++) + { + $tabid=$adb->query_result($result,$i,'tabid'); + $tabname=$adb->query_result($result,$i,'name'); + $result_array[$tabname]=$tabid; + + } + echo '
    ****************
    '; + print_r($result_array); + echo '
    ****************
    '; + + $filename = 'tabdata.php'; + + +if (file_exists($filename)) { + + if (is_writable($filename)) + { + + if (!$handle = fopen($filename, 'w+')) { + echo "Cannot open file ($filename)"; + exit; + } + require_once('modules/Users/CreateUserPrivilegeFile.php'); + $newbuf=''; + $newbuf .=""; + fputs($handle, $newbuf); + fclose($handle); + + } + else + { + echo "The file $filename is not writable"; + } + + } + else + { + echo "The file $filename does not exist"; + return; + } +} + + + + + + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:29:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:29:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4752 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060330102948.2D1925902D6@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:29:43 2006 New Revision: 4752 Log: commented out the getRowCount print Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Thu Mar 30 03:29:43 2006 @@ -400,7 +400,7 @@ if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $log->debug('getRowCount rows= '.$rows); + //$log->debug('getRowCount rows= '.$rows); return $rows; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:48:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:48:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4753 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060330114842.2394059030F@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:48:37 2006 New Revision: 4753 Log: check added for tabdata.php file Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:49:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:49:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4754 - /vtigercrm/trunk/tabdata.php Message-ID: <20060330114911.468D059032E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:49:07 2006 New Revision: 4754 Log: init version Added: vtigercrm/trunk/tabdata.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:49:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:49:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4755 - /vtigercrm/trunk/parent_tabdata.php Message-ID: <20060330114959.B790B59032E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:49:55 2006 New Revision: 4755 Log: init version Added: vtigercrm/trunk/parent_tabdata.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4756 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060330115105.CD348590372@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:51:01 2006 New Revision: 4756 Log: check added for parent_tabdata.php file Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:58:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:58:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4757 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060330115854.F278C59037F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 04:58:50 2006 New Revision: 4757 Log: primary key for contact id removed Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Mar 30 04:58:50 2006 @@ -820,7 +820,6 @@ - @@ -7336,26 +7335,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -7381,9 +7360,6 @@
    - - - @@ -7409,14 +7385,81 @@
    - - - - - - - - + + + + + + + + + + + + + + + + + + + Type=InnoDB + + expectedrevenue + + + +
    + + + + + + + + + + + + + + + + + + + Type=InnoDB + + actualcost + + + +
    + + + + + + + + + + + + + + + + + + + Type=InnoDB + + expectedresponse + + + +
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:07:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:07:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4758 - /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Message-ID: <20060330120727.8B85059038D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:07:23 2006 New Revision: 4758 Log: Removed 3 functions - getRenderRelated --Contacts, --Products, --Users as part of removal of duplicate & unused cod Ahmed Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:23:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:23:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4759 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060330122357.ACDC95903A6@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:23:53 2006 New Revision: 4759 Log: getFieldModuleAccessArray Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 30 05:23:53 2006 @@ -4006,4 +4006,32 @@ } } +/** Function to get the field access module array + * @returns The field Access module Array :: Type Array + * + */ +function getFieldModuleAccessArray() +{ + + $fldModArr=Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); + + return $fldModArr; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:25:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:25:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4760 - /vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php Message-ID: <20060330122553.4BA965903B3@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:25:49 2006 New Revision: 4760 Log: Removed junk code Modified: vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php Modified: vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:30:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:30:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4761 - in /vtigercrm/trunk/modules/Users: SaveProfile.php UpdateProfileChanges.php profilePrivileges.php Message-ID: <20060330123012.061695903B6@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:30:05 2006 New Revision: 4761 Log: Duplicate code removal done Modified: vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Thu Mar 30 05:30:05 2006 @@ -98,8 +98,6 @@ $permission_value = 1; } $update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid; - //echo $update_query; - //echo '
    '; $adb->query($update_query); if($tab_id ==9) { @@ -141,23 +139,7 @@ - $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); + $modArr=getFieldModuleAccessArray(); foreach($modArr as $fld_module => $fld_label) { Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Mar 30 05:30:05 2006 @@ -197,7 +197,6 @@ $stand[]=$tab_view_per; $privileges_stand[]=$stand; } - $act_perr_arry = getTabsActionPermission($parentProfileId); } } @@ -366,23 +365,9 @@ $smarty->assign("UTILITIES_PRIV",$privilege_util); //Field privileges -$modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); +$modArr=getFieldModuleAccessArray(); + + $no_of_mod=sizeof($modArr); for($i=0;$i<$no_of_mod; $i++) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:30:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:30:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4762 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060330123023.559755903C1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:30:18 2006 New Revision: 4762 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Thu Mar 30 05:30:18 2006 @@ -100,10 +100,6 @@ { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); } -//Modified by Raju -//$other_text=' '; - - //Raju if(isPermitted('Accounts',2,'') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; @@ -116,25 +112,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML='    '; -}else -{ -$cvHTML=''; -} - $customviewstrings=' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} global $theme; $theme_path="themes/".$theme."/"; @@ -142,7 +121,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS",$other_text); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Account'); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:34:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:34:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4763 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060330123409.CF7385903C1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:34:05 2006 New Revision: 4763 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Thu Mar 30 05:34:05 2006 @@ -34,13 +34,7 @@ $log = LoggerManager::getLogger('task_list'); -global $currentModule; - -global $image_path; -global $theme; -global $adb; -// focus_list is the means of passing data to a ListView. -global $focus_list; +global $currentModule,$image_path,$theme,$adb; if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; @@ -81,33 +75,13 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -} -else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - $customviewstrings=' - - '.$cvHTML; -// - global $task_title; $title_display = $current_module_strings['LBL_LIST_FORM_TITLE']; if ($task_title) $title_display= $task_title; @@ -142,8 +116,8 @@ $list_result = $adb->query($list_query); //Constructing the list view - -$smarty->assign("CUSTOMVIEW", $customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:42:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:42:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4764 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060330124249.36E80590370@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:42:45 2006 New Revision: 4764 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Thu Mar 30 05:42:45 2006 @@ -8,11 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; - require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); @@ -23,9 +18,7 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; -global $current_language; +global $app_strings,$mod_strings,$current_language; $current_module_strings = return_module_language($current_language, 'Campaigns'); $comboFieldNames = Array('campaigntype'=>'campaigntype_dom' @@ -82,7 +75,7 @@ //<<<<>>>> - +$smarty = new vtigerCRM_Smarty; if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); @@ -95,31 +88,12 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings =' - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} $customview= get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false); -$smarty = new vtigerCRM_Smarty; -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:45:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:45:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4765 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060330124550.45A0C5903D2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:45:46 2006 New Revision: 4765 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Thu Mar 30 05:45:46 2006 @@ -121,28 +121,8 @@ } if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - - $customstrings =' - - '.$cvHTML; - -// + $smarty->assign("ALL", 'All'); +} //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -184,10 +164,11 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customstrings); $smarty->assign("BUTTONS",$other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); //Retreiving the no of rows $noofrows = $adb->num_rows($list_result); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:48:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:48:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4766 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060330124859.802E35903D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:48:55 2006 New Revision: 4766 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Thu Mar 30 05:48:55 2006 @@ -141,28 +141,8 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings = ' - - '.$cvHTML; - + $smarty->assign("ALL", 'All'); +} if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { @@ -209,8 +189,8 @@ $list_result = $adb->query($list_query); //Constructing the list view - -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:51:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:51:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4767 - /vtigercrm/trunk/modules/Faq/ListView.php Message-ID: <20060330125140.9C0B15903E2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:51:36 2006 New Revision: 4767 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Faq/ListView.php Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Thu Mar 30 05:51:36 2006 @@ -24,14 +24,10 @@ require_once('modules/CustomView/CustomView.php'); global $app_strings; -global $mod_strings; $current_module_strings = return_module_language($current_language, 'Faq'); -global $theme; global $currentModule; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); if(isset($_REQUEST['category']) && $_REQUEST['category'] !='') @@ -70,8 +66,6 @@ if(isPermitted('Faq',2,'') == 'yes') $other_text ['del'] = $app_strings[LBL_MASS_DELETE]; -//$other_text =' -// '; //Retreive the list from Database $list_query = getListQuery("Faq"); @@ -97,11 +91,6 @@ //Constructing the list view -//$customstrings = ''; $smarty = new vtigerCRM_Smarty; $smarty->assign("MOD", $mod_strings); @@ -110,7 +99,6 @@ $smarty->assign("MODULE",$currentModule); $smarty->assign("BUTTONS",$other_text); $smarty->assign("CATEGORY",$category); -//$smarty->assign("CUSTOMVIEW",$customstrings); $smarty->assign("SINGLE_MOD",'Note'); //Retreiving the no of rows $noofrows = $adb->num_rows($list_result); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:54:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:54:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4768 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060330125427.520465903E2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:54:23 2006 New Revision: 4768 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Thu Mar 30 05:54:23 2006 @@ -32,9 +32,6 @@ $comboFieldArray = getComboArray($comboFieldNames); global $currentModule; -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; $focus = new HelpDesk(); $smarty = new vtigerCRM_Smarty; @@ -93,29 +90,10 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings =' - - '.$cvHTML; - -$smarty->assign("CUSTOMVIEW",$customstrings); + $smarty->assign("ALL", 'All'); +} +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:56:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:56:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4769 - in /vtigercrm/trunk/modules/Users: EditFieldLevelAccess.php ListFieldPermissions.php ListFldProfiles.php UpdateFieldLevelAccess.php profilePrivileges.html Message-ID: <20060330125640.12716590403@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:56:33 2006 New Revision: 4769 Log: Unwanted files Removed: vtigercrm/trunk/modules/Users/EditFieldLevelAccess.php vtigercrm/trunk/modules/Users/ListFieldPermissions.php vtigercrm/trunk/modules/Users/ListFldProfiles.php vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php vtigercrm/trunk/modules/Users/profilePrivileges.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4770 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060330125642.58F5C5903E9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:56:36 2006 New Revision: 4770 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Thu Mar 30 05:56:36 2006 @@ -80,26 +80,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customstrings = ' - - '.$cvHTML; - - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -108,7 +90,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Invoice'); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS",$other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:58:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:58:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4771 - /vtigercrm/trunk/modules/Settings/index.html Message-ID: <20060330125842.29A565903E9@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:58:37 2006 New Revision: 4771 Log: unwanted file Removed: vtigercrm/trunk/modules/Settings/index.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:00:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:00:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4772 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060330130047.A84CE590403@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:00:41 2006 New Revision: 4772 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Mar 30 06:00:41 2006 @@ -153,25 +153,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - $customstrings = ' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} $custom= get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false); @@ -181,7 +164,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("BUTTONS",$other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4773 - /vtigercrm/trunk/index.php Message-ID: <20060330130306.A48C1590400@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:02 2006 New Revision: 4773 Log: Unwanted code removed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Mar 30 06:03:02 2006 @@ -23,11 +23,10 @@ global $display; global $category; require_once('include/utils/utils.php'); -//$phpbb_root_path='./modules/MessageBoard/'; -if (substr(phpversion(), 0, 1) == "5") { +//if (substr(phpversion(), 0, 1) == "5") { // while using php5, in graphs we get illegal exception // ini_set("zend.ze1_compatibility_mode", "1"); -} +//} if (version_compare(phpversion(), '5.0') < 0) { eval(' @@ -38,10 +37,6 @@ } global $currentModule; -//if(!isset($category)) - // $category=getParentTabName(1); -//else - // $category=getParentTabName($currentModule); function fetchPermissionDataForTabList() { $permittedTabs = $_SESSION['tab_permission_set']; @@ -74,12 +69,7 @@ require_once('include/utils/UserInfoUtil.php'); $tabid = getTabid($module); - //echo 'tab id isss '.$tabid; - //echo '
    '; - $actionid = getActionid($action); - //echo 'action idd isss '.$actionid; - //echo '
    '; $profile_id = $_SESSION['authenticated_user_profileid']; $tab_per_Data = getAllTabsPermission($profile_id); @@ -87,92 +77,6 @@ $defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set']; $others_permission_id = $defSharingPermissionData[$tabid]; -/* - $i=0; - - - - $accessFlag = false; - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $module != 'Notes' && $module != 'Products' && $module != 'Faq') - { - $rec_owner_id = getUserId($_REQUEST['record']); - } - if($tab_per_Data[$tabid] !=0) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - - if($permissionData[$tabid][$actionid] !=0) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - elseif(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $others_permission_id != '' && $module != 'Notes' && $module != 'Products' && $module != 'Faq' && $rec_owner_id != 0) - { - //$rec_owner_id = getUserId($_REQUEST['record']); - if($rec_owner_id != $current_user->id) - { - if($others_permission_id == 0) - { - if($action == 'EditView' || $action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - elseif($others_permission_id == 1) - { - if($action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - elseif($others_permission_id == 2) - { - - return; - } - elseif($others_permission_id == 3) - { - if($action == 'DetailView' || $action == 'EditView' || $action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - - - } - else - { - return; - } - } - else - { - return; - } - - if(!$accessFlag) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } -*/ } //we have to do this as there is no UI page for Delete. Hence, when the user clicks delete, it gets stuck halfway and the page looks ugly because the theme is not set @@ -216,47 +120,6 @@ $_GET = array_map("stripslashes_checkstrings", $_GET); } - -// Simulating the login process of forums here -//This needs to be called only once. This check has been put so that common.php does not get invoked time and again - if(isset($HTTP_POST_VARS['Login']) || isset($HTTP_GET_VARS['Login']) || isset($HTTP_POST_VARS['Logout']) || isset($HTTP_GET_VARS['Logout'])) - { - /* - if((isset($HTTP_POST_VARS['Login']) || isset($HTTP_GET_VARS['Login'])) && !$userdata['session_logged_in']) - { - //now log in to the Forums for the current user - /* - include($phpbb_root_path . 'common.php'); - - //$sql = "SELECT user_id, username, user_password, user_active, user_level - // FROM " . USERS_TABLE . " - // WHERE username = '" . $HTTP_POST_VARS['user_name'] . "'"; - if ( !($result = $db->sql_query($sql)) ) - { - message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql); - } - $password=$HTTP_POST_VARS['user_password']; - $username=$HTTP_POST_VARS['user_name']; - if( $row = $db->sql_fetchrow($result) ) - { - if( $row['user_level'] != ADMIN && $board_config['board_disable'] ) - { - } - else - { - if( md5($password) == $row['user_password'] && $row['user_active'] ) - { - $autologin = 0; - - $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); - } - } - } - - } - */ - } - // Allow for the session information to be passed via the URL for printing. if(isset($_REQUEST['PHPSESSID'])) @@ -539,10 +402,6 @@ $app_list_strings = return_app_list_strings_language($current_language); $mod_strings = return_module_language($current_language, $currentModule); -//TODO: Clint - this key map needs to be moved out of $app_list_strings since it never gets translated. -// best to just have an upgrade script that changes the parent_type column from Account to Accounts, etc. -$app_list_strings['record_type_module'] = array('Account' => 'Accounts','Potential' => 'Potentials', 'Case' => 'Cases'); - //If DetailView, set focus to record passed in if($action == "DetailView") { @@ -633,10 +492,6 @@ break; } - - //$focus->retrieve($_REQUEST['record']); - //$focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); - if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { // Only track a viewing if the record was retrieved. @@ -662,7 +517,6 @@ //skip headers for popups, deleting, saving, importing and other actions if(!$skipHeaders) { $log->debug("including headers"); - //include('themes/'.$theme.'/header.php'); if($use_current_login) { if(isset($_REQUEST['category']) && $_REQUEST['category'] !='') @@ -804,14 +658,12 @@ echo "
    '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LBL_VIEW'].' - '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -  '.$app_strings[LBL_VIEW].' -// -// '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -
    \n"; echo "
    \n"; - //echo "Click Link to popup"; echo "© Click here for Copyright details.
    "; echo "
    \n"; echo " + + + + + + Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Feb 28 23:10:16 2006 @@ -157,7 +157,8 @@ - + + Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 01:15:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 06:15:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4025 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060301061525.72C4E49CA6E@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 23:15:19 2006 New Revision: 4025 Log: release notes updated Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Tue Feb 28 23:15:19 2006 @@ -290,16 +290,16 @@ - + - + - + - + {/if} From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 04:24:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 09:24:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4027 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060301092433.8D0DB49EF36@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 02:24:29 2006 New Revision: 4027 Log: function mkdirs added Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Mar 1 02:24:29 2006 @@ -987,6 +987,9 @@ return $update_info; } +/** + * This function is used to get the Contact Images with the script for scrolling and the thumbnailview . + */ function getContactImages($parenttab) { @@ -1017,6 +1020,12 @@ return $imagelists; } +/** + * This function is used to get the Product Images for the given Product . + * It accepts the product id as argument and returns the Images with the script for + * rotating the product Images + */ + function getProductImages($id) { global $adb; @@ -1036,6 +1045,12 @@ if($imagename != '') return $script; } + +/** + * This function is used to save the Images . + * It acceps the File lists,modulename,id and the mode as arguments + * It returns the array details of the upload + */ function SaveImage($_FILES,$module,$id,$mode) { @@ -1188,6 +1203,11 @@ } } +/** + * This function is used get the User Count . + * It returns the array which has the total users ,admin users,and the non admin users + */ + function UserCount() { global $adb; @@ -1200,4 +1220,22 @@ return $count; } +/** + * This function is used to create folders recursively . + */ + +function mkdirs($dir, $mode = 0777, $recursive = true) +{ + if( is_null($dir) || $dir === "" ){ + return FALSE; + } + if( is_dir($dir) || $dir === "/" ){ + return TRUE; + } + if( mkdirs(dirname($dir), $mode, $recursive) ){ + return mkdir($dir, $mode); + } + return FALSE; +} + ?> From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 05:02:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:02:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.bd713d7f915d4701e829bb08205932d6@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: change this code: {{{ if($module == "Vendor") { $query = "select crmentity.crmid, vendor.* from vendor inner join crmentity on crmentity.crmid=vendor.vendorid where crmentity.deleted=0"; } if($module == "PriceBook") { $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; } if($module == "Quotes") { $query = "select crmentity.*, quotes.*, quotesbillads.*, quotesshipads.*,potential.potentialname,account.accountname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid where crmentity.deleted=0".$where; } if($module == "Orders") { $query = "select crmentity.*, purchaseorder.*, pobillads.*, poshipads.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid where crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "select crmentity.*, salesorder.*, sobillads.*, soshipads.*,quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid where crmentity.deleted=0".$where; } if($module == "Invoice") { $query = "select crmentity.*, invoice.*, invoicebillads.*, invoiceshipads.*,salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid where crmentity.deleted=0".$where; } }}} with this: {{{ if($module == "Vendor") { $query = "select crmentity.crmid, vendor.*, vendorcf.* from vendor inner join crmentity on crmentity.crmid=vendor.vendorid inner join vendorcf on vendor.vendorid = vendorcf.vendorid where crmentity.deleted=0"; } if($module == "PriceBook") { $query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0"; } if($module == "Quotes") { $query = "select crmentity.*, quotes.*, quotesbillads.*, quotesshipads.*, quotescf.* , potential.potentialname,account.accountname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left outer join account on account.accountid=quotes.accountid left outer join potential on potential.potentialid=quotes.potentialid inner join quotescf on quotes.quoteid = quotescf.quoteid where crmentity.deleted=0".$where; } if($module == "Orders") { $query = "select crmentity.*, purchaseorder.*, pobillads.*, poshipads.*, purchaseordercf.* ,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid inner join purchaseordercf on purchaseorder.purchaseorderid = purchaseordercf.purchaseorderid where crmentity.deleted=0"; } if($module == "SalesOrder") { $query = "select crmentity.*, salesorder.*, sobillads.*, soshipads.*, salesordercf.* ,quotes.subject as quotename, account.accountname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left outer join quotes on quotes.quoteid=salesorder.quoteid left outer join account on account.accountid=salesorder.accountid inner join salesordercf on salesorder.salesorderid = salesordercf.salesorderid where crmentity.deleted=0".$where; } if($module == "Invoice") { $query = "select crmentity.*, invoice.*, invoicebillads.*, invoiceshipads.*, invoicecf.* ,salesorder.subject as salessubject from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid where crmentity.deleted=0".$where; } }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 05:07:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:07:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.74961106a67e13540de75c02223270af@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: => fixed * status: new => closed Comment: replace this code: {{{ if($module == "Quotes") { $query = "from quotes inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid left join users as usersRel1 on usersRel1.id = quotes.inventorymanager left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityQuotes.deleted=0"; } if($module == "Orders") { $query = "from purchaseorder inner join crmentity as crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid left join users as usersOrders on usersOrders.id = crmentityOrders.smownerid left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid left join contactdetails as contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityOrders.deleted=0"; } if($module == "Invoice") { $query = "from invoice inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityInvoice.deleted=0"; } }}} with this code: {{{ if($module == "Quotes") { $query = "from quotes inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid inner join quotescf on quotes.quoteid = quotescf.quoteid left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid left join users as usersRel1 on usersRel1.id = quotes.inventorymanager left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityQuotes.deleted=0"; } if($module == "Orders") { $query = "from purchaseorder inner join crmentity as crmentityOrders on crmentityOrders.crmid=purchaseorder.purchaseorderid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid inner join purchaseordercf on purchaseorder.purchaseorderid = purchaseordercf.purchaseorderid left join users as usersOrders on usersOrders.id = crmentityOrders.smownerid left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid left join contactdetails as contactdetailsOrders on contactdetailsOrders.contactid = purchaseorder.contactid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityOrders.deleted=0"; } if($module == "Invoice") { $query = "from invoice inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ".$this->getRelatedModulesQuery($module,$this->secondarymodule)." where crmentityInvoice.deleted=0"; } }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 05:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?= =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?= In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com> Message-ID: <085.4b9d3313c1554672885231ebc6875cff@vtiger.fosslabs.com> #45: Fix for "Fatal error..." by reports with custom field ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 05:12:48 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 10:12:48 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2344=3A_F?= =?utf-8?q?ix_for_Error_by_custom_view_with_a_custom_fields?= In-Reply-To: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> References: <076.4a2106d4fc744e11022ea4731359a5ae@vtiger.fosslabs.com> Message-ID: <085.e94f9ce50b23b960970d295a3dcb951c@vtiger.fosslabs.com> #44: Fix for Error by custom view with a custom fields ------------------------+--------------------------------------------------- Reporter: Kleo | Owner: developer Type: defect | Status: reopened Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: fixed => * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 06:12:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 11:12:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4028 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060301111252.B8A1D499E57@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 04:12:47 2006 New Revision: 4028 Log: Changes made for 5 alpha 2 release Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Wed Mar 1 04:12:47 2006 @@ -41,7 +41,7 @@

    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 1: Browse through Live Demo: http://www.vtiger.com/products/crm/demo_5alpha

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

    Step 3: Post your suggestions & comments at @@ -110,7 +110,7 @@

    @@ -521,7 +521,7 @@ - @@ -553,12 +553,6 @@
  • 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: Release Notes

    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 08:19:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 13:19:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4029 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060301131932.0876349EEE4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 06:19:28 2006 New Revision: 4029 Log: bug fixed in start_end_dates for dashboard Modified: vtigercrm/trunk/include/utils/utils.php Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Wed Mar 1 06:19:28 2006 @@ -1842,7 +1842,7 @@ } else if($period=="tmon") { - $st_date=date("Y-m-d",mktime(0,0,0,date("n"),date("1"),date("Y"))); + /*$st_date=date("Y-m-d",mktime(0,0,0,date("n"),date("1"),date("Y"))); $end_date=date("Y-m-d",mktime(0,0,0,date("n"),date("j")+1,date("Y"))); $period_type="month"; $width="840"; @@ -1851,7 +1851,10 @@ { $st_date=date("Y-m-d",mktime(0,0,0,date("n")-1,date("1"),date("Y"))); $end_date = date("Y-m-d",mktime(0, 0, 1, date("n"), 0,date("Y"))); - } + }*/ + $period_type="month"; + $width="840"; + $st_date = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); $end_date = date("Y-m-t"); } else if($period=="lmon") From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 08:23:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 13:23:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4030 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060301132340.ED64749EF72@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 1 06:23:37 2006 New Revision: 4030 Log: bug fixed in cachefile name issue Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Mar 1 06:23:37 2006 @@ -348,6 +348,14 @@ { //Checks whether the cached image is present or not + if(file_exists($cahce_file_name) + { + unlink($cache_file_name); + } + if(file_exists($cache_file_name.'.map') + { + unlink($cache_file_name.'.map'); + } if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map')) { //If the Cached image is not present From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 09:45:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 14:45:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2354=3A_T?= =?utf-8?q?ranslate_of_hard_code_by_Summing_columns_in_reports?= Message-ID: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> #54: Translate of hard code by Summing columns in reports -------------------------+-------------------------------------------------- Reporter: Kleo | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -------------------------+-------------------------------------------------- In modules/Reports/ReportRun.php replace the line: {{{ $coltotalhtml .= "
    "; - // Under the Sugar Public License referenced above, you are required to leave in all copyright statements in both - // the code and end-user application. - //echo("
    © 2004 SugarCRM Inc. All Rights Reserved.
    "); + // Under the Sugar Public License referenced above, you are required to leave in all copyright statements + // in both the code and end-user application. if($calculate_response_time) { $endTime = microtime(); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:03:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4774 - /vtigercrm/trunk/modules/Import/ImportStep4.html Message-ID: <20060330130322.4E651590407@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:18 2006 New Revision: 4774 Log: * Removed the repeated hidden entry for return_id Modified: vtigercrm/trunk/modules/Import/ImportStep4.html Modified: vtigercrm/trunk/modules/Import/ImportStep4.html ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep4.html (original) +++ vtigercrm/trunk/modules/Import/ImportStep4.html Thu Mar 30 06:03:18 2006 @@ -40,7 +40,6 @@ - From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:03:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4775 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060330130356.E6BD4590400@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:52 2006 New Revision: 4775 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Thu Mar 30 06:03:52 2006 @@ -30,21 +30,13 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page; -global $list_max_entries_per_page; $log = LoggerManager::getLogger('note_list'); -global $currentModule; +global $currentModule,$image_path,$theme; -global $image_path; -global $theme; $category = getParentTab(); - - -// focus_list is the means of passing data to a ListView. -global $focus_list; //<<<>>>>>> $oCustomView = new CustomView("Notes"); @@ -93,32 +85,13 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } -$customstrings = ' - - '.$cvHTML; - - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:05:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:05:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4776 - in /vtigercrm/trunk/modules: Emails/Save.php Notes/Save.php Message-ID: <20060330130532.C368C590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:05:26 2006 New Revision: 4776 Log: * Removed the fileupload code which was used to add the attachment contents in db when duplicate the record Modified: vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Notes/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:07:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:07:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4777 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060330130709.A2B60590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:07:05 2006 New Revision: 4777 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Thu Mar 30 06:07:05 2006 @@ -16,7 +16,6 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('modules/Potentials/Opportunity.php'); -require_once('include/utils/utils.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -24,13 +23,11 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page; $log = LoggerManager::getLogger('potential_list'); -global $currentModule; -global $theme; +global $currentModule,$theme; // Get _dom arrays from Database $comboFieldNames = Array('leadsource'=>'leadsource_dom' @@ -114,27 +111,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - -$customstrings =' - - '.$cvHTML; - + $smarty->assign("ALL", 'All'); +} //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -176,7 +154,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Opportunity'); $smarty->assign("BUTTONS",$other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:08:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:08:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4778 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060330130818.AC565590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:08:14 2006 New Revision: 4778 Log: * Added functions to calculate Product Stock and send mail about the stock which was placed in Save.php file accross the modules SalesOrder, Quotes and Invoice Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Thu Mar 30 06:08:14 2006 @@ -49,4 +49,156 @@ } return $productBlock; } + +function updateStk($product_id,$qty,$mode,$ext_prod_arr,$module) +{ + global $adb; + global $current_user; + global $log; + + $log->debug("Inside updateStk function, module=".$module); + $log->debug("Product Id = $product_id & Qty = $qty"); + + $prod_name = getProductName($product_id); + $qtyinstk= getPrdQtyInStck($product_id); + $log->debug("Prd Qty in Stock ".$qtyinstk); + + if($mode == 'edit') + { + if(array_key_exists($product_id,$ext_prod_arr)) + { + $old_qty = $ext_prod_arr[$product_id]; + if($old_qty > $qty) + { + $diff_qty = $old_qty - $qty; + $upd_qty = $qtyinstk+$diff_qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + elseif($old_qty < $qty) + { + $diff_qty = $qty - $old_qty; + $upd_qty = $qtyinstk-$diff_qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + } + else + { + $upd_qty = $qtyinstk-$qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + } + else + { + $upd_qty = $qtyinstk-$qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } +} + +function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module) +{ + global $current_user; + global $adb; + global $log; + $reorderlevel = getPrdReOrderLevel($product_id); + $log->debug("Inside sendPrdStckMail function, module=".$module); + $log->debug("Prd reorder level ".$reorderlevel); + if($upd_qty < $reorderlevel) + { + //send mail to the handler + $handler=getPrdHandler($product_id); + $handler_name = getUserName($handler); + $to_address= getUserEmail($handler); + + //Get the email details from database; + if($module == 'SalesOrder') + { + $notification_table = 'SalesOrderNotification'; + $quan_name = '{SOQUANTITY}'; + } + if($module == 'Quotes') + { + $notification_table = 'QuoteNotification'; + $quan_name = '{QUOTEQUANTITY}'; + } + if($module == 'Invoice') + { + $notificationname = 'InvoiceNotification'; + } + $query = "select * from inventorynotification where notificationname='".$notification_table."'"; + $result = $adb->query($query); + + $subject = $adb->query_result($result,0,'notificationsubject'); + $body = $adb->query_result($result,0,'notificationbody'); + + $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); + $body = str_replace('{HANDLER}',$handler_name,$body); + $body = str_replace('{PRODUCTNAME}',$prod_name,$body); + if($module == 'Invoice') + { + $body = str_replace('{CURRENTSTOCK}',$upd_qty,$body); + $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); + } + else + { + $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); + $body = str_replace($quan_name,$qty,$body); + } + $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); + + $mail_status = send_mail($module,$to_address,$current_user->user_name,$current_user->email1,$subject,$body); + } +} + +function getPrdQtyInStck($product_id) +{ + global $adb; + $query1 = "select qtyinstock from products where productid=".$product_id; + $result=$adb->query($query1); + $qtyinstck= $adb->query_result($result,0,"qtyinstock"); + return $qtyinstck; +} + +function getPrdReOrderLevel($product_id) +{ + global $adb; + $query1 = "select reorderlevel from products where productid=".$product_id; + $result=$adb->query($query1); + $reorderlevel= $adb->query_result($result,0,"reorderlevel"); + return $reorderlevel; +} + +function getPrdHandler($product_id) +{ + global $adb; + $query1 = "select handler from products where productid=".$product_id; + $result=$adb->query($query1); + $handler= $adb->query_result($result,0,"handler"); + return $handler; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:10:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:10:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4779 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060330131044.5EE945903AE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:10:37 2006 New Revision: 4779 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Thu Mar 30 06:10:37 2006 @@ -72,26 +72,8 @@ $other_text['del'] = $app_strings[LBL_MASS_DELETE]; if($viewnamedesc['viewname'] == 'All') { -$cvHTML=''; -}else -{ -$cvHTML=''; + $smarty->assign("ALL", 'All'); } - -$customviewstrings = ' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -160,7 +142,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'index','bookname','true','basic',"","","","",$viewid); $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("RECORD_COUNTS", $record_string); $smarty->assign("SELECT_SCRIPT", $view_script); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:12:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4780 - in /vtigercrm/trunk/modules: Invoice/Save.php Quotes/Save.php SalesOrder/Save.php Message-ID: <20060330131221.F2DB65903BA@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:12:11 2006 New Revision: 4780 Log: * Removed the functions updateStk, sendMail about stock, getPrdQtyInStck, getPrdReOrderLevel and getPrdHandler because all these are common for SalesOrder, Quotes and Invoice and these function moved to InventoryUtils.php file Modified: vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Quotes/Save.php vtigercrm/trunk/modules/SalesOrder/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Thu Mar 30 06:12:11 2006 @@ -79,7 +79,7 @@ $query ="insert into invoiceproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); //Updating the Quantity in Stock in the Product Table - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice'); } } $return_id = $focus->id; @@ -92,114 +92,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $adb,$current_user; - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - //Updating the Product Quantity - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - } - - //Check for reorder level and send mail - -} - -function sendPrdStckMail($product_id,$upd_qty,$prod_name) -{ - global $current_user,$adb; - $reorderlevel = getPrdReOrderLevel($product_id); - if($upd_qty < $reorderlevel) - { - //send mail to the handler - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $to_address= getUserEmail($handler); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='InvoiceNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$upd_qty,$body); - $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("Invoice",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } -} - - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Thu Mar 30 06:12:11 2006 @@ -33,26 +33,9 @@ $log->debug("Inside Quote Save"); $focus = new Quote(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; - $log->debug("Quote ID ".$focus->id); -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; - $log->debug("Mode is ".$focus->mode); -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); + $log->debug("The Field Value Array -----> ".$focus->column_fields); $focus->save("Quotes"); @@ -94,8 +77,8 @@ $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); //Checking the re-order level and sending mail - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); - } + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes'); + } } @@ -109,122 +92,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $log; - global $adb; - global $current_user; - $log->debug("Inside Quote updateStk function."); - $log->debug("Product Id is".$product_id); - $log->debug("Qty is".$qty); - - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - $log->debug("Prd Qty in Stock ".$qtyinstk); - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - } - -} - -function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty) -{ - global $current_user; - global $adb; - global $log; - $reorderlevel = getPrdReOrderLevel($product_id); - $log->debug("Prd reorder level ".$reorderlevel); - if($upd_qty < $reorderlevel) - { - - //send mail to the handler - $log->debug("Sending mail to handler "); - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $log->debug("Handler Name is ".$handler_name); - $to_address= getUserEmail($handler); - $log->debug("Handler Email is ".$to_address); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='QuoteNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); - $body = str_replace('{QUOTEQUANTITY}',$qty,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("Quotes",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } - -} - - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Mar 30 06:12:11 2006 @@ -78,7 +78,7 @@ $query ="insert into soproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder'); } } $return_id = $focus->id; @@ -91,111 +91,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $adb; - global $current_user; - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - } - -} - - -function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty) -{ - global $current_user; - global $adb; - $reorderlevel = getPrdReOrderLevel($product_id); - if($upd_qty < $reorderlevel) - { - - //send mail to the handler - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $to_address= getUserEmail($handler); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='SalesOrderNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); - $body = str_replace('{SOQUANTITY}',$qty,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("SalesOrder",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } -} - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:13:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:13:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4781 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060330131328.8627D5903BA@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:13:23 2006 New Revision: 4781 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Thu Mar 30 06:13:23 2006 @@ -89,29 +89,13 @@ //<<<<>>>> if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } if(isPermitted('Products',2,'') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - $customstrings =' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -188,7 +172,8 @@ $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:15:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:15:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4782 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060330131556.0D3C9590424@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:15:52 2006 New Revision: 4782 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Thu Mar 30 06:15:52 2006 @@ -83,26 +83,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $custom_view_strings=' - - '.$cvHTML; - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -111,7 +93,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); -$smarty->assign("CUSTOMVIEW",$custom_view_strings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $category = getParentTab(); $smarty->assign("CATEGORY",$category); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:18:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:18:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4783 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060330131806.C24D2590423@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:18:02 2006 New Revision: 4783 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Thu Mar 30 06:18:02 2006 @@ -87,25 +87,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customstrings = ' - - '.$cvHTML; - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -114,7 +97,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Quote'); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:20:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:20:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4784 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060330132038.58742590432@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:20:33 2006 New Revision: 4784 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Thu Mar 30 06:20:33 2006 @@ -111,24 +111,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - $customstrings = ' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} //<<<<<<<<>>>>>>>> if($viewid != "0") @@ -212,7 +196,8 @@ $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:22:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:22:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4785 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060330132256.5450B590421@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:22:52 2006 New Revision: 4785 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Thu Mar 30 06:22:52 2006 @@ -78,25 +78,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customviewstrings =' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -160,7 +143,8 @@ $listview_entries = getListViewEntries($focus,"Vendors",$list_result,$navigation_array,'','&return_module=Vendors&return_action=index','EditView','Delete',$oCustomView); $smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Vendors","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','vendorname','true','basic',"","","","",$viewid); $smarty->assign("ALPHABETICAL", $alphabetical); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:26:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:26:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4786 - in /vtigercrm/trunk: include/js/Inventory.js modules/Invoice/Invoice.js modules/PurchaseOrder/PurchaseOrder.js modules/Quotes/Quote.js modules/SalesOrder/SalesOrder.js Message-ID: <20060330132650.2A7ED5865F4@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:26:31 2006 New Revision: 4786 Log: common fns moved to inventory.js Modified: vtigercrm/trunk/include/js/Inventory.js vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js vtigercrm/trunk/modules/Quotes/Quote.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Thu Mar 30 06:26:31 2006 @@ -44,3 +44,209 @@ } +function settotalnoofrows() { + document.EditView.totalProductCount.value = rowCnt; +} + +function productPickList(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=inventory_prod&curr_row="+rowId,"productWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200"); +} + +function priceBookPickList(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + window.open("index.php?module=PriceBooks&action=Popup&html=Popup_picker&form=EditView&popuptype=inventory_pb&fldname=txtListPrice"+rowId+"&productid="+getObj("hdnProductId"+rowId).value,"priceBookWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200"); +} + + +function getProdListBody() { + if (browser_ie) { + var prodListBody=getObj("productList").children[0].children[0] + } else if (browser_nn4 || browser_nn6) { + if (getObj("productList").childNodes.item(0).tagName=="TABLE") { + var prodListBody=getObj("productList").childNodes.item(0).childNodes.item(0) + } else { + var prodListBody=getObj("productList").childNodes.item(1).childNodes.item(1) + } + } + return prodListBody; +} + +function delRow(rowId) { + var rowId=parseInt(rowId.substr(rowId.indexOf("w")+1,rowId.length)) + //removing the corresponding row + var prodListBody=getProdListBody() + prodListBody.removeChild(getObj("row"+rowId)) + //assigning new innerHTML after deleting a row + var newInnerHTML=""+getObj("tablehead").innerHTML+"" + newInnerHTML+=""+getObj("tableheadline").innerHTML+""; + var rowArray=new Array(rowCnt-1); + if (browser_nn4 || browser_nn6) { + var product=new Array(rowCnt-1) + var qty=new Array(rowCnt-1) + var listPrice=new Array(rowCnt-1) + var productId=new Array(rowCnt-1) + var total=new Array(rowCnt-1) + var rowStatus=new Array(rowCnt-1) + } + for (var i=1,k=0;i<=rowId-1;i++,k++) { + if (i%2==0) var rowClass="evenListRow" + else var rowClass="oddListRow" + rowArray[k]=""+getObj("row"+i).innerHTML+"" + newInnerHTML+=rowArray[k] + if (browser_nn4 || browser_nn6) { + product[k]=getObj("txtProduct"+i).value + qty[k]=getObj("txtQty"+i).value + listPrice[k]=getObj("txtListPrice"+i).value + total[k]=getObj("hdnTotal"+i).value + productId[k]=getObj("hdnProductId"+i).value + rowStatus[k]=getObj("hdnRowStatus"+i).value + } + } + for (var i=rowId+1;i<=rowCnt;i++,k++) { + rowArray[k]=getObj("row"+i).innerHTML + var temp=rowArray[k] + temp=temp.replace("row"+i,"row"+(i-1)) + temp=temp.replace("txtProduct"+i,"txtProduct"+(i-1)) + temp=temp.replace("txtProduct"+i,"txtProduct"+(i-1)) + temp=temp.replace("qtyInStock"+i,"qtyInStock"+(i-1)) + temp=temp.replace("txtQty"+i,"txtQty"+(i-1)) + temp=temp.replace("txtQty"+i,"txtQty"+(i-1)) + temp=temp.replace("unitPrice"+i,"unitPrice"+(i-1)) + temp=temp.replace("txtListPrice"+i,"txtListPrice"+(i-1)) + temp=temp.replace("txtListPrice"+i,"txtListPrice"+(i-1)) + temp=temp.replace("total"+i,"total"+(i-1)) + temp=temp.replace("delRow"+i,"delRow"+(i-1)) + temp=temp.replace("hdnProductId"+i,"hdnProductId"+(i-1)) + temp=temp.replace("hdnProductId"+i,"hdnProductId"+(i-1)) + temp=temp.replace("hdnRowStatus"+i,"hdnRowStatus"+(i-1)) + temp=temp.replace("hdnRowStatus"+i,"hdnRowStatus"+(i-1)) + temp=temp.replace("hdnTotal"+i,"hdnTotal"+(i-1)) + temp=temp.replace("hdnTotal"+i,"hdnTotal"+(i-1)) + if ((i-1)%2==0) var rowClass="evenListRow" + else var rowClass="oddListRow" + rowArray[k]=""+temp+"" + newInnerHTML+=rowArray[k] + if (browser_nn4 || browser_nn6) { + product[k]=getObj("txtProduct"+i).value + qty[k]=getObj("txtQty"+i).value + listPrice[k]=getObj("txtListPrice"+i).value + total[k]=getObj("hdnTotal"+i).value + productId[k]=getObj("hdnProductId"+i).value + rowStatus[k]=getObj("hdnRowStatus"+i).value + } } + + var prodListBody=getProdListBody() + prodList.innerHTML=listTableStart+newInnerHTML+"
    '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -
    " + + rowCnt-- + + for (var i=1,k=0;i<=rowCnt;i++,k++) { + if (browser_nn4 || browser_nn6) { + getObj("txtProduct"+i).value=product[k] + getObj("txtQty"+i).value=qty[k] + getObj("txtListPrice"+i).value=listPrice[k] + getObj("hdnTotal"+i).value=total[k] + getObj("hdnProductId"+i).value=productId[k] + getObj("hdnRowStatus"+i).value=rowStatus[k] + } + } + + calcGrandTotal() +} + + +function calcTotal(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + var total=eval(getObj("txtQty"+rowId).value*getObj("txtListPrice"+rowId).value) + getObj("total"+rowId).innerHTML=getObj("hdnTotal"+rowId).value=roundValue(total.toString()) + calcGrandTotal() +} + +function calcGrandTotal() { + var subTotal=0,grandTotal=0; + for (var i=1;i<=rowCnt;i++) { + if (getObj("hdnTotal"+i).value=="") + getObj("hdnTotal"+i).value=0 + if (!isNaN(getObj("hdnTotal"+i).value)) + subTotal+=parseFloat(getObj("hdnTotal"+i).value) + } + + grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value) + + getObj("subTotal").innerHTML=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) + getObj("grandTotal").innerHTML=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) +} + +//Method changed as per advice by jon http://forums.vtiger.com/viewtopic.php?t=4162 +function roundValue(val) { + val = parseFloat(val); + val = Math.round(val*100)/100; + val = val.toString(); + + if (val.indexOf(".")<0) { + val+=".00" + } else { + var dec=val.substring(val.indexOf(".")+1,val.length) + if (dec.length>2) + val=val.substring(0,val.indexOf("."))+"."+dec.substring(0,2) + else if (dec.length==1) + val=val+"0" + } + + return val; +} + function validate() { + if(!formValidate()) + return false + if(!FindDuplicate()) + return false; + if(rowCnt == 0) + { + alert('No product is selected. Select atleast one Product'); + return false; + } + + + for (var i=1;i<=rowCnt;i++) { + if (!emptyCheck("txtProduct"+i,"Product","text")) return false + if (!emptyCheck("txtQty"+i,"Qty","text")) return false + if (!numValidate("txtQty"+i,"Qty","any")) return false + if (!numConstComp("txtQty"+i,"Qty","GE","1")) return false + if (!emptyCheck("txtListPrice"+i,"List Price","text")) return false + if (!numValidate("txtListPrice"+i,"List Price","any")) return false } + if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) + if (!numValidate("txtTax","Tax","any")) return false + if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) + if (!numValidate("txtAdjustment","Adjustment","any")) return false + + return true + } + +function FindDuplicate() +{ + var product_id = new Array(rowCnt-1); + var product_name = new Array(rowCnt-1); + product_id[1] = getObj("hdnProductId"+1).value; + product_name[1] = getObj("txtProduct"+1).value; + for (var i=1;i<=rowCnt;i++) + { + for(var j=i+1;j<=rowCnt;j++) + { + if(i == 1) + { + product_id[j] = getObj("hdnProductId"+j).value; + } + if(product_id[i] == product_id[j]) + { + alert("You have selected < "+getObj("txtProduct"+j).value+" > more than once in line items "+i+" & "+j+".\n Please select it once and change the Qty"); + return false; + } + } + } + return true; +} + Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Thu Mar 30 06:26:31 2006 @@ -10,218 +10,11 @@ document.write(" {* Begining of Slide Menu *} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:09:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:09:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4808 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060331080921.942CB595377@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:09:17 2006 New Revision: 4808 Log: array name has been changed Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:10:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:10:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4809 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060331081055.1B43B5958E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:10:50 2006 New Revision: 4809 Log: Campaign tables modified Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Mar 31 01:10:50 2006 @@ -1715,29 +1715,29 @@ - - - - + + + - + - + - + + Type=InnoDB - + campaignstatus @@ -7386,7 +7386,7 @@
    - +
    @@ -7411,8 +7411,8 @@
    - - +
    + @@ -7436,8 +7436,8 @@
    - - +
    + @@ -7732,14 +7732,6 @@
    - - - - - - - - ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:11:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:11:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4810 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060331081139.BA6C25958E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:11:34 2006 New Revision: 4810 Log: values in combotables array has been modified Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Fri Mar 31 01:11:34 2006 @@ -40,7 +40,7 @@ { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedrevenue','actualcost','expectedresponse'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:12:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:12:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4811 - in /vtigercrm/trunk: include/RelatedListView.php include/utils/CommonUtils.php modules/uploads/downloadfile.php Message-ID: <20060331081256.2658C5958E0@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:12:48 2006 New Revision: 4811 Log: * Modified to make attachment work properly Modified: vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/uploads/downloadfile.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Mar 31 01:12:48 2006 @@ -1411,6 +1411,29 @@ } } +/** + * This function is used to get the File Storage Path in the server. + * @param int $attachmentid - file attachment id ie., crmid of the attachment + * @param string $filename - file name + * return string $filepath - filepath inwhere the file stored in the server will be return +*/ +function getFilePath($attachmentid,$filename) +{ + global $adb; + global $root_directory; + + $query = 'select crmid, setype, smownerid, users.user_name from crmentity inner join users on crmentity.smownerid=users.id where crmid='.$attachmentid; + $res = $adb->query($query); + + $user_name = $adb->query_result($res,0,'user_name'); + + if(is_file($root_directory.'storage/user_'.$user_name.'/attachments/'.$filename)) + $filepath = $root_directory.'storage/user_'.$user_name.'/attachments/'; + else + $filepath = $root_directory.'test/upload/'; + + return $filepath; +} Modified: vtigercrm/trunk/modules/uploads/downloadfile.php ============================================================================== --- vtigercrm/trunk/modules/uploads/downloadfile.php (original) +++ vtigercrm/trunk/modules/uploads/downloadfile.php Fri Mar 31 01:12:48 2006 @@ -15,34 +15,31 @@ global $adb; global $fileId; -$fileid = $_REQUEST['fileid']; - -//$dbQuery = "SELECT * from seattachmentsrel where crmid = '" .$fileid ."'"; -//$attachmentsid = $adb->query_result($adb->query($dbQuery),0,'attachmentsid'); -$attachmentsid = $fileid; +$attachmentsid = $_REQUEST['fileid']; +$entityid = $_REQUEST['entityid']; $returnmodule=$_REQUEST['return_module']; -if($_REQUEST['activity_type']=='Attachments') - $attachmentsid=$fileid; - -$dbQuery = "SELECT * FROM attachments "; -$dbQuery .= "WHERE attachmentsid = " .$attachmentsid ; +$dbQuery = "SELECT * FROM attachments WHERE attachmentsid = " .$attachmentsid ; $result = $adb->query($dbQuery) or die("Couldn't get file list"); if($adb->num_rows($result) == 1) { $fileType = @$adb->query_result($result, 0, "type"); $name = @$adb->query_result($result, 0, "name"); - $fileContent = @$adb->query_result($result, 0, "attachmentcontents"); - $size = @$adb->query_result($result, 0, "attachmentsize"); + + $filepath = getFilePath($attachmentsid,$name); + $filesize = filesize($filepath.$name); + $fileContent = fread(fopen($filepath.$name, "r"), $filesize); + + $org_filename = ltrim($name,$entityid.'_'); header("Content-type: $fileType"); - //header("Content-length: $size"); + header("Content-length: $filesize"); header("Cache-Control: private"); - header("Content-Disposition: attachment; filename=$name"); + header("Content-Disposition: attachment; filename=$org_filename"); header("Content-Description: PHP Generated Data"); - echo base64_decode($fileContent); + echo $fileContent; } else { From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:14:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:14:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4812 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060331081456.968F15958FC@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:14:51 2006 New Revision: 4812 Log: typeofdata has been modified Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Mar 31 01:14:51 2006 @@ -355,8 +355,8 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:23:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:23:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4813 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060331082346.2E1165959D0@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:23:40 2006 New Revision: 4813 Log: release notes updated for alpha4 Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Mar 31 01:23:40 2006 @@ -18,6 +18,151 @@

    +

    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,

    +

    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. +
    2. Features
      3. +
    +

    1. Summary

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

    8

    +
    2 Product SizePlatform Independent - 8.3 MB
    +     Windows (EXE) - 28 MB
    + Linux (BIN) - 43 MB
    4 Database MigrationNot 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_ALPHA4
    +

    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 @@ -49,10 +194,10 @@ CRM 5.x category

    Table of Contents

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

    1. Summary

    +

    1. Summary

    @@ -97,7 +242,7 @@
    -

    2. Features

    +

    2. Features

    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:34:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:34:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4814 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060331083430.0FEE53DAA68@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:34:18 2006 New Revision: 4814 Log: * Modified to display the original file name in the detailview and removed the unwanted parameters passing to download link Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Fri Mar 31 01:34:18 2006 @@ -253,7 +253,10 @@ $attachquery = "select * from attachments where attachmentsid=".$attachmentid; $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name'); } - $custfldval = ''.$col_fields[$fieldname].''; + + //This is added to strip the crmid and _ from the file name and show the original filename + $org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_'); + $custfldval = ''.$org_filename.''; $label_fld[] =$mod_strings[$fieldlabel]; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:35:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:35:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4815 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060331083553.99A085959FB@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:35:34 2006 New Revision: 4815 Log: * Removed the unwanted parameter passing to file download link Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 00:36:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:36:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4816 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060331083636.221285959FF@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:36:27 2006 New Revision: 4816 Log: id has been set for campaign Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 01:16:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:16:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4817 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060331091618.DF13F595A0D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:16:13 2006 New Revision: 4817 Log: version number changed Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 01:30:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:30:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4818 - in /vtigercrm/trunk/install: 0welcome.php 1checkSystem.php 2setConfig.php 3confirmConfig.php 4createConfigFile.php 5createTables.php populateSeedData.php Message-ID: <20060331093003.EC6144CB0F3@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:29:54 2006 New Revision: 4818 Log: vigercrm 5 alpha version changed Modified: vtigercrm/trunk/install/0welcome.php vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.php vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 01:50:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:50:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4819 - in /vtigercrm/trunk: include/images/loginAlpha.gif themes/blue/images/loginAlpha.gif Message-ID: <20060331095011.119965857BE@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:50:02 2006 New Revision: 4819 Log: alpha version changed Modified: vtigercrm/trunk/include/images/loginAlpha.gif vtigercrm/trunk/themes/blue/images/loginAlpha.gif Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/loginAlpha.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 02:23:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:23:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4820 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060331102311.B25BC587E47@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 03:23:07 2006 New Revision: 4820 Log: issue in create view has been fixed Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Fri Mar 31 03:23:07 2006 @@ -44,7 +44,7 @@ } else { - $productBlock[] = Array('Product Details' => 'Product Details'); + $productBlock[] = Array(Array()); } return $productBlock; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 02:35:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:35:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4821 - /vtigercrm/trunk/include/js/Inventory.js Message-ID: <20060331103533.79A1659623E@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 03:35:27 2006 New Revision: 4821 Log: javascript issue fixed to calc total Modified: vtigercrm/trunk/include/js/Inventory.js Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Fri Mar 31 03:35:27 2006 @@ -177,8 +177,8 @@ grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value) - getObj("subTotal").innerHTML=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) - getObj("grandTotal").innerHTML=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) + getObj("subTotal").value=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) + getObj("grandTotal").value=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) } //Method changed as per advice by jon http://forums.vtiger.com/viewtopic.php?t=4162 From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 02:47:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:47:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4822 - in /vtigercrm/trunk/pkg/apache/conf: lin_httpd.conf win_httpd.conf Message-ID: <20060331104703.B61A2595ACA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 31 03:46:57 2006 New Revision: 4822 Log: apache parameters changed to enhance performance Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 31 03:46:57 2006 @@ -48,6 +48,13 @@ # Do NOT add a slash at the end of the directory path. # ServerRoot "VTIGERCRM/vtigerCRM5_beta/apache" +#refer http://www.faqs.org/docs/securing/chap29sec245.html +MinSpareServers 16 +MaxSpareServers 64 +StartServers 16 +MaxClients 512 +MaxRequestsPerChild 100000 + # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. @@ -119,7 +126,7 @@ MinSpareServers 10 MaxSpareServers 15 MaxClients 150 -MaxRequestsPerChild 0 +MaxRequestsPerChild 100000 # worker MPM Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Fri Mar 31 03:46:57 2006 @@ -55,6 +55,12 @@ # Do NOT add a slash at the end of the directory path. # ServerRoot "VTIGER_HOME/apache" +#reference http://www.faqs.org/docs/securing/chap29sec245.html +MinSpareServers 16 +MaxSpareServers 64 +StartServers 16 +MaxClients 512 +MaxRequestsPerChild 100000 # # ScoreBoardFile: File used to store internal server process information. @@ -88,7 +94,7 @@ # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html -MaxKeepAliveRequests 100 +MaxKeepAliveRequests 300 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. @@ -104,7 +110,7 @@ # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 -MaxRequestsPerChild 0 +MaxRequestsPerChild 100000 # From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:09:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 11:09:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4823 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060331110902.7B4594E492D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 04:08:57 2006 New Revision: 4823 Log: Removed source code label Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Mar 31 04:08:57 2006 @@ -72,25 +72,20 @@ Linux (BIN) - 43 MB - + - + - + - - - - -
    4 3 Database Migration Not Available
    5 4 vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. URL: Click Here
    6 5 Product Documentation Available at the Wiki
    8 Source Code LabelVTIGERCRM_5_ALPHA4
    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 04:39:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 12:39:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4824 - /vtigercrm/trunk/modules/Contacts/Save.php Message-ID: <20060331123922.A813D587E60@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 05:39:17 2006 New Revision: 4824 Log: * Removed the unwanted lines and moved the function makeRandoPassword to top of the file Modified: vtigercrm/trunk/modules/Contacts/Save.php Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 12:15:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 31 Mar 2006 20:15:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2374=3A_I?= =?utf-8?q?nstallation_Pb_step_4?= Message-ID: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> #74: Installation Pb step 4 -----------------------+---------------------------------------------------- Reporter: oitsuki | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Hello, When I want install vtiger 5 alpha 4, I have this pb : Creating Core tables: Table 'vtiger5.quotegrouprelation' doesn't existError: Tables partially created. Table creation failed. My configuration is : windows xp Version de Apache: Apache/1.3.33 (Win32) Version de PHP: 4.3.11 Version de MySQL: 4.1.18-nt-log - extension : mysql I changed the time out at 300, the memory at 16 I tried several time to install de pb but I have always the same pb. Is it to have a sql.txt inside de program for implement manual the database. I know it 's big ! But it's interesting, I think. Regards Oitsuki -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 17:34:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:34:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= Message-ID: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function -----------------------+---------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: postgres | -----------------------+---------------------------------------------------- Using the mysql DATE_FORMAT function doesn't work with other database types. All instances should be replaced with the adodb function SQLDate. Blocks #17. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 17:34:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:34:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= In-Reply-To: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> References: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> Message-ID: <085.0df6e716c9cc09aa8e7c3f84aa7eb564@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 17:40:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:40:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= In-Reply-To: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> References: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> Message-ID: <085.cfc68f5a82d535dbffa25ad00b54d858@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: postgres ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [4825]) Modified getDBDateString function to be a wrapper for adodb's SQLDate function with a default formatting and used it where needed to replace DATE_FORMAT. Closes #75. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 17:40:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 01:40:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4825 - in /vtigercrm/branches/4.2_postgresql_integration: include/database/PearDatabase.php modules/Products/Product.php sendreminder.php Message-ID: <20060401014058.5952C58576A@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 18:40:54 2006 New Revision: 4825 Log: Modified getDBDateString function to be a wrapper for adodb's SQLDate function with a default formatting and used it where needed to replace DATE_FORMAT. Closes #75. Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php vtigercrm/branches/4.2_postgresql_integration/sendreminder.php Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Fri Mar 31 18:40:54 2006 @@ -930,11 +930,11 @@ return $date; } -function getDBDateString($datecolname) +function getDBDateString($datecolname, $format='Y-m-d, H:i:s') { $this->checkConnection(); $db = &$this->database; - $datestr = $db->SQLDate("Y-m-d, H:i:s" ,$datecolname); + $datestr = $db->SQLDate($format ,$datecolname); return $datestr; } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php Fri Mar 31 18:40:54 2006 @@ -215,27 +215,29 @@ function create_export_query(&$order_by, &$where) { + global $adb; + if($this->checkIfCustomTableExists()) { $query = $this->constructCustomQueryAddendum() . ", products.productid productid, - products.productname productname, - products.productcode productcode, - products.productcategory productcategory, - products.manufacturer manufacturer, - products.product_description product_description, - products.qty_per_unit qty_per_unit, - products.unit_price unit_price, - products.weight weight, - products.pack_size pack_size, - DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date, - DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date, - products.cost_factor cost_factor, - products.commissionrate commissionrate, - products.commissionmethod commissionmethod, - products.discontinued discontinued, + products.productname AS productname, + products.productcode AS productcode, + products.productcategory AS productcategory, + products.manufacturer AS manufacturer, + products.product_description AS product_description, + products.qty_per_unit AS qty_per_unit, + products.unit_price AS unit_price, + products.weight AS weight, + products.pack_size AS pack_size, " + .$adb->getDBDateString('products.start_date', 'Y-M-D')." AS start_date, " + .$adb->getDBDateString('products.expiry_date', 'Y-M-D')." AS expiry_date, + products.cost_factor AS cost_factor, + products.commissionrate AS commissionrate, + products.commissionmethod AS commissionmethod, + products.discontinued AS discontinued, products.sales_start_date AS sales_start_date, products.sales_end_date AS sales_end_date, products.usageunit AS usageunit, @@ -260,22 +262,22 @@ else { $query = "SELECT - products.productid productid, - products.productname productname, - products.productcode productcode, - products.productcategory productcategory, - products.manufacturer manufacturer, - products.product_description product_description, - products.qty_per_unit qty_per_unit, - products.unit_price unit_price, - products.weight weight, - products.pack_size pack_size, - DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date, - DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date, - products.cost_factor cost_factor, - products.commissionrate commissionrate, - products.commissionmethod commissionmethod, - products.discontinued discontinued, + products.productid AS productid, + products.productname AS productname, + products.productcode AS productcode, + products.productcategory AS productcategory, + products.manufacturer AS manufacturer, + products.product_description AS product_description, + products.qty_per_unit AS qty_per_unit, + products.unit_price AS unit_price, + products.weight AS weight, + products.pack_size AS pack_size, " + .$adb->getDBDateString('products.start_date', 'Y-M-D')." AS start_date, " + .$adb->getDBDateString('products.expiry_date', 'Y-M-D')." AS expiry_date, + products.cost_factor AS cost_factor, + products.commissionrate AS commissionrate, + products.commissionmethod AS commissionmethod, + products.discontinued AS discontinued, products.sales_start_date AS sales_start_date, products.sales_end_date AS sales_end_date, products.usageunit AS usageunit, Modified: vtigercrm/branches/4.2_postgresql_integration/sendreminder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/sendreminder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/sendreminder.php Fri Mar 31 18:40:54 2006 @@ -33,7 +33,7 @@ $vtlog->logthis(" invoked sendreminder ",'debug'); //modified query for recurring events -Jag - $query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where DATE_FORMAT(activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; +$query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where ".$adb->getDBDateString('activity.date_start', 'Y-m-d, H:i:s')." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; $result = $adb->query($query); From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 17:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.1749b9ad82ed3a9c7f46d622c06a907c@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4826]) Added more select aliases for export links. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 17:48:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 01:48:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4826 - /vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Message-ID: <20060401014829.5AD2859668E@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 18:48:18 2006 New Revision: 4826 Log: Added more select aliases for export links. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Fri Mar 31 18:48:18 2006 @@ -312,8 +312,8 @@ if($this->checkIfCustomTableExists()) { $query = $this->constructCustomQueryAddendum() .", potential.*, - account.accountname account_name, - users.user_name assigned_user_name + account.accountname AS account_name, + users.user_name AS assigned_user_name FROM potential INNER JOIN crmentity ON crmentity.crmid=potential.potentialid @@ -325,8 +325,8 @@ { $query = "SELECT potential.*, - account.accountname account_name, - users.user_name assigned_user_name + account.accountname AS account_name, + users.user_name AS assigned_user_name FROM potential inner join crmentity on crmentity.crmid=potential.potentialid LEFT JOIN users ON crmentity.smcreatorid=users.id LEFT JOIN account on potential.accountid=account.accountid LEFT JOIN potentialscf on potentialscf.potentialid=potential.potentialid where crmentity.deleted=0 "; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 18:24:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 02:24:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4827 - /vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Message-ID: <20060401022451.979AF5966BA@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 19:24:49 2006 New Revision: 4827 Log: Moved adb call to after it's declaration. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Fri Mar 31 19:24:49 2006 @@ -176,12 +176,12 @@ function insertIntoAttachment($id,$module) { - $date_var = $adb->database->DBTimeStamp(date('YmdHis')); global $current_user; global $adb; global $root_directory; global $upload_badext; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $this->column_fields['assigned_user_id']; $adb->println("insertattach ownerid=".$ownerid." mod=".$module); $adb->println($this->column_fields); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 00:36:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 05:36:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4021 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060301053625.0FF3C4A5985@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 22:36:21 2006 New Revision: 4021 Log: version changed Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 00:37:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 05:37:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4022 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060301053716.99B774A5985@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 22:37:12 2006 New Revision: 4022 Log: echo has been removed Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 00:49:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 05:49:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4023 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060301054915.81E5349EF9F@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 22:49:09 2006 New Revision: 4023 Log: permission check added for install folder Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 01:10:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 06:10:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4024 - in /vtigercrm/trunk: Smarty/templates/UserDetailView.tpl Smarty/templates/UserEditView.tpl modules/Users/DetailView.php Message-ID: <20060301061025.8B7CF36B75F@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 23:10:16 2006 New Revision: 4024 Log: date format has been added Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue Feb 28 23:10:16 2006 @@ -155,6 +155,12 @@     		{$UMOD.LBL_HOME_PHONE} {$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE} {$SIGNATURE}{$UMOD.LBL_USER_IMAGE}  {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}
    - Upload vtiger CRM - Users' photos.(Not Working)Upload vtiger CRM + Users' photos.
    19 - Resize the users photos and create - thumbnails.(Not Working)Resize the users photos and create + thumbnails.
    20 From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 01:19:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 06:19:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4026 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060301061952.6430749E314@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 23:19:48 2006 New Revision: 4026 Log: password ahanged to password type Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Feb 28 23:19:48 2006 @@ -73,9 +73,9 @@ {if $MODE neq 'edit'}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. - URL: Click + URL: Click Here
    - Activity Reminder Notication + Activity Reminder Notification email
    "; }}} with this: {{{ $coltotalhtml .= "
    TotalsSUMAVGMINMAX
    "; }}} -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 11:50:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:50:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2353=3A_D?= =?utf-8?q?atabase_schema_constraints?= In-Reply-To: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> References: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> Message-ID: <085.8f16505f91ffc7aabb8d24fbfe7d79eb@vtiger.fosslabs.com> #53: Database schema constraints ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: constraint database schema ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: => 4.2.5 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 11:50:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:50:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.2b1f9b908db41d14acb12d6c2a739144@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: -----------------------------------------------+---------------------------- Changes (by mfedyk): * milestone: => 4.2.4 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 11:56:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:56:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2355=3A_D?= =?utf-8?q?uplicate_Accounts_are_created_during_lead_conversion_when_leads?= =?utf-8?q?_have_same_company_name?= Message-ID: <076.b897bdb9c4e852783f0ea4a5577c5a42@vtiger.fosslabs.com> #55: Duplicate Accounts are created during lead conversion when leads have same company name -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- When converting LeadA and LeadB when both have the same company name there are multiple accounts created. The new contact should be added to the existing account. Please anyone find some reason why there should ever be two accounts with the same name. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 11:58:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 16:58:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2356=3A_D?= =?utf-8?q?uring_lead_conversion_notes_are_not_associated_with_the_convert?= =?utf-8?q?ed_contact?= Message-ID: <076.5d392144e66a3940d9fd691dc0304bdb@vtiger.fosslabs.com> #56: During lead conversion notes are not associated with the converted contact -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- It is associated with the account. It looks like one field is not being populated during conversion. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 1 14:47:17 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 01 Mar 2006 19:47:17 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2357=3A_U?= =?utf-8?q?se_vtigercrm-5=2E0=2E0alpha2_notation_in_release_notes_and_web_?= =?utf-8?q?links?= Message-ID: <076.a29911f6825ebde1aa3b343ccbed6484@vtiger.fosslabs.com> #57: Use vtigercrm-5.0.0alpha2 notation in release notes and web links -----------------------+---------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: minor | Milestone: 5.0.0 Component: vtigercrm | Version: 5.0.0 Keywords: packaging | -----------------------+---------------------------------------------------- Noticing that the vtigercrm team is gearing up for the vtigercrm-5.0.0alpha2 release, I would like to remind the release managers to please use the naming conventions discussed in the forums some months ago, and currently followed by the vtigercrm/branches/4.2 maintainers. changeset:4028 is still using vtiger, crm, _CRM_ and others in inconsistent ways. predictable spelling of all package files are the price of entry for asking distributions to add vtigercrm to their package trees. Most of these packaging systems automate download with an expression, and can't spelling vagaries for the packaged files. predictable spelling of all references to the brand and branded files will help us with marketing, search ranking, etc. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 1 18:11:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 01 Mar 2006 23:11:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4031 - /vtigercrm/branches/4.2/install/5createTables.php Message-ID: <20060301231134.8D8502BF097@vtiger.fosslabs.com> Author: fathi Date: Wed Mar 1 16:11:12 2006 New Revision: 4031 Log: (empty) Modified: vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Wed Mar 1 16:11:12 2006 @@ -12,6 +12,7 @@ * All Rights Reserved. * Contributor(s): ______________________________________. ********************************************************************************/ + /********************************************************************************* * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/5createTables.php,v 1.58 2005/04/19 16:57:08 ray Exp $ * Description: Executes a step in the installation process. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 02:34:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 07:34:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4032 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060302073454.906EE3F5F37@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 00:34:47 2006 New Revision: 4032 Log: mysql server version check added Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 02:42:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 07:42:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4033 - in /vtigercrm/trunk/Smarty/templates: UserDetailView.tpl UserEditView.tpl UserListView.tpl Message-ID: <20060302074254.206DF2DE745@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 00:42:47 2006 New Revision: 4033 Log: menu added for Users page Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl vtigercrm/trunk/Smarty/templates/UserEditView.tpl vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 2 00:42:47 2006 @@ -235,22 +235,4 @@
    {$mod_strings['LBL_COLUMNS']}{$mod_strings['LBL_COLUMNS_SUM']}{$mod_strings['LBL_COLUMNS_AVERAGE']}{$mod_strings['LBL_COLUMNS_LOW_VALUE']}{$mod_strings['LBL_COLUMNS_LARGE_VALUE']}
    {$JAVASCRIPT} - - - - - - - - - - - - - - - - - - - + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Thu Mar 2 00:42:47 2006 @@ -248,21 +248,4 @@ {$JAVASCRIPT} - - - - - - - - - - - - - - - - - - + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Thu Mar 2 00:42:47 2006 @@ -66,3 +66,5 @@ + {include file='SettingsSubMenu.tpl'} + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 09:13:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:13:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4034 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060302141311.7EF8F2BF0A9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:13:07 2006 New Revision: 4034 Log: demo data has been included for campaign module Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 09:17:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:17:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4035 - /vtigercrm/trunk/modules/Contacts/contactSeedData.php Message-ID: <20060302141721.38AA53D1903@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:17:16 2006 New Revision: 4035 Log: demo data for campaign module has been included Modified: vtigercrm/trunk/modules/Contacts/contactSeedData.php Modified: vtigercrm/trunk/modules/Contacts/contactSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 09:21:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:21:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4036 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060302142124.4237C43B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:21:19 2006 New Revision: 4036 Log: calenar month view has been integrated Added: vtigercrm/trunk/modules/Calendar/calendar_monthview.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 09:22:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:22:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4037 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060302142238.9586743B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:22:31 2006 New Revision: 4037 Log: weekview has been integrated Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 2 07:22:31 2006 @@ -43,7 +43,7 @@ Modified: vtigercrm/trunk/index.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 11:17:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 16:17:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4041 - in /vtigercrm/trunk/modules/Contacts: ./ imgs/ js/ Message-ID: <20060302161738.A68B62DE745@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 09:17:20 2006 New Revision: 4041 Log: ajax chat integrated Added: vtigercrm/trunk/modules/Contacts/chat.css vtigercrm/trunk/modules/Contacts/chat.php vtigercrm/trunk/modules/Contacts/imgs/ vtigercrm/trunk/modules/Contacts/imgs/box_BL.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_BR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_M.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_ML.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_MR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_T.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_TL.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/box_TR.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_close.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_hide.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/btn_send.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/bx_B.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/close.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/hide.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/icone_chat.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/icone_keyb.gif (with props) vtigercrm/trunk/modules/Contacts/imgs/site_bg.gif (with props) vtigercrm/trunk/modules/Contacts/js/ vtigercrm/trunk/modules/Contacts/js/ajax.js vtigercrm/trunk/modules/Contacts/js/chat.js vtigercrm/trunk/modules/Contacts/js/css-window_p.js vtigercrm/trunk/modules/Contacts/js/dom-drag_p.js vtigercrm/trunk/modules/Contacts/vtchat.php From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 01:17:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 06:17:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4042 - in /vtigercrm/trunk: Smarty/templates/SettingsMenu.tpl include/js/menu.js themes/blue/style.css Message-ID: <20060303061800.3844936B75F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 23:17:51 2006 New Revision: 4042 Log: slide menu integrated for settings Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/include/js/menu.js vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Mar 2 23:17:51 2006 @@ -3,12 +3,12 @@
    -pref; $ts = mktime(12,0,0,substr($this->t,4,2),substr($this->t,6,2),substr($this->t,0,4)); - $xy=Date("w",$ts); + $xy=Date("w",$ts); /* Back to last Monday or Sunday before ts */ while ( Date("w",$ts) != $this->pref->weekstart ) { @@ -133,87 +134,98 @@ echo " {/if} - +
    "; + echo " +
    + Time filter : + +
    "; + echo "
    "; + echo ""; $day = 0; $col = 1; $dd = new DateTime(); - while ( $day < 8 ) { - if ($day!=7) { - $dd->setDateTimeTS($ts); - $d = $dd->getDate(); - $tref = Date("Ymd",$ts); - $dinfo = GetDaysInfo($ts); - /* Select appointments for this day */ - - $from = new DateTime(); - $to = new DateTime(); - $from->setDateTimeTS($ts - 12 * 3600); - $to->setDateTimeTS($ts - 12 * 3600); - #$to->addDays(7); - $this->pref->callist = array(); - appointment::readCal($this->pref,$from,$to); - - $next = NextDay($ts); - - if ( $col == 1 ) { - echo " \n"; - } - - echo " \n"; - if ( $col == 2 ) { - echo " \n"; - $col = 0; - } - - $day++; - $col++; - $ts = $next; - } else { - echo "\n"; - $day++; - $col++; - } - } + } + + + echo "

    "; + echo "+"; + echo"
    "; + } + } + echo ""; + } + if ( $col == 2 ) { echo " \n"; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 09:24:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 14:24:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4038 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060302142451.E768043B44E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 07:24:48 2006 New Revision: 4038 Log: calendar_monview.php has been included Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Thu Mar 2 07:24:48 2006 @@ -24,7 +24,7 @@ if ($mysel=="") { include "calendar_dayview.php"; } if ($mysel=="day") { include "calendar_dayview.php"; } if ($mysel=="week") { include "calendar_weekview.php"; } - if ($mysel=="month") { include "monthview.php"; } + if ($mysel=="month") { include "calendar_monthview.php"; } if ($mysel=="year") { include "yearview.php"; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 10:58:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 15:58:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4039 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060302155813.698153F5F44@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 08:58:08 2006 New Revision: 4039 Log: chat integrated Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 2 08:58:08 2006 @@ -6984,4 +6984,123 @@
    \n"; - - # DAY-TABLE STARTS - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - //echo " \n"; - echo "
    \n"; - echo $this->pref->menulink($callink ."calendar_day&t=". $tref,$mod_strings['LBL_DAY'. Date("w",$ts)],strftime($mod_strings['LBL_DATE_TITLE'],$ts)); - if ( isset($dinfo[Desc]) ) { - #echo " " . $this->pref->menulink($callink ."app_new&t=". $tref,$d,$mod_strings['LBL_NEW_APPNT_INFO'],$dinfo[popinfo]) ."\n"; - echo " " . $this->pref->menulink($callink ."calendar_day&t=". $tref,$d,strftime($mod_strings['LBL_DATE_TITLE'],$ts),$dinfo[popinfo]) ."\n"; - } else { - #echo " " . $this->pref->menulink($callink ."app_new&t=". $tref,$d,$mod_strings['LBL_NEW_APPNT_INFO']) ."\n"; - echo " " . $this->pref->menulink($callink ."calendar_day&t=". $tref,$d,strftime($mod_strings['LBL_DATE_TITLE'],$ts)) ."\n"; - } - echo "
    \n"; - echo " \n"; - if ( isset($dinfo[Desc]) ) { - //echo "". $dinfo[Desc] ."\n"; - echo "". $dinfo[Desc] ."\n"; - - } - - $hastable = false; - foreach ($this->pref->callist as $idx => $x) { - - /* the correct day */ - if ( ! $this->pref->callist[$idx]->inside($dd) ) { - continue; - } - /*if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { - continue; - }*/ - // Do not show finished tasks - if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { - - continue; - } - if ( !$hastable ) - { - - echo "\n"; - $hastable = true; - } - else - { - echo " \n"; - - } - // Show appointments or task or whatever - $color = ""; - $username=$this->pref->callist[$idx]->creator; - if ($username!="") + for ($row=1;$row<=1;$row++) + { + echo ""; + echo ""; + for ($column=0;$column<=6;$column++) + { + $next = NextDay($ts); + echo ""; + $ts = $next; + } + } + for ($row=1;$row<=24;$row++) + { + echo ""; + for ($column=0;$column<=7;$column++) + { + if ($column==0) + { + echo ""; - } - if ( $hastable ) - { - echo "
     "; + echo strftime($mod_strings['LBL_DATE_TITLE'],$ts); + echo "
    "; + echo $row,"pm"; + } + else + { + $dd->setDateTimeTS($ts); + $d = $dd->getDate(); + $tref = Date("Ymd",$ts); + $dinfo = GetDaysInfo($ts); + + $from = new DateTime(); + $to = new DateTime(); + $from->setDateTimeTS($ts - 12 * 3600); + $to->setDateTimeTS($ts - 12 * 3600); +#$to->addDays(7); + $this->pref->callist = array(); + appointment::readCal($this->pref,$from,$to); + + $next = NextDay($ts); + + echo ""; + + foreach ($this->pref->callist as $idx => $x) { + + //the correct day + if ( ! $this->pref->callist[$idx]->inside($dd) ) { + continue; + } + //if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { + //continue; + //} + // do not show finished tasks + if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx] +->state == 2) ) { + + continue; + } + if ( !$hastable ) + { + + echo "\n"; + $hastable = true; + } + else + { + echo " \n"; + + } + // show appointments or task or whatever + $color = ""; + $username=$this->pref->callist[$idx]->creator; + if ($username!="") { $query="SELECT cal_color FROM users where user_name = '$username'"; @@ -229,35 +241,17 @@ $this->pref->callist[$idx]->formatted(); echo "\n
    \n"; - } - else - { - echo "



    \n"; - } - - # DAY-TABLE ENDS - echo "
    \n"; - - echo "
     
    + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + + chat_from + + + chat_to + + + born + + + + +
    + + + + ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB + + msg + +
    + + + ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + Type=InnoDB + + msg + +
    + + ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE + Type=InnoDB + + +
    + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + nick + + Type=InnoDB + session + + + ping + +
    + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 2 11:08:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 02 Mar 2006 16:08:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4040 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl index.php Message-ID: <20060302160842.D265A43B491@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 09:08:37 2006 New Revision: 4040 Log: chat integrated Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/index.php Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Thu Mar 2 09:08:37 2006 @@ -56,7 +56,8 @@
    		Create {$MODULE}...Search in {$MODULE}...Search in {$MODULE}... Search in {$MODULE}... +
    - - - + Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Thu Mar 2 23:17:51 2006 @@ -1,175 +1,89 @@ // JavaScript Document //Layer Function +/* NEW SCRIPT FOR MENU SLIDE */ -if (document.all) var browser_ie=true -else if (document.layers) var browser_nn4=true -else if (document.layers || (!document.all && document.getElementById)) var browser_nn6=true +var menu_i; +var menu_max; +var closeLimit; +var openLimit = 0; -function getObj(n,d) { - var p,i,x; - if(!d)d=document; - if((p=n.indexOf("?"))>0&&parent.frames.length) {d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);} - if(!(x=d[n])&&d.all)x=d.all[n]; - for(i=0;!x&&isetText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.width=menu_i+"%"; + setTimeout(function() { fnexpanLay(obj,inner); },5); + menu_i=menu_i+1; } - else if (document.layers) {curtop += obj.y;} - return curtop; } -function openPopUp(winInst,currObj,baseURL,winName,width,height,features) { - var left=parseInt(findPosX(currObj)) - var top=parseInt(findPosY(currObj)) - - if (window.navigator.appName!="Opera") top+=parseInt(currObj.offsetHeight) - else top+=(parseInt(currObj.offsetHeight)*2)+10 - if (browser_ie) { - top+=window.screenTop-document.body.scrollTop - left-=document.body.scrollLeft - if (top+height+30>window.screen.height) - top=findPosY(currObj)+window.screenTop-height-30 - if (left+width>window.screen.width) - left=findPosX(currObj)+window.screenLeft-width - } else if (browser_nn4 || browser_nn6) { - top+=(scrY-pgeY) - left+=(scrX-pgeX) - if (top+height+30>window.screen.height) - top=findPosY(currObj)+(scrY-pgeY)-height-30 - if (left+width>window.screen.width) - left=findPosX(currObj)+(scrX-pgeX)-width +function fncloseLay(obj,inner) +{ + if (menu_max >= eval(openLimit)) + { + if (menu_maxsetText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.height=wipe_i+"px"; + setTimeout(function() { fnWipeLay(obj,inner); },5); + wipe_i = wipe_i + 5; + } +} + +function fnUnWipeLay(obj,inner) +{ + if (wipe_max >= eval(openLimit)) + { + if (wipe_max ScrollEffect.closelimit ){closet();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect.lengthcount+'px'; - ScrollEffect.lengthcount=ScrollEffect.lengthcount+10; - if(ScrollEffect.lengthcount < ScrollEffect.limit){setTimeout("just()",25);} - else{ getObj("user").style.display="block";return;} -} - -function closet(){ - ig=getObj("top"); - getObj("user").style.display="none"; - ScrollEffect.lengthcount=ScrollEffect.lengthcount-10; - ig.style.height=ScrollEffect.lengthcount+'px'; - if(ScrollEffect.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet()", 25);} -} - -function just1(){ - ig=getObj("top2"); - if(ScrollEffect1.lengthcount > ScrollEffect1.closelimit1 ){closet1();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect1.lengthcount+'px'; - ScrollEffect1.lengthcount=ScrollEffect1.lengthcount+10; - if(ScrollEffect1.lengthcount < ScrollEffect1.limit1){setTimeout("just1()",25);} - else{ getObj("studio").style.display="block";return;} -} - -function closet1(){ - ig=getObj("top2"); - getObj("studio").style.display="none"; - ScrollEffect1.lengthcount=ScrollEffect1.lengthcount-10; - ig.style.height=ScrollEffect1.lengthcount+'px'; - if(ScrollEffect1.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet1()", 25);} -} - -function just2(){ - ig=getObj("top3"); - if(ScrollEffect2.lengthcount > ScrollEffect2.closelimit2 ){closet2();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect2.lengthcount+'px'; - ScrollEffect2.lengthcount=ScrollEffect2.lengthcount+10; - if(ScrollEffect2.lengthcount < ScrollEffect2.limit2){setTimeout("just2()",25);} - else{ getObj("comm").style.display="block";return;} -} - -function closet2(){ - ig=getObj("top3"); - getObj("comm").style.display="none"; - ScrollEffect2.lengthcount=ScrollEffect2.lengthcount-10; - ig.style.height=ScrollEffect2.lengthcount+'px'; - if(ScrollEffect2.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet2()", 25);} -} - -function just3(){ - ig=getObj("top4"); - if(ScrollEffect3.lengthcount > ScrollEffect3.closelimit3 ){closet3();return;} - ig.style.display="block"; - ig.style.height=ScrollEffect3.lengthcount+'px'; - ScrollEffect3.lengthcount=ScrollEffect3.lengthcount+10; - if(ScrollEffect3.lengthcount < ScrollEffect3.limit3){setTimeout("just3()",25);} - else{ getObj("config").style.display="block";return;} -} - -function closet3(){ - ig=getObj("top4"); - getObj("config").style.display="none"; - ScrollEffect3.lengthcount=ScrollEffect3.lengthcount-10; - ig.style.height=ScrollEffect3.lengthcount+'px'; - if(ScrollEffect3.lengthcount<20){ig.style.display="none";return;} - else{setTimeout("closet3()", 25);} -} Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 2 23:17:51 2006 @@ -723,10 +723,10 @@ } -#user{position:relative;left:0px;top:0px;width:100%;display:none;} -#studio{position:relative;left:0px;top:0px;width:100%;display:none;} -#comm{position:relative;left:0px;top:0px;width:100%;display:none;} -#config{position:relative;left:0px;top:0px;width:100%;display:none;} +#user{position:relative;left:0px;top:0px;width:100%;display:block;} +#studio{position:relative;left:0px;top:0px;width:100%;display:block;} +#comm{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;} @@ -842,6 +842,11 @@ border:0px; } +#slideMnu{ + background-color:#BBBBBB; + vertical-align:top; +} + #one{ position:relative; display:block; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 01:23:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 06:23:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4043 - /vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Message-ID: <20060303062340.9B1A33F5EFB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 2 23:23:35 2006 New Revision: 4043 Log: height added to the menu divs Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Thu Mar 2 23:23:35 2006 @@ -15,7 +15,7 @@
    + Expand/Close Menu
    -
    +
    {$MOD.LBL_USERS} {$MOD.LBL_ROLES} {$MOD.LBL_PROFILES} @@ -31,7 +31,7 @@
    -
    +
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS} {$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING} @@ -41,7 +41,7 @@
    -
    +
    {$MOD.EMAILTEMPLATES} {$MOD.WORDINTEGRATION} {$MOD.NOTIFICATIONSCHEDULERS} @@ -55,7 +55,7 @@
    -
    +
    {$MOD.LBL_ORGANIZATION_DETAILS} {$MOD.LBL_EMAIL_CONFIG} {$MOD.LBL_BACKUP_SERVER_CONFIGURATION} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 02:41:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 07:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4044 - /vtigercrm/trunk/test/user/admin.jpeg Message-ID: <20060303074125.514223EEB51@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 00:41:20 2006 New Revision: 4044 Log: demo image for user added Added: vtigercrm/trunk/test/user/admin.jpeg (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 02:47:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 07:47:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4045 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060303074750.91AAA3F5F21@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 00:47:46 2006 New Revision: 4045 Log: default image and tagcloud added for admin Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 04:09:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 09:09:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4046 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060303090900.B82DB4038E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 02:08:56 2006 New Revision: 4046 Log: demo data productimages has been added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 04:10:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 09:10:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4047 - in /vtigercrm/trunk/test/product: product1.jpeg product10.jpeg product2.jpeg product3.jpeg product4.jpeg product5.jpeg product6.jpeg product7.jpeg product8.jpeg product9.jpeg Message-ID: <20060303091026.C809B2A8265@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 02:10:10 2006 New Revision: 4047 Log: default product images has been added Added: vtigercrm/trunk/test/product/product1.jpeg (with props) vtigercrm/trunk/test/product/product10.jpeg (with props) vtigercrm/trunk/test/product/product2.jpeg (with props) vtigercrm/trunk/test/product/product3.jpeg (with props) vtigercrm/trunk/test/product/product4.jpeg (with props) vtigercrm/trunk/test/product/product5.jpeg (with props) vtigercrm/trunk/test/product/product6.jpeg (with props) vtigercrm/trunk/test/product/product7.jpeg (with props) vtigercrm/trunk/test/product/product8.jpeg (with props) vtigercrm/trunk/test/product/product9.jpeg (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 05:38:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 10:38:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4048 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060303103858.3407E43B463@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 03:38:53 2006 New Revision: 4048 Log: changes made to get link for activity desc and for alignment Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Fri Mar 3 03:38:53 2006 @@ -1409,7 +1409,9 @@ } echo " \n"; - echo " ". $duration ."\n"; + echo "module_name."s.gif\" alt=\"".$this->module_name."\" title=\"".$this->module_name."\" border=\"0\">"; + echo " "; + echo " ". $duration ."\n"; //added from Fredy's patch echo " ". $this->creator ."  \n"; @@ -1482,8 +1484,10 @@ //Added for description $descr = eregi_replace("\n","
    ",$this->descr); if ($descr != "" ) { - echo " module_name."s.gif\" border=\"0\"> ". urlReplace($descr) ." \n"; - //echo " ". $this->creator ." \n"; + //echo " module_name."s.gif\" border=\"0\">  + echo " "; + echo "".$this->getLink(urlReplace($descr))." \n"; + //echo " ". $this->creator ." \n"; } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 3 05:45:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 03 Mar 2006 10:45:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4049 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060303104533.5E30D3F5F23@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 3 03:45:26 2006 New Revision: 4049 Log: changes made to get users name Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Fri Mar 3 03:45:26 2006 @@ -1,4 +1,6 @@ @@ -55,15 +59,15 @@ - - + +
    Event starts at
    Set time..
    Set date..
    Set time..
    Set date..
    - - + +
    Event ends on
    Set time..
    Set date..
    Set time..
    Set date..
    @@ -116,13 +120,12 @@ - + ".$userDetails[$i].""; + } + ?> From vtiger-tickets at vtiger.fosslabs.com Fri Mar 3 16:29:51 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 03 Mar 2006 21:29:51 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.3f7b136eff191b7fedc2feedd3a91970@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Any comments about this one...please? Or maybe I'm missing something here? -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 00:08:29 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 05:08:29 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.4b525f05fb443107a10befa629afad80@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by anonymous): WARNING: If you change the values that are set in the database, you have to change where the values are tested in the code or strange things will happen. OK, you have been warned. The fact is that as of 4.2.4rc2 the code isn't fully translation ready. There are plans to change that though, like using gettext instead of a big php array for translation identifier difinitions. The code will have to be changed so that database values are translated before shown to the user, and after a value has been selected by the user. You are invited to participate in helping to fix this problem or support the ones who are putting in the work. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 00:13:00 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 05:13:00 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.b6f996e3c1fdf018e90eb7a4c8cc645d@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by mfedyk): Didn't realize I wasn't logged in when posting that message. The previous comment was from me. :) -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 4 01:51:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 04 Mar 2006 06:51:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4050 - in /vtigercrm/branches/4.2: dbmonitor.php test/dbmonitor.php Message-ID: <20060304065130.F20964011C7@vtiger.fosslabs.com> Author: mfedyk Date: Fri Mar 3 23:51:28 2006 New Revision: 4050 Log: break dbmonitor.php (it has to be in the base directory for it to work) until security checks are added Added: vtigercrm/branches/4.2/test/dbmonitor.php - copied unchanged from r3969, vtigercrm/branches/4.2/dbmonitor.php Removed: vtigercrm/branches/4.2/dbmonitor.php From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 01:59:13 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 06:59:13 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch_pre_vtigercrm-4=2E2=2E4_-?= =?utf-8?q?_make_a_dash_for_it?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.d936aba898a332b66cd0db1c7b10e74b@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch pre vtigercrm-4.2.4 - make a dash for it ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 02:00:11 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 07:00:11 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.6c19bfa0358628cb810eb2a631e87ba9@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Changes (by mfedyk): * summary: Add postgresql support to 4.2 branch pre vtigercrm-4.2.4 - make a dash for it => Add postgresql support to 4.2 branch Comment: A branch will be created for this once 4.2.4 is released to work on this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 06:37:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 11:37:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.add2be261fb7613f7afd72e9928c96aa@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Ok, thanks, but I'm already aware of this problem so IMHO this warning should go in the same place where you can change the pick values, so to warn all users _before_ they change any. Or don't let the user change those values at all, until the code is fully translation ready. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 14:14:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 19:14:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.2b0b7897a1bceb84d2fa804e077ab106@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Changes (by mfedyk): * priority: major => critical Comment: Sorry, I didn't realize that this was editable from the web interface. There are a few pick lists like "meeting" and "call" in Activities that shouldn't be edited. But this is editable from the web interface and tested in the code. That is bad. Thanks for reporting this. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 17:26:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 22:26:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?= =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?= Message-ID: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com> #58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm -----------------------+---------------------------------------------------- Reporter: fathi | Owner: developer Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: | -----------------------+---------------------------------------------------- Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm because of licensing issue. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sat Mar 4 17:28:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 04 Mar 2006 22:28:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2359=3A_r?= =?utf-8?q?eplace_jpgraph_by_Image=5Fgraph?= Message-ID: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com> #59: replace jpgraph by Image_graph -----------------------+---------------------------------------------------- Reporter: fathi | Owner: developer Type: task | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: | -----------------------+---------------------------------------------------- Replace jpgraph using Image_php: http://pear.php.net/package/Image_Graph related to #58 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 4 22:48:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 05 Mar 2006 03:48:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4051 - in /vtigercrm/branches/4.2/modules: Emails/ Products/ Settings/ Users/ uploads/ Message-ID: <20060305034845.8692B498306@vtiger.fosslabs.com> Author: mfedyk Date: Sat Mar 4 20:48:41 2006 New Revision: 4051 Log: Remove hard coded upload limits Modified: vtigercrm/branches/4.2/modules/Emails/upload.php vtigercrm/branches/4.2/modules/Products/EditView.html vtigercrm/branches/4.2/modules/Products/EditView.php vtigercrm/branches/4.2/modules/Products/upload.php vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php vtigercrm/branches/4.2/modules/Users/upload.php vtigercrm/branches/4.2/modules/uploads/add.php vtigercrm/branches/4.2/modules/uploads/upload.php Modified: vtigercrm/branches/4.2/modules/Emails/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Emails/upload.php (original) +++ vtigercrm/branches/4.2/modules/Emails/upload.php Sat Mar 4 20:48:41 2006 @@ -24,7 +24,7 @@

    - + Modified: vtigercrm/branches/4.2/modules/Products/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Products/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Products/EditView.html Sat Mar 4 20:48:41 2006 @@ -31,7 +31,7 @@ - + Modified: vtigercrm/branches/4.2/modules/Products/EditView.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/EditView.php (original) +++ vtigercrm/branches/4.2/modules/Products/EditView.php Sat Mar 4 20:48:41 2006 @@ -142,6 +142,7 @@ if(isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']); if(isset($_REQUEST['return_action'])) $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']); +if(isset($upload_maxsize)) $xtpl->assign("MAX_FILE_SIZE", $upload_maxsize); if(isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']); if(isset($_REQUEST['activity_mode'])) $xtpl->assign("ACTIVITYMODE", $_REQUEST['activity_mode']); $xtpl->assign("THEME", $theme); Modified: vtigercrm/branches/4.2/modules/Products/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Products/upload.php (original) +++ vtigercrm/branches/4.2/modules/Products/upload.php Sat Mar 4 20:48:41 2006 @@ -22,7 +22,7 @@

    - +
    Modified: vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html (original) +++ vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.html Sat Mar 4 20:48:41 2006 @@ -49,7 +49,7 @@ - +
    {MOD.LBL_ORGANIZATION_LOGO}: [{ORGANIZATIONLOGONAME}]
    Modified: vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php (original) +++ vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php Sat Mar 4 20:48:41 2006 @@ -74,6 +74,8 @@ $xtpl->assign("ORGANIZATIONFAX",$organization_fax); if (isset($organization_website)) $xtpl->assign("ORGANIZATIONWEBSITE",$organization_website); +if (isset($upload_maxsize)) + $xtpl->assign("MAX_FILE_SIZE",$upload_maxsize); if (isset($organization_logoname)) $xtpl->assign("ORGANIZATIONLOGONAME",$organization_logoname); Modified: vtigercrm/branches/4.2/modules/Users/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/upload.php (original) +++ vtigercrm/branches/4.2/modules/Users/upload.php Sat Mar 4 20:48:41 2006 @@ -22,7 +22,7 @@ ?>
    - + Modified: vtigercrm/branches/4.2/modules/uploads/add.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add.php Sat Mar 4 20:48:41 2006 @@ -37,7 +37,7 @@ - +
    Modified: vtigercrm/branches/4.2/modules/uploads/upload.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/upload.php (original) +++ vtigercrm/branches/4.2/modules/uploads/upload.php Sat Mar 4 20:48:41 2006 @@ -11,7 +11,7 @@ -
    - + From vtiger-tickets at vtiger.fosslabs.com Sun Mar 5 06:53:09 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sun, 05 Mar 2006 11:53:09 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2343=3A_m?= =?utf-8?q?ysql5_support_for_4=2E2?= In-Reply-To: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com> References: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com> Message-ID: <085.295a028f2d2f2790c96b101cf67e1a90@vtiger.fosslabs.com> #43: mysql5 support for 4.2 --------------------------+------------------------------------------------- Reporter: fathi | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc1 Resolution: | Keywords: mysql --------------------------+------------------------------------------------- Comment (by fathi): From Michel JACQUEMES: Pursuing my efforts on database compatibility, find joined somme patches allowing support of MySQL 5.0. Something remarqable to notice is that most of the changes have the same origin than those for mssql or postgres support. It also lights up some defects in vtiger database schema, that could help to solve some issues in current versions. These patches are made to keep compatibility with previous versions of MySQL. They have been tested with MySQL 4.1.16 (limited test according to the time I have). * Requirements : * upgrade to last version of AXMLS package (1.0.2 include MySQL 5 support) in adodb directory * patch to adodb-datadict.inc.php to solve MySQL 5.0 bug with default value of TIMESTAMP fields. * CONFIG : * PHP 5.1.2 * MySQL 5.0.18 ABSTRACT * DatabaseSchema : * ON DELETE CASCADE -> ON DELETE NO ACTION (already documented) * change cvcolumnlist index (primary key not unique) * change selectcolumn index (primary key not unique) * change relcriteria index (primary key not unique) * change faqcomments add DEFTIMESTAMP to column createdtime (missing default value) * change ticketcomments add DEFTIMESTAMP to column createdtime (missing default value) * Utils : * getDBInsertDateValue change empty date ('--') -> '0000-00-00' * replace contact list query joins according to SQL standards * CRMEntity, LoginHistory, PopulateComboValues, PopulateReports: * replace default field value from "''" to "DEFAULT" * Security : * replace default field value from "''" to "NULL" in Tab INSERT query COMMENTS Database schema, primary key not unique CREATE of cvcolumnlist : {{{
    columnindexType=InnoDB
    }}} is changed to : {{{ cvidcolumnindex columnindexType=InnoDB
    }}} cvid is not unique, several columns for same customview TIMESTAMP default values There is probably a bug in MySQL 5.0. CREATE TABLE DATETIME NOT NULL is supposed to default to CURRENT_TIMESTAMP but it doesn't. DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP and DATETIME DEFAULT CURRENT_TIMESTAMP are not accepted That is the reason of the patch in adodb-datadict.inc.php, it generates : DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' which is accepted. Note : I have probably forgotten some clauses in XML schema. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Sun Mar 5 22:20:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 06 Mar 2006 03:20:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2360=3A_A?= =?utf-8?q?dded_product_on_the_fly=2E_Use_mult=2E_products_to_make_on_prod?= =?utf-8?q?uct=2E?= Message-ID: <076.5aaf5e79322517a5f8d39924ef3aa6b4@vtiger.fosslabs.com> #60: Added product on the fly. Use mult. products to make on product. -----------------------+---------------------------------------------------- Reporter: Cybrac | Owner: developer Type: defect | Status: new Priority: minor | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: products | -----------------------+---------------------------------------------------- To be able to make product the same time you make a quote, invoice, etc.. Use inventory or non inventory product to make a new product for quote, invoice, etc.. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 04:16:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:16:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4052 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060306091606.50D8D4ACEF4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:16:02 2006 New Revision: 4052 Log: alert for mysql version check changed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 04:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4053 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060306091856.28C424ACEF4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:18:52 2006 New Revision: 4053 Log: mysql version check removed Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 04:25:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 09:25:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4054 - /vtigercrm/trunk/Smarty/templates/ListView.tpl Message-ID: <20060306092516.162BF4AD23D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 02:25:12 2006 New Revision: 4054 Log: search icon removed Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Mar 6 02:25:12 2006 @@ -56,7 +56,7 @@ Create {$MODULE}... {/if} Search in {$MODULE}... - Search in {$MODULE}... Search in {$MODULE}... + Search in {$MODULE}... From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 05:15:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 10:15:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4055 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060306101500.33FC62CA860@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 6 03:14:58 2006 New Revision: 4055 Log: add wrapper for adodb UpdateBlobFile Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Mon Mar 6 03:14:58 2006 @@ -251,6 +251,15 @@ $this->checkConnection(); $result = $this->database->UpdateBlob($tablename, $colname, $data, $id); $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result); + return $result; + } + + function updateBlobFile($tablename, $colname, $id, $filename) + { + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); + $this->checkConnection(); + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 05:20:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 10:20:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4056 - /vtigercrm/branches/4.2/modules/uploads/add2db.php Message-ID: <20060306102011.E5B804AD224@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 6 03:20:09 2006 New Revision: 4056 Log: clean up error checking during upload Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add2db.php Mon Mar 6 03:20:09 2006 @@ -85,22 +85,36 @@ if($errorCode == 4) { include('themes/'.$theme.'/header.php'); - $errormessage = "Kindly give a valid file for upload!
    " ; + $errormessage = "Please give a valid file for upload.
    " ; echo $errormessage; include "upload.php"; } else if($errorCode == 2) { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
    "; + $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than $upload_maxsize bytes
    "; include('themes/'.$theme.'/header.php'); echo $errormessage; include "upload.php"; //echo $errorCode; } - else if($errorCode == 3 || $errorcode == '') + else if($errorCode == 1) + { + $errormessage = "Sorry, the uploaded file exceeds the upload_max_filesize directive in php.ini
    "; + include('themes/'.$theme.'/header.php'); + echo $errormessage; + include "upload.php"; + //echo $errorCode; + } + else if($errorCode == 3) { include('themes/'.$theme.'/header.php'); - echo "Problems in file upload. Please try again!
    "; + echo "The uploaded file was only partially received. Please try again.
    "; + include "upload.php"; + } + else if($errorcode == '') + { + include('themes/'.$theme.'/header.php'); + echo "Error while receiving file. Check post_max_size in php.ini
    "; include "upload.php"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 6 08:20:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 06 Mar 2006 13:20:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4057 - in /vtigercrm/branches/4.2: config.template.php install/2setConfig.php Message-ID: <20060306132045.86D974AD3EF@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 6 06:20:40 2006 New Revision: 4057 Log: changes made to support multiple packaging Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Mon Mar 6 06:20:40 2006 @@ -1,180 +1,189 @@ -'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); - -// default_module default value = Home -$default_module = 'Home'; - -// default_action default value = index -$default_action = 'index'; - -// set default theme -// default_theme default value = blue -$default_theme = 'blue'; - -// show or hide time to compose each page -// calculate_response_time default value = true -$calculate_response_time = true; - -// default text that is placed initially in the login form for user name -// no default_user_name default value -$default_user_name = ''; - -// default text that is placed initially in the login form for password -// no default_password default value -$default_password = ''; - -// create user with default username and password -// create_default_user default value = false -$create_default_user = false; -// default_user_is_admin default value = false -$default_user_is_admin = false; - -// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown -// disable_persistent_connections default value = false -$disable_persistent_connections = false; - -// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) -// languages default value = en_us=>US English -$languages = Array('en_us'=>'US English',); - -// default charset -// default charset default value = ISO-8859-1 -$default_charset = 'ISO-8859-1'; - -// default language -// default_language default value = en_us -$default_language = 'en_us'; - -// add the language pack name to every translation string in the display. -// translation_string_prefix default value = false -$translation_string_prefix = false; - -?> +'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + + // default_module default value = Home + $default_module = 'Home'; + + // default_action default value = index + $default_action = 'index'; + + // set default theme + // default_theme default value = blue + $default_theme = 'blue'; + + // show or hide time to compose each page + // calculate_response_time default value = true + $calculate_response_time = true; + + // default text that is placed initially in the login form for user name + // no default_user_name default value + $default_user_name = ''; + + // default text that is placed initially in the login form for password + // no default_password default value + $default_password = ''; + + // create user with default username and password + // create_default_user default value = false + $create_default_user = false; + // default_user_is_admin default value = false + $default_user_is_admin = false; + + // if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown + // disable_persistent_connections default value = false + $disable_persistent_connections = false; + + // defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) + // languages default value = en_us=>US English + $languages = Array('en_us'=>'US English',); + + // default charset + // default charset default value = ISO-8859-1 + $default_charset = 'ISO-8859-1'; + + // default language + // default_language default value = en_us + $default_language = 'en_us'; + + // add the language pack name to every translation string in the display. + // translation_string_prefix default value = false + $translation_string_prefix = false; +?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Mon Mar 6 06:20:40 2006 @@ -35,7 +35,7 @@ $cache_dir = "cache/"; if (is_file("config.php") && is_file("config.inc.php")) { - require_once("config.php"); + require_once("config.template.php"); session_start(); if(isset($upload_maxsize)) @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm'; + $db_name = 'vtigercrm4_2_4'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']; From vtiger-tickets at vtiger.fosslabs.com Mon Mar 6 12:41:24 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 06 Mar 2006 17:41:24 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?= =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?= =?utf-8?q?associations?= In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> Message-ID: <085.a8b2b86a615709fd4830f368cf303089@vtiger.fosslabs.com> #48: Sales Orders Created from Quote are not saved and do not retain associations -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: order -----------------------------------------------+---------------------------- Changes (by onwealdandy ): * owner: onwealdandy => developer -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:03:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:03:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4058 - /vtigercrm/branches/4.2/modules/uploads/add2db.php Message-ID: <20060307080337.2E26E4AD42B@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:03:35 2006 New Revision: 4058 Log: reduce memory usage in lead attachment upload code Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php Modified: vtigercrm/branches/4.2/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/4.2/modules/uploads/add2db.php (original) +++ vtigercrm/branches/4.2/modules/uploads/add2db.php Tue Mar 7 01:03:35 2006 @@ -31,7 +31,6 @@ if(move_uploaded_file($_FILES["binFile"]["tmp_name"],$uploaddir.$_FILES["binFile"]["name"])) { - $binFile = $_FILES['binFile']['name']; $filename = basename($binFile); $filetype= $_FILES['binFile']['type']; $filesize = $_FILES['binFile']['size']; @@ -43,8 +42,13 @@ $description = addslashes($desc); $date_var = date('YmdHis'); - $data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize)); //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); + $filenameBase64 = $filename.".base64"; + $rfh = fopen($uploaddir.$filename, "r"); + $wfh = fopen($uploaddir.$filenameBase64, "w"); + //FIXME: find a way to stream data to base64_encode() to reduce memory usage -mikefedyk + fwrite($wfh,base64_encode(fread($rfh, $filesize))); + deleteFile($uploaddir,$filename); $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')"; @@ -54,9 +58,10 @@ $sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$filesize."','".$adb->getEmptyBlob()."')"; $result = $adb->query($sql); + //FIXME: adodb reads entire file into memory instead of streaming to DB -mikefedyk if($result!=false) - $result = $adb->updateBlob('attachments','attachmentcontents',"attachmentsid='".$current_id."' and name='".$filename."'",$data); - + $result = $adb->updateBlobFile('attachments','attachmentcontents',"attachmentsid='".$current_id."' and name='".$filename."'",$uploaddir.$filenameBase64); + deleteFile($uploaddir,$filenameBase64); $crmid = $_REQUEST['return_id']; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:05:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:05:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4059 - /vtigercrm/branches/4.2/adodb/adodb.inc.php Message-ID: <20060307080545.2E6624AD4A1@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:05:43 2006 New Revision: 4059 Log: reduce adodb memory usage to enable larger BLOB uploads Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Tue Mar 7 01:05:43 2006 @@ -801,6 +801,8 @@ $element0 = reset($inputarr); # is_object check because oci8 descriptors can be passed in $array_2d = is_array($element0) && !is_object(reset($element0)); + //remove extra memory copy of input -mikefedyk + unset($element0); if (!is_array($sql) && !$this->_bindInputArray) { $sqlarr = explode('?',$sql); @@ -808,12 +810,14 @@ if (!$array_2d) $inputarr = array($inputarr); foreach($inputarr as $arr) { $sql = ''; $i = 0; - foreach($arr as $v) { + //Use each() instead of foreach to reduce memory usage -mikefedyk + while(list(, $v) = each($arr)) { $sql .= $sqlarr[$i]; // from Ron Baldwin // Only quote string types $typ = gettype($v); if ($typ == 'string') + //New memory copy of input created here -mikefedyk $sql .= $this->qstr($v); else if ($typ == 'double') $sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1 @@ -892,6 +896,7 @@ $rs->connection = &$this; // Pablo suggestion $rs->Init(); if (is_array($sql)) $rs->sql = $sql[0]; + //New memory copy of input created here -mikefedyk else $rs->sql = $sql; if ($rs->_numOfRows <= 0) { global $ADODB_COUNTRECS; From vtiger-tickets at vtiger.fosslabs.com Tue Mar 7 03:11:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 07 Mar 2006 08:11:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2361=3A_R?= =?utf-8?q?eference_data_instead_of_pass_copies_more_in_adodb?= Message-ID: <076.caa7cd5a234dcb529ee8d9efe8613c5c@vtiger.fosslabs.com> #61: Reference data instead of pass copies more in adodb -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- Even with the changes in r4058 & r4059 attachment uploads are limited to 2MB when the memory limit is 16MB. I have found that only 4MB memory is used until calling adodb so the memory usage problem is there. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:23:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:23:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4060 - in /vtigercrm/branches/4.2: config.template.php install/2setConfig.php Message-ID: <20060307082329.C3F3A4AD43D@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:23:27 2006 New Revision: 4060 Log: revert broken installer changes Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Tue Mar 7 01:23:27 2006 @@ -1,189 +1,180 @@ -'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); - - // default_module default value = Home - $default_module = 'Home'; - - // default_action default value = index - $default_action = 'index'; - - // set default theme - // default_theme default value = blue - $default_theme = 'blue'; - - // show or hide time to compose each page - // calculate_response_time default value = true - $calculate_response_time = true; - - // default text that is placed initially in the login form for user name - // no default_user_name default value - $default_user_name = ''; - - // default text that is placed initially in the login form for password - // no default_password default value - $default_password = ''; - - // create user with default username and password - // create_default_user default value = false - $create_default_user = false; - // default_user_is_admin default value = false - $default_user_is_admin = false; - - // if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown - // disable_persistent_connections default value = false - $disable_persistent_connections = false; - - // defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) - // languages default value = en_us=>US English - $languages = Array('en_us'=>'US English',); - - // default charset - // default charset default value = ISO-8859-1 - $default_charset = 'ISO-8859-1'; - - // default language - // default_language default value = en_us - $default_language = 'en_us'; - - // add the language pack name to every translation string in the display. - // translation_string_prefix default value = false - $translation_string_prefix = false; -?> +'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr'); + +// default_module default value = Home +$default_module = 'Home'; + +// default_action default value = index +$default_action = 'index'; + +// set default theme +// default_theme default value = blue +$default_theme = 'blue'; + +// show or hide time to compose each page +// calculate_response_time default value = true +$calculate_response_time = true; + +// default text that is placed initially in the login form for user name +// no default_user_name default value +$default_user_name = ''; + +// default text that is placed initially in the login form for password +// no default_password default value +$default_password = ''; + +// create user with default username and password +// create_default_user default value = false +$create_default_user = false; +// default_user_is_admin default value = false +$default_user_is_admin = false; + +// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown +// disable_persistent_connections default value = false +$disable_persistent_connections = false; + +// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file) +// languages default value = en_us=>US English +$languages = Array('en_us'=>'US English',); + +// default charset +// default charset default value = ISO-8859-1 +$default_charset = 'ISO-8859-1'; + +// default language +// default_language default value = en_us +$default_language = 'en_us'; + +// add the language pack name to every translation string in the display. +// translation_string_prefix default value = false +$translation_string_prefix = false; + +?> Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Tue Mar 7 01:23:27 2006 @@ -35,7 +35,7 @@ $cache_dir = "cache/"; if (is_file("config.php") && is_file("config.inc.php")) { - require_once("config.template.php"); + require_once("config.php"); session_start(); if(isset($upload_maxsize)) @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') + elseif (isset($dbconfig['db_name'])) $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm4_2_4'; + $db_name = 'vtigercrm'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $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']; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 03:26:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 08:26:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4061 - in /vtigercrm/branches/4.2: config.template.php install/config.template Message-ID: <20060307082631.4BF834AD483@vtiger.fosslabs.com> Author: mfedyk Date: Tue Mar 7 01:26:29 2006 New Revision: 4061 Log: move & rename template file for config to reduce confusion. It is not a php file, but a text file that happens to be formatted like php code. The keywords are to be replaced *at install time* and those changes are to be in config.inc.php Added: vtigercrm/branches/4.2/install/config.template - copied unchanged from r4060, vtigercrm/branches/4.2/config.template.php Removed: vtigercrm/branches/4.2/config.template.php From vtiger-tickets at vtiger.fosslabs.com Tue Mar 7 05:58:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 07 Mar 2006 10:58:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2332=3A_T?= =?utf-8?q?ranslating_pick_list_values_makes_VTiger_work_erratic?= In-Reply-To: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> References: <076.c5a5daa1a8d81458b0ded89900e0c9e1@vtiger.fosslabs.com> Message-ID: <085.6d8b117b6cd9dca74eb4cafebebac98c@vtiger.fosslabs.com> #32: Translating pick list values makes VTiger work erratic ----------------------------------+----------------------------------------- Reporter: jisaitua at covenco.cl | Owner: developer Type: defect | Status: new Priority: critical | Milestone: Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: ----------------------------------+----------------------------------------- Comment (by jisaitua at covenco.cl): Thank you mfedyk for taking this issue into consideration. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 06:42:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:42:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4062 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060307114228.998F24ACEE8@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:42:24 2006 New Revision: 4062 Log: changes made to display the events in weekview Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Tue Mar 7 04:42:24 2006 @@ -23,20 +23,25 @@ ?> + + + + + "; $ts = $next; } - } - for ($row=1;$row<=24;$row++) + echo ""; + } + for ($row=0;$row<24;$row++) { echo ""; for ($column=0;$column<=7;$column++) { + $next = NextDay($ts); if ($column==0) { echo ""; } else { @@ -191,10 +202,9 @@ $this->pref->callist = array(); appointment::readCal($this->pref,$from,$to); - $next = NextDay($ts); - - echo "\n"; } - // show appointments or task or whatever - $color = ""; - $username=$this->pref->callist[$idx]->creator; - if ($username!="") - { - $query="SELECT cal_color FROM users where user_name = '$username'"; - - $result=$adb->query($query); - if($adb->getRowCount($result)!=0) - { - $res = $adb->fetchByAssoc($result, -1, false); - $usercolor = $res['cal_color']; - $color="style=\"background: ".$usercolor.";\""; - } + $this->pref->callist[$idx]->formatted(); + } - echo "\n"; - + if ( $hastable ) { + echo "
    - + - + - +
     DayDay  WeekWeek  MonthMonth    
    @@ -161,20 +166,26 @@ { $next = NextDay($ts); echo ""; - echo strftime($mod_strings['LBL_DATE_TITLE'],$ts); + echo strftime("%d - %a",$ts); echo "
    "; - echo $row,"pm"; + if($row==0) echo "12am"; + if($row>0 && $row<12) echo $row."am"; + if($row == 12) echo $row."pm"; + if($row>12 && $row<24) echo ($row-12)."pm"; + echo ""; - + echo ""; + + $hastable = false; foreach ($this->pref->callist as $idx => $x) { //the correct day @@ -222,32 +232,18 @@ lank.gif\" width=\"100%\" height=\"1\">
    \n"; - $this->pref->callist[$idx]->formatted(); - echo "\n
    \n"; } - echo "

    "; echo "+"; echo"
    "; } + $ts=$next; } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 06:50:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:50:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4063 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060307115048.B9B994AD22F@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:50:44 2006 New Revision: 4063 Log: t value has been parsed in the link Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Tue Mar 7 04:50:44 2006 @@ -36,11 +36,11 @@ - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 06:55:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 11:55:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4064 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060307115516.5B46D4AD352@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 04:55:09 2006 New Revision: 4064 Log: t value has been parsed in the link Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Tue Mar 7 04:55:09 2006 @@ -21,11 +21,11 @@
     DayDay  WeekWeek  MonthMonth    
    - + - + - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 08:34:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 13:34:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4065 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060307133438.B5EFA4AD483@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 06:34:34 2006 New Revision: 4065 Log: changes made to display events in weekview of calendar Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Tue Mar 7 06:34:34 2006 @@ -113,7 +113,6 @@ $last_week = Date("Ymd",$ts - 7 * 86400); $next_week = Date("Ymd",$ts + 7 * 86400); - if ($mn_name == $m_name) { $mn_name =""; @@ -158,6 +157,7 @@ $day = 0; $col = 1; $dd = new DateTime(); + $tempts=$ts; for ($row=1;$row<=1;$row++) { echo ""; @@ -174,6 +174,7 @@ } for ($row=0;$row<24;$row++) { + $ts=$tempts; echo ""; for ($column=0;$column<=7;$column++) { @@ -242,8 +243,8 @@ echo "

    "; echo "+"; echo"
    "; + $ts=$next; } - $ts=$next; } echo ""; } @@ -257,6 +258,36 @@ $this->addHidden("t", $this->t); echo $this->getHidden(); echo "\n"; + echo ""; + echo " + + +
     DayDay  WeekWeek  MonthMonth    
    + + + + + + + +
    +
    + + + + + + + + + +
    + + + + + + "; } /** * naviagte From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 11:04:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:04:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4066 - in /vtigercrm/trunk: Smarty/templates/ include/js/ include/utils/ modules/Accounts/ modules/Activities/ modules/Campaigns/ modules/Contacts/ modules/Emails/ modules/Faq/ modules/HelpDesk/ modules/Invoice/ modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/ modules/Products/ modules/PurchaseOrder/ modules/Quotes/ modules/SalesOrder/ modules/Vendors/ themes/blue/ Message-ID: <20060307160429.03B2E4AD4A4@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:03:44 2006 New Revision: 4066 Log: freetagintegrated for all modules Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/include/js/dtlviewajax.js vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Accounts/AccountsAjax.php vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Contacts/ContactsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Leads/LeadsAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 7 09:03:44 2006 @@ -93,13 +93,12 @@ -
    +
    - - [ {$ID} ] {$NAME} - {$SINGLE_MOD} Information  
    - {$UPDATEINFO} + +
    -
    + [ {$ID} ] {$NAME} - {$SINGLE_MOD} Information   
    {$UPDATEINFO} {$APP.LBL_TAG_FIELDS}   
    @@ -437,6 +436,10 @@
    +

    + + +
    @@ -459,4 +462,17 @@ {/if} + + Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Mar 7 09:03:44 2006 @@ -80,7 +80,8 @@ function dtlViewAjaxResponse(response) { var item = response.responseText; - if(item.indexOf(":#:FAILURE")>-1) + alert(response.responseText) + if(item.indexOf(":#:FAILURE")>-1) { alert("Error while Editing"); } @@ -166,3 +167,21 @@ showHide(dtlView,editArea); //show,hide itsonview=false; } + + +function dtlViewAjaxTagResponse(response) +{ + var item = response.responseText; + getObj('tagfields').innerHTML = item; + hide("vtbusy_info"); +} + +function SaveTag(txtBox,crmId,module) +{ + var tagValue = document.getElementById(txtBox).value; + var data = "module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue; + + var ajaxObj = new Ajax(dtlViewAjaxTagResponse); + ajaxObj.process("index.php?",data); + show("vtbusy_info"); +} Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 09:03:44 2006 @@ -285,6 +285,10 @@ } break; endswitch; + global $current_user; + require_once('include/freetag/freetag.class.php'); + $freetag=new freetag(); + $freetag->delete_all_object_tags_for_user($current_user->id,$record); if($return_module == $module) { $focus->mark_deleted($record); Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Tue Mar 7 09:03:44 2006 @@ -46,4 +46,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Faq/FaqAjax.php ============================================================================== --- vtigercrm/trunk/modules/Faq/FaqAjax.php (original) +++ vtigercrm/trunk/modules/Faq/FaqAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Invoice/InvoiceAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/InvoiceAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Tue Mar 7 09:03:44 2006 @@ -46,4 +46,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,49 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} + ?> Modified: vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Quotes/QuotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/QuotesAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/QuotesAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/modules/Vendors/VendorsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/VendorsAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/VendorsAjax.php Tue Mar 7 09:03:44 2006 @@ -45,4 +45,48 @@ echo ":#:FAILURE"; } } +elseif($ajaxaction == "SAVETAG") +{ + + require_once('include/freetag/freetag.class.php'); + global $current_user; + $crmid = $_REQUEST["recordid"]; + $module = $_REQUEST["module"]; + $tagfields = $_REQUEST["tagfields"]; + $userid = $current_user->id; + $freetag = new freetag(); + if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + { + $freetag->tag_object($userid,$crmid,$tagfields,$module); + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + } + +} +elseif($ajaxaction == 'GETTAGCLOUD') +{ + require_once('include/freetag/freetag.class.php'); + $freetag = new freetag(); + $module = $_REQUEST["module"]; + $useid = $current_user->id; + global $adb; + $query='select * from freetagged_objects where module = "'.$module .'"'; + $result=$adb->query($query); + if($adb->num_rows($result) > 0) + { + if(trim($module) != "") + { + $tagcloud = $freetag->get_tag_cloud_html($module); + echo $tagcloud; + }else + { + $tagcloud = $freetag->get_tag_cloud_html(); + echo $tagcloud; + } + } + else + { + echo ''; + } +} ?> Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue Mar 7 09:03:44 2006 @@ -980,3 +980,14 @@ color:#000000; } +a.tagLink{ + color:#333333; + text-decoration:none; + font-family:arial, Helvetica, sans-serif; +} + +a.tagLink:Hover{ + color:#000000; + text-decoration:underline; +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 11:08:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:08:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4067 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060307160800.7D4124ADC51@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:07:56 2006 New Revision: 4067 Log: show hide tab changed on mouseover Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue Mar 7 09:07:56 2006 @@ -48,9 +48,9 @@ - - - + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 11:51:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 16:51:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4068 - in /vtigercrm/trunk/include/freetag: ./ freetag.class.php license.txt Message-ID: <20060307165118.EEC544AD42B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 09:51:12 2006 New Revision: 4068 Log: added free tag Added: vtigercrm/trunk/include/freetag/ vtigercrm/trunk/include/freetag/freetag.class.php vtigercrm/trunk/include/freetag/license.txt From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 12:30:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 17:30:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4069 - in /vtigercrm/trunk: include/utils/DeleteUtils.php modules/Rss/Rss.php Message-ID: <20060307173012.58FC14AD449@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 10:30:04 2006 New Revision: 4069 Log: CRUD operation integrated for rss Modified: vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 10:30:04 2006 @@ -284,12 +284,17 @@ } break; + case Rss: + $del_query = "delete from rss where rssid=".$record; + $adb->query($del_query); + break; endswitch; global $current_user; require_once('include/freetag/freetag.class.php'); $freetag=new freetag(); $freetag->delete_all_object_tags_for_user($current_user->id,$record); - if($return_module == $module) + + if($return_module == $module && $return_module !='Rss') { $focus->mark_deleted($record); } Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Tue Mar 7 10:30:04 2006 @@ -155,7 +155,7 @@ $shtml .= " "; $shtml .= "".substr($allrssrow['rsstitle'],0,15)."..."; +\" class=\"rssTitle\">".substr($allrssrow['rsstitle'],0,15)."..."; $shtml .= ""; } return $shtml; @@ -184,7 +184,7 @@ } $shtml .= "".$allrssrow[rsstitle].""; - $shtml .= ""; + $shtml .= ""; } return $shtml; @@ -210,7 +210,7 @@ $shtml .= " "; } - $shtml .= "".$allrssrow[rsstitle].""; + $shtml .= "".$allrssrow[rsstitle].""; $shtml .= ""; } @@ -428,8 +428,7 @@ $shtml .= ""; $shtml .= " "; - $shtml .= "".$allrssrow[rsstitle].""; + $shtml .= "".$allrssrow[rsstitle].""; $shtml .= ""; } return $shtml; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 7 13:24:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 07 Mar 2006 18:24:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4070 - in /vtigercrm/trunk: Smarty/templates/Portal.tpl include/utils/DeleteUtils.php modules/Portal/Delete.php modules/Portal/ListView.php modules/Rss/Delete.php Message-ID: <20060307182424.3A6274AD23A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 11:24:14 2006 New Revision: 4070 Log: CRUD Operation added for Portal module Added: vtigercrm/trunk/modules/Portal/Delete.php (with props) vtigercrm/trunk/modules/Rss/Delete.php (with props) Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl vtigercrm/trunk/include/utils/DeleteUtils.php vtigercrm/trunk/modules/Portal/ListView.php Modified: vtigercrm/trunk/Smarty/templates/Portal.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Portal.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Portal.tpl Tue Mar 7 11:24:14 2006 @@ -21,9 +21,9 @@ Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 7 11:24:14 2006 @@ -288,13 +288,17 @@ $del_query = "delete from rss where rssid=".$record; $adb->query($del_query); break; + case Portal: + $del_query = "delete from portal where portalid=".$record; + $adb->query($del_query); + break; endswitch; global $current_user; require_once('include/freetag/freetag.class.php'); $freetag=new freetag(); $freetag->delete_all_object_tags_for_user($current_user->id,$record); - if($return_module == $module && $return_module !='Rss') + if($return_module == $module && $return_module !='Rss' && $return_module !='Portal') { $focus->mark_deleted($record); } Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Mar 7 11:24:14 2006 @@ -28,6 +28,7 @@ { $portalname = $adb->query_result($result,$i,'portalname'); $portalurl = $adb->query_result($result,$i,'portalurl'); + $portal_array['portalid'] = $adb->query_result($result,$i,'portalid'); $portal_array['portalname'] = $portalname; $portal_array['portalurl'] = $portalurl; $portal_info[]=$portal_array; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 01:19:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 06:19:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4071 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060308061955.1C4274AD1F6@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 7 23:19:46 2006 New Revision: 4071 Log: parse error has been fixed Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Mar 7 23:19:46 2006 @@ -348,11 +348,11 @@ { //Checks whether the cached image is present or not - if(file_exists($cahce_file_name) + if(file_exists($cahce_file_name)) { unlink($cache_file_name); } - if(file_exists($cache_file_name.'.map') + if(file_exists($cache_file_name.'.map')) { unlink($cache_file_name.'.map'); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 05:26:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 10:26:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4072 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060308102652.8DBA94AD49A@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 03:26:47 2006 New Revision: 4072 Log: Added the onMouseOver functionality for Create New User & Edit User Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Mar 8 03:26:47 2006 @@ -46,9 +46,9 @@ - - - + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN}  
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:04:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 12:04:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4073 - in /vtigercrm/branches/4.2: config.template.php install/config.template Message-ID: <20060308120436.958A94ADFD9@vtiger.fosslabs.com> Author: fathi Date: Wed Mar 8 05:04:31 2006 New Revision: 4073 Log: please let it like that. There isn't confusion just need to learn how to use it Added: vtigercrm/branches/4.2/config.template.php - copied unchanged from r4072, vtigercrm/branches/4.2/install/config.template Removed: vtigercrm/branches/4.2/install/config.template From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 07:11:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 12:11:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4074 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060308121106.69D7B49E342@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 05:11:02 2006 New Revision: 4074 Log: freetag integrated Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Wed Mar 8 05:11:02 2006 @@ -7001,7 +7001,7 @@ - + @@ -7103,4 +7103,59 @@ + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + Type=InnoDB + + tagg_id + + + tagger_id + + + object_id + + + + + +
    + From vtiger-tickets at vtiger.fosslabs.com Wed Mar 8 07:29:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 08 Mar 2006 12:29:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.ebc2be1f9b519070aef6185428b49574@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by pieter.vanmeerbeek at able.be): Hi, My company is searching for an open-source CRM packet. I'm very interested in the postgress integration in vTiger as we already use a postgres back- end for all other internal applications. Can anyone tell me what the state of the postgres integration currently is? From the release notes I noticed that postgress is supported in the 4.2 versions, however only 4.2.3 is downloadable and not the 4.2.4 or 4.2.5 of which you speak in this thread. I suppose it is not advised to use the 4.2.3 branch and postgres? And if not when will 4.2.4 or 4.2.5 be available? kind regards, Pieter Able -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 08:26:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 13:26:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4075 - in /vtigercrm/trunk/modules/Webmails: ./ images/ js/ language/ src/ src/modules/ src/modules/User/ templates/ tmp/ tmp/1/ Message-ID: <20060308132629.3D8183F33CD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 06:25:14 2006 New Revision: 4075 Log: * intial version webmails Added: vtigercrm/trunk/modules/Webmails/ vtigercrm/trunk/modules/Webmails/CallRelatedList.php vtigercrm/trunk/modules/Webmails/DetailView.php vtigercrm/trunk/modules/Webmails/EditView.php vtigercrm/trunk/modules/Webmails/EditView.php.orig vtigercrm/trunk/modules/Webmails/Forms.php vtigercrm/trunk/modules/Webmails/ListView.php vtigercrm/trunk/modules/Webmails/ListView.php.orig vtigercrm/trunk/modules/Webmails/MailParse.php vtigercrm/trunk/modules/Webmails/PopupRelationChooser.php vtigercrm/trunk/modules/Webmails/Save.php vtigercrm/trunk/modules/Webmails/TODO vtigercrm/trunk/modules/Webmails/Webmail.php vtigercrm/trunk/modules/Webmails/Webmails.js vtigercrm/trunk/modules/Webmails/body.php vtigercrm/trunk/modules/Webmails/class.phpmailer.php vtigercrm/trunk/modules/Webmails/class.smtp.php vtigercrm/trunk/modules/Webmails/dlAttachments.php vtigercrm/trunk/modules/Webmails/images/ vtigercrm/trunk/modules/Webmails/images/delitem.png (with props) vtigercrm/trunk/modules/Webmails/images/down_pointer.png (with props) vtigercrm/trunk/modules/Webmails/images/draft.png (with props) vtigercrm/trunk/modules/Webmails/images/flag.png (with props) vtigercrm/trunk/modules/Webmails/images/folder.png (with props) vtigercrm/trunk/modules/Webmails/images/gnome-fs-trash-empty.png (with props) vtigercrm/trunk/modules/Webmails/images/gnome-fs-trash-full.png (with props) vtigercrm/trunk/modules/Webmails/images/inbox.png (with props) vtigercrm/trunk/modules/Webmails/images/index.php vtigercrm/trunk/modules/Webmails/images/mail_reply.png (with props) vtigercrm/trunk/modules/Webmails/images/minus.png (with props) vtigercrm/trunk/modules/Webmails/images/plus.gif (with props) vtigercrm/trunk/modules/Webmails/images/plus.png (with props) vtigercrm/trunk/modules/Webmails/images/sec_remove_eng.png (with props) vtigercrm/trunk/modules/Webmails/images/senti.png (with props) vtigercrm/trunk/modules/Webmails/images/sm_logo.png (with props) vtigercrm/trunk/modules/Webmails/images/sort_none.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_attach.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_macro-jump-back.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-flag-for-followup-done.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-flag-for-followup.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-forward.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-hide-read.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-open.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-priority-high.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-read.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-replied.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-reply.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail-unread.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_mail.png (with props) vtigercrm/trunk/modules/Webmails/images/stock_trash_full.png (with props) vtigercrm/trunk/modules/Webmails/images/trashcan_empty.png (with props) vtigercrm/trunk/modules/Webmails/images/up_pointer.png (with props) vtigercrm/trunk/modules/Webmails/index.php vtigercrm/trunk/modules/Webmails/index.php.orig.php vtigercrm/trunk/modules/Webmails/js/ vtigercrm/trunk/modules/Webmails/js/ajax_connection.js vtigercrm/trunk/modules/Webmails/js/script.js vtigercrm/trunk/modules/Webmails/language/ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php vtigercrm/trunk/modules/Webmails/sendmail.php vtigercrm/trunk/modules/Webmails/showOverviewUI.php vtigercrm/trunk/modules/Webmails/src/ vtigercrm/trunk/modules/Webmails/src/EmailTemplateSubjectField.zip (with props) vtigercrm/trunk/modules/Webmails/src/modules/ vtigercrm/trunk/modules/Webmails/src/modules/User/ vtigercrm/trunk/modules/Webmails/src/modules/User/TemplateMerge.php vtigercrm/trunk/modules/Webmails/src/modules/User/populatetemplate.php vtigercrm/trunk/modules/Webmails/templates/ vtigercrm/trunk/modules/Webmails/templates/Accept Order vtigercrm/trunk/modules/Webmails/templates/Acceptance Proposal vtigercrm/trunk/modules/Webmails/templates/Address Change vtigercrm/trunk/modules/Webmails/templates/Announcement for Release vtigercrm/trunk/modules/Webmails/templates/Default FOSS Template vtigercrm/trunk/modules/Webmails/templates/Distributor Annoucement (Contacts) vtigercrm/trunk/modules/Webmails/templates/FOSS Quote vtigercrm/trunk/modules/Webmails/templates/Follow Up vtigercrm/trunk/modules/Webmails/templates/Good received acknowledgement vtigercrm/trunk/modules/Webmails/templates/Invoice Due vtigercrm/trunk/modules/Webmails/templates/Marketing Campaign vtigercrm/trunk/modules/Webmails/templates/Pending Invoices vtigercrm/trunk/modules/Webmails/templates/Test Announcement vtigercrm/trunk/modules/Webmails/templates/Thanks Note vtigercrm/trunk/modules/Webmails/templates/testemailtemplateusage.php vtigercrm/trunk/modules/Webmails/templates/todel.txt vtigercrm/trunk/modules/Webmails/testview.php vtigercrm/trunk/modules/Webmails/tmp/ vtigercrm/trunk/modules/Webmails/tmp/1/ vtigercrm/trunk/modules/Webmails/tmp/1/callme.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 09:18:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 14:18:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4076 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060308141834.247124ACEDF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 07:18:27 2006 New Revision: 4076 Log: changes made to avoid duplicate display of events in dayview Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Wed Mar 8 07:18:27 2006 @@ -117,7 +117,7 @@ } } } - echo " + echo "
    @@ -281,9 +281,8 @@ } } } - $maxcol = 1; for ($i = -1 ; $i < 24 ; $i++ ) { - $maxcol = max($maxcol,count($table[$i])); + $maxcol[$i] = max($maxcol[$i],count($table[$i])); } //New UI-integrated by minnie echo "
    "; @@ -311,13 +310,13 @@ for ($i = 0; $i <24 ; $i++ ) { if($i == 0) - $this->getHourList('12am',$maxcol,$table,12); + $this->getHourList('12am',$maxcol[$i],$table,$i); if($i>0 && $i<12) - $this->getHourList($i.'am',$maxcol,$table,$i); + $this->getHourList($i.'am',$maxcol[$i],$table,$i); if($i == 12) - $this->getHourList('12pm',$maxcol,$table,12); + $this->getHourList('12pm',$maxcol[$i],$table,$i); if($i>12 && $i<24) - $this->getHourList(($i - 12).'pm',$maxcol,$table,$i); + $this->getHourList(($i - 12).'pm',$maxcol[$i],$table,$i); } echo ""; echo "
    \n"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 09:53:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 14:53:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4077 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060308145355.48E244AD2E6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 07:53:50 2006 New Revision: 4077 Log: changes made to get events in week view Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Wed Mar 8 07:53:50 2006 @@ -165,6 +165,94 @@ for ($column=0;$column<=6;$column++) { $next = NextDay($ts); + $dd->setDateTimeTS($next); + $d = $dd->getDate(); + $tref = Date("Ymd",$next); + $dinfo = GetDaysInfo($next); + + $from = new DateTime(); + $to = new DateTime(); + $from->setDateTimeTS($next - 12 * 3600); + $to->setDateTimeTS($next - 12 * 3600); + $this->pref->callist = array(); + appointment::readCal($this->pref,$from,$to); + //start + + for ($i = -1 ; $i < 24 ; $i++ ) { + $table[$column][$i] = array(); + } + foreach ($this->pref->callist as $idx => $xx) { + if ( ! $this->pref->callist[$idx]->inside($from)) { + continue; + } + if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "note" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "watchlist" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "task" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->gettype() == "reminder" ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( $this->pref->callist[$idx]->t_ignore == 1) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + if ( ($this->pref->callist[$idx]->s_out == 1) && ($this->pref->callist[$idx]->e_out == 1) ) { + $table[$column][-1][] = &$this->pref->callist[$idx]; + $rowspan[$column][-1][] = 1; + continue; + } + $x1 = Date("G",$this->pref->callist[$idx]->start->getTimeStamp()); + $x2 = Date("G",$this->pref->callist[$idx]->end->getTimeStamp()); + + if ( $this->pref->callist[$idx]->s_out == 1 ) { + $x1 = 0; + } + if ( $this->pref->callist[$idx]->e_out == 1 ) { + $x2 = 23; + } +# find a free position + $pos = -1; + $found = false; + while ( $found == false ) { + $found = true; + $pos ++; + for ( $i = $x1; $i <= $x2 ; $i++ ) { + if (isset($table[$column][$i][$pos]) ) { + $found = false; + continue; + } + } + } + for ( $i = $x1; $i <= $x2 ; $i++ ) { + if ( $i == $x1 ) { + $table[$column][$i][$pos] = &$this->pref->callist[$idx]; + $rowspan[$column][$i][$pos] = ($x2 - $x1 +1); + } else { + $table[$column][$i][$pos] = -1; + } + } + } + for ($i = -1 ; $i < 24 ; $i++ ) { + $maxcol[$i] = max($maxcol[$i],count($table[$column][$i])); + } + //end echo ""; echo strftime("%d - %a",$ts); echo ""; @@ -176,10 +264,8 @@ { $ts=$tempts; echo ""; - for ($column=0;$column<=7;$column++) - { - $next = NextDay($ts); - if ($column==0) + $next = NextDay($ts); + for ($column=1;$column<=1;$column++) { echo ""; if($row==0) echo "12am"; @@ -188,63 +274,38 @@ if($row>12 && $row<24) echo ($row-12)."pm"; echo ""; } - else + for ($column=0;$column<=6;$column++) { - $dd->setDateTimeTS($ts); - $d = $dd->getDate(); - $tref = Date("Ymd",$ts); - $dinfo = GetDaysInfo($ts); - - $from = new DateTime(); - $to = new DateTime(); - $from->setDateTimeTS($ts - 12 * 3600); - $to->setDateTimeTS($ts - 12 * 3600); -#$to->addDays(7); - $this->pref->callist = array(); - appointment::readCal($this->pref,$from,$to); - echo ""; - $hastable = false; - foreach ($this->pref->callist as $idx => $x) { - - //the correct day - if ( ! $this->pref->callist[$idx]->inside($dd) ) { - continue; - } - //if (!cal_check_against_list($this->pref->callist[$idx],$this->uids)) { - //continue; - //} - // do not show finished tasks - if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx] -->state == 2) ) { - - continue; - } - if ( !$hastable ) - { - - echo "\n"; - $hastable = true; - } - else - { - echo " \n"; - - } - $this->pref->callist[$idx]->formatted(); - - } - if ( $hastable ) { - echo "
    \n"; - } - - echo "

    "; + for ($c = 0 ; $c < $maxcol[$row] ; $c++ ) { + if ( isset ( $table[$column][$row][$c] ) ) { + if ( is_object ( $table[$column][$row][$c] ) ) { + $color = ""; + $username=$table[$column][$row][$c]->creator; + if ($username!=""){ + $query="SELECT cal_color FROM users where user_name = '$username'"; + + $result=$adb->query($query); + if($adb->getRowCount($result)!=0){ + $res = $adb->fetchByAssoc($result, -1, false); + $usercolor = $res['cal_color']; + $color="style=\"background: ".$usercolor.";\""; + } + } + echo "\n"; + echo $table[$column][$row][$c]->formatted(); + echo "
    ";//\n"; + } else if ( $table[$column][$row][$c] = -1 ) { + # SKIP occupied by rowspan + } + } + } + + echo "

    "; echo "+"; echo"
    "; $ts=$next; - } } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:34:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:34:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4078 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060308153456.A7DCB4AE109@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:34:51 2006 New Revision: 4078 Log: Added new field 'defhomeview varchar(100)' in the users table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Wed Mar 8 08:34:51 2006 @@ -74,6 +74,7 @@ + Type=InnoDB user_name From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:37:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:37:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4079 - in /vtigercrm/branches/4.2: index.php install/4createConfigFile.php Message-ID: <20060308153738.B44094AE228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:37:33 2006 New Revision: 4079 Log: changes made to point to install.php after installation Modified: vtigercrm/branches/4.2/index.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/index.php ============================================================================== --- vtigercrm/branches/4.2/index.php (original) +++ vtigercrm/branches/4.2/index.php Wed Mar 8 08:37:33 2006 @@ -356,7 +356,7 @@ } require_once('config.inc.php'); -if (!isset($dbconfig['db_hostname'])) { +if (!isset($dbconfig['db_hostname']) || $dbconfig['db_status']=='_DB_STAT_') { header("Location: install.php"); exit(); } Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Wed Mar 8 08:37:33 2006 @@ -158,6 +158,7 @@ $buffer = str_replace( "_MAIL_SERVER_", $mail_server, $buffer); $buffer = str_replace( "_MAIL_USERNAME_", $mail_server_username, $buffer); $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); + $buffer = str_replace( "_DB_STAT_", "true", $buffer); fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:40:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:40:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4080 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060308154051.498413ED55C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:40:47 2006 New Revision: 4080 Log: Added new function DefHomeView in commonutils Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Mar 8 08:40:47 2006 @@ -1236,6 +1236,12 @@ return mkdir($dir, $mode); } return FALSE; -} - + +} +function DefHomeView() +{ + global $adb; + global $current_user; + $query="select defhomeview from users where id = ".$current_user->id; + $result=$adb->query($query); $defaultview=$adb->query_result($result,0,'defhomeview'); return $defaultview; } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:42:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:42:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4081 - /vtigercrm/branches/4.2/config.template.php Message-ID: <20060308154222.8819F3ED55C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:42:19 2006 New Revision: 4081 Log: parameter added to check database population Modified: vtigercrm/branches/4.2/config.template.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Wed Mar 8 08:42:19 2006 @@ -47,6 +47,7 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; +$dbconfig['db_status'] = '_DBC_STAT_'; // TODO: test if port is empty // TODO: set db_hostname dependending on db_type From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:46:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:46:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4082 - /vtigercrm/trunk/include/language/en_us.lang.php Message-ID: <20060308154635.DB8C04AD228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:46:32 2006 New Revision: 4082 Log: Added Campaigns, Faq, Portal module name in the language file for JUMPTO Menu functionality Modified: vtigercrm/trunk/include/language/en_us.lang.php Modified: vtigercrm/trunk/include/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 10:50:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 15:50:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4083 - /vtigercrm/trunk/include/js/menu.js Message-ID: <20060308155037.F25BC4AD497@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 08:50:33 2006 New Revision: 4083 Log: Added 3 function related to Jumpto Slide menu Modified: vtigercrm/trunk/include/js/menu.js Modified: vtigercrm/trunk/include/js/menu.js ============================================================================== --- vtigercrm/trunk/include/js/menu.js (original) +++ vtigercrm/trunk/include/js/menu.js Wed Mar 8 08:50:33 2006 @@ -87,3 +87,40 @@ } + +function fnSlide1(obj,inner) +{ + var buff = document.getElementById(obj).width; + closeLimit = buff.substring(0,buff.length); + menu_max = eval(closeLimit); + var tagName = document.getElementById(inner); + document.getElementById(obj).style.width=0 + "px"; menu_i=0; + if (tagName.style.display == 'none') + fnexpanLay1(obj,inner); + else + fncloseLay1(obj,inner); + } + +function fnexpanLay1(obj,inner) +{ + document.getElementById(obj).style.display = 'block'; + var setText = eval(closeLimit) - 1; + if (menu_i<=eval(closeLimit)) + { + if (menu_i>setText){document.getElementById(inner).style.display='block';} + document.getElementById(obj).style.width=menu_i + "px"; + setTimeout(function() { fnexpanLay1(obj,inner); },5); + menu_i=menu_i+14; + } +} + + function fncloseLay1(obj,inner) +{ + if (menu_max >= eval(openLimit)) + { + if (menu_max Author: saraj Date: Wed Mar 8 08:58:15 2006 New Revision: 4084 Log: Style added for new homepage design Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Mar 8 08:58:15 2006 @@ -989,5 +989,201 @@ a.tagLink:Hover{ color:#000000; text-decoration:underline; -} - + +} + + +/*slide menu css*/ + +#mnuSlide{ + position:absolute; + left:0px; + top:100px; + width:110px; + } + + a.submenu { + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + background-color:#CCCCCC; + 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; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + 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; + } + + + /* New Home Page Css */ + + .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; + } + + a.imageTab{ + background-color:#F5F5F5; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + padding-top:3px; + } + + a.imageTab:Hover{ + background-color:#BFBFFF; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + opacity:.5; + } + + .mnuTabH{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; + } + + .mnuTabH tr td{ + border-bottom:1px solid #EBEBEB; + 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:Verdana, 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:Verdana, 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; + } + + .padTab1{ + border-bottom:15px solid #EBEBEB; + border-left:15px solid #EBEBEB; + border-top:15px solid #EBEBEB; + vertical-align:top; + padding:5px; + } + + .frmSelect{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + border:1px #EBEBEB; + } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:02:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:02:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4085 - /vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Message-ID: <20060308160219.94BC44AE228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:02:15 2006 New Revision: 4085 Log: Replaced the invoice gif with quotes Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Wed Mar 8 09:02:15 2006 @@ -123,7 +123,7 @@ } - $title=array('myTopInvoices.gif',$current_module_strings['LBL_MY_TOP_QUOTE'],'home_mytopinv'); + $title=array('TopOpenQuotes.gif',$current_module_strings['LBL_MY_TOP_QUOTE'],'home_mytopquote'); //Retreive the List View Table Header $listview_header = getListViewHeader($focus,"Quotes",$url_string,$sorder,$order_by,"HomePage",$oCustomView); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:04:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4086 - /vtigercrm/trunk/modules/Activities/OpenListView.php Message-ID: <20060308160456.46A6D4AE266@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:04:52 2006 New Revision: 4086 Log: commented upcoming date Modified: vtigercrm/trunk/modules/Activities/OpenListView.php Modified: vtigercrm/trunk/modules/Activities/OpenListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:08:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:08:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4087 - /vtigercrm/branches/4.2/config.template.php Message-ID: <20060308160833.D99B84AE46E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:08:29 2006 New Revision: 4087 Log: prameter name modified Modified: vtigercrm/branches/4.2/config.template.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Wed Mar 8 09:08:29 2006 @@ -47,7 +47,7 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; -$dbconfig['db_status'] = '_DBC_STAT_'; +$dbconfig['db_status'] = '_DB_STAT_'; // TODO: test if port is empty // TODO: set db_hostname dependending on db_type From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:09:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:09:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4088 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060308160940.7D2152BF2CF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:09:36 2006 New Revision: 4088 Log: Added ->assign(MODULELISTS, ['moduleList']); in header file Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Wed Mar 8 09:09:36 2006 @@ -64,6 +64,8 @@ $smarty->assign("MODULE_NAME", $currentModule); +$smarty->assign("MODULELISTS", $app_list_strings['moduleList']); + $smarty->assign("DATE", getDisplayDate(date("Y-m-d H:i"))); if ($current_user->first_name != '') $smarty->assign("CURRENT_USER", $current_user->first_name); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:15:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:15:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4089 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060308161509.E2B3D49A36F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:15:05 2006 New Revision: 4089 Log: Added the JUMPTO slide menu in header tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Mar 8 09:15:05 2006 @@ -117,3 +117,25 @@ {rdelim} setInterval("Announcement_rss()",5000) + +{* Begining of Slide Menu *} + +
    + + + + + +
    + + +
    J
    U
    M
    P

    T
    O
    +
    +
    + +{* End *} + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:29:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:29:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4090 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060308162953.865BC4AD5F6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:29:49 2006 New Revision: 4090 Log: New Homepage tpl written Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed Mar 8 09:29:49 2006 @@ -1,5 +1,32 @@ + + + + {**} @@ -57,57 +84,83 @@ - - - - - From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:11:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:11:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4105 - /vtigercrm/trunk/include/js/clock.js Message-ID: <20060309091113.F006D4AD1F7@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:11:09 2006 New Revision: 4105 Log: js added for clock Added: vtigercrm/trunk/include/js/clock.js From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:13:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:13:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4106 - /vtigercrm/trunk/themes/blue/images/Home_15.gif Message-ID: <20060309091327.9C4384AD1F7@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:13:22 2006 New Revision: 4106 Log: Added Home_15.gif in images folder Added: vtigercrm/trunk/themes/blue/images/Home_15.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:23:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:23:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4107 - in /vtigercrm/trunk: Smarty/templates/Header.tpl include/calculator/Calc.php themes/blue/header.php Message-ID: <20060309092308.120DF4AE0CC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:23:00 2006 New Revision: 4107 Log: calculator and clock integrated Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/include/calculator/Calc.php vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 02:23:00 2006 @@ -103,6 +103,152 @@
    -
    - - - "; $shtml .= ""; - $shtml .= ""; $shtml .= ""; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:10:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:10:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4095 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060309071033.7EE964ACEDF@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:10:29 2006 New Revision: 4095 Log: changes made to enable webmail Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Thu Mar 9 00:10:29 2006 @@ -28,17 +28,19 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=squirrelmail-1.4.4&action=redirect'); -$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=squirrelmail-1.4.4&action=redirect'=>'Emails'); +$submenu = array('LBL_EMAILS_TITLE'=>'index.php?module=Emails&action=ListView.php','LBL_WEBMAILS_TITLE'=>'index.php?module=Webmails&action=index&parenttab=My Home Page'); + +$sec_arr = array('index.php?module=Emails&action=ListView.php'=>'Emails','index.php?module=Webmails&action=index&parenttab=parenttab=My Home Page'=>'Emails'); echo '
    '; + ?> - + '.$mod_strings[$label].''; + echo ''; $listView = $filename; $classname = "tabOff"; } elseif(stristr($label,$_REQUEST['smodule'])) { - echo ''; + echo ''; $listView = $filename; $classname = "tabOff"; } else { - echo ''; + echo ''; } $classname = "tabOff"; } - }*/ + } ?> - +
    Author: saraj Date: Thu Mar 9 00:13:42 2006 New Revision: 4096 Log: Included menu.js file Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 00:13:42 2006 @@ -12,6 +12,7 @@ +
    -
    - - {foreach key=table item=tabledetail from=$HOMEDETAILS} - {if $tabledetail ne ''} - - - - - + +
    - {if $tabledetail.Title[3] ne ''} - -
    +{* Main Contents Start Here *} + + + + - + + + + + + + + + + + +
    + + + + + + + + + + - - {if $tabledetail.Title[3] ne ''} - - {/if} -
    + +
    + + + + + {* {foreach item=hometab from=$HOMEDETAILS} + {if $hometab.Title.3 neq ''} + {/if} -
    My Home - At a Glance + + + + {$hometab.Title.3} +
    - + {/foreach} *} + + + +
    +
    +
     
    + + + - - -
    + + {foreach item=hometab from=$HOMEDETAILS} + {if $hometab neq ''} + {if $hometab.Title.2 eq $HOMEDEFAULTVIEW} + + + + + + {else} + + + + + {/if} + {/if} + {/foreach} +
    {$hometab.Title.1}
    {$hometab.Title.1}
    +     		+ + {foreach item=tabledetail from=$HOMEDETAILS} + {if $tabledetail neq ''} + {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} +
    -
    - - + + + {foreach key=header item=headerdetail from=$tabledetail.Header} @@ -125,25 +178,31 @@ {/foreach} - -
    {$tabledetail.Title.1} (Mark as Default View)
     
    + +
    +{/if} +{/foreach}
    -

    - {/if} - {/foreach} - -
    -     		- Pipeline chart comes here..

    - - + + +
     

    + +
    YOUR SHOUT!!!Minimize / Maximize
     
    @@ -209,6 +268,8 @@
    + +
    + + + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:40:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:40:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4091 - /vtigercrm/trunk/themes/blue/images/HomeBtm.gif Message-ID: <20060308164040.A6A583DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:40:35 2006 New Revision: 4091 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/HomeBtm.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:40:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:40:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4092 - /vtigercrm/trunk/themes/blue/images/hometop.gif Message-ID: <20060308164055.D54A53DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:40:51 2006 New Revision: 4092 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/hometop.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 8 11:41:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 08 Mar 2006 16:41:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4093 - /vtigercrm/trunk/themes/blue/images/tabRht.gif Message-ID: <20060308164112.29E363DBBFD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 09:41:08 2006 New Revision: 4093 Log: Image added for homepage Added: vtigercrm/trunk/themes/blue/images/tabRht.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 01:11:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 06:11:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4094 - /vtigercrm/trunk/modules/Rss/Rss.php Message-ID: <20060309061128.A9F7E49A492@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 8 23:11:24 2006 New Revision: 4094 Log: Added width=10% in the function getStarredRssFolder for aligning Delete Image Modified: vtigercrm/trunk/modules/Rss/Rss.php Modified: vtigercrm/trunk/modules/Rss/Rss.php ============================================================================== --- vtigercrm/trunk/modules/Rss/Rss.php (original) +++ vtigercrm/trunk/modules/Rss/Rss.php Wed Mar 8 23:11:24 2006 @@ -154,7 +154,7 @@ $shtml .= "
    ".substr($allrssrow['rsstitle'],0,15)."...
       '.$mod_strings[$label].'   '.$mod_strings[$label].''.$mod_strings[$label].''.$mod_strings[$label].''.$mod_strings[$label].'
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:20:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:20:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4097 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060309072020.C21CE4AD557@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:20:15 2006 New Revision: 4097 Log: changes made to display event in corresponding day of the week Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 9 00:20:15 2006 @@ -160,10 +160,16 @@ $tempts=$ts; for ($row=1;$row<=1;$row++) { - echo ""; - echo ""; - for ($column=0;$column<=6;$column++) + for ($column=0;$column<=7;$column++) { + if($column==0) + { + echo ""; + echo ""; + } + else + { + $next = NextDay($ts); $dd->setDateTimeTS($next); $d = $dd->getDate(); @@ -187,36 +193,6 @@ } if ( ($this->pref->callist[$idx]->gettype() == "task") && ($this->pref->callist[$idx]->state == 2) ) { continue; - } - if ( $this->pref->callist[$idx]->gettype() == "note" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "watchlist" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "task" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->gettype() == "reminder" ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( $this->pref->callist[$idx]->t_ignore == 1) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; - } - if ( ($this->pref->callist[$idx]->s_out == 1) && ($this->pref->callist[$idx]->e_out == 1) ) { - $table[$column][-1][] = &$this->pref->callist[$idx]; - $rowspan[$column][-1][] = 1; - continue; } $x1 = Date("G",$this->pref->callist[$idx]->start->getTimeStamp()); $x2 = Date("G",$this->pref->callist[$idx]->end->getTimeStamp()); @@ -257,6 +233,7 @@ echo strftime("%d - %a",$ts); echo ""; $ts = $next; + } } echo ""; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:24:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:24:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4098 - /vtigercrm/trunk/modules/Home/index.php Message-ID: <20060309072412.55D4C4AD5F6@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:24:08 2006 New Revision: 4098 Log: Included commonutils file & assigned defhomeview function Modified: vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Thu Mar 9 00:24:08 2006 @@ -26,6 +26,7 @@ require_once($theme_path.'layout_utils.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/UserInfoUtil.php'); +require_once('include/utils/CommonUtils.php'); global $app_strings; global $app_list_strings; global $mod_strings; @@ -164,6 +165,7 @@ $t=Date("Ymd"); $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("HOMEDETAILS",$home_values); +$smarty->assign("HOMEDEFAULTVIEW",DefHomeView()); $smarty->display("HomePage.tpl"); function getLoginHistory() From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:50:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:50:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4099 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060309075017.8790B4ADD2A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:50:11 2006 New Revision: 4099 Log: Included global variable app_list_strings Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 00:50:11 2006 @@ -47,7 +47,7 @@ global $currentModule; - +global $app_list_strings; global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -87,4 +87,4 @@ global $module_menu; $smarty->display("Header.tpl"); -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 02:54:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 07:54:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4100 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060309075424.77F1B4AE227@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:54:20 2006 New Revision: 4100 Log: style added for the homepage Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 9 00:54:20 2006 @@ -996,194 +996,193 @@ /*slide menu css*/ #mnuSlide{ - position:absolute; - left:0px; - top:100px; - width:110px; - } - - a.submenu { - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - width:100px; - height:20px; - padding-top:3px; - padding-left:10px; - border-bottom:1px solid #ECECEC; - background-color:#CCCCCC; - 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; - width:100px; - height:20px; - padding-top:3px; - padding-left:10px; - border-bottom:1px solid #ECECEC; - 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; - } - - - /* New Home Page Css */ - - .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; - } - - a.imageTab{ - background-color:#F5F5F5; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - padding-top:3px; - } - - a.imageTab:Hover{ - background-color:#BFBFFF; - border:0px solid #EBEBEB; - width:30px; - height:30px; - display:block; - opacity:.5; - } - - .mnuTabH{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:12px; - color:#000000; - width:100%; - border:0px solid #000000; - } - - .mnuTabH tr td{ - border-bottom:1px solid #EBEBEB; - 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:Verdana, 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:Verdana, 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; - } - - .padTab1{ - border-bottom:15px solid #EBEBEB; - border-left:15px solid #EBEBEB; - border-top:15px solid #EBEBEB; - vertical-align:top; - padding:5px; - } - - .frmSelect{ - font-family:Verdana, Arial, Helvetica, sans-serif; - font-size:11px; - border:1px #EBEBEB; - } + position:absolute; + left:0px; + top:100px; +} + +a.submenu { + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + background-color:#CCCCCC; + 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; + width:100px; + height:20px; + padding-top:3px; + padding-left:10px; + border-bottom:1px solid #ECECEC; + 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; +} + + +/* New Home Page Css */ + +.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; +} + +a.imageTab{ + background-color:#F5F5F5; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + padding-top:3px; +} + +a.imageTab:Hover{ + background-color:#BFBFFF; + border:0px solid #EBEBEB; + width:30px; + height:30px; + display:block; + opacity:.5; +} + +.mnuTabH{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:12px; + color:#000000; + width:100%; + border:0px solid #000000; +} + +.mnuTabH tr td{ + border-bottom:1px solid #EBEBEB; + 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:Verdana, 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:Verdana, 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; +} + +.padTab1{ + border-bottom:15px solid #EBEBEB; + border-left:15px solid #EBEBEB; + border-top:15px solid #EBEBEB; + vertical-align:top; + padding:5px; +} + +.frmSelect{ + font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:11px; + border:1px #EBEBEB; +} } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 03:00:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:00:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4101 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060309080001.E2F344AF3B4@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 00:59:57 2006 New Revision: 4101 Log: Added defhomeview field in users table Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 03:04:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:04:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4102 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060309080402.9D23B4AF3CE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 01:03:58 2006 New Revision: 4102 Log: Added field defhomeview in User.php file Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Mar 9 01:03:58 2006 @@ -90,6 +90,7 @@ var $lead_view; var $tagcloud; var $imagename; + var $defhomeview; var $column_fields = Array("id" ,"user_name" ,"user_password" @@ -130,6 +131,7 @@ ,"lead_view" ,"tagcloud" ,"imagename" + ,"defhomeview" ); var $encodeFields = Array("first_name", "last_name", "description"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 03:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 08:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4103 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060309081000.EEDF32CA2A2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 01:09:57 2006 New Revision: 4103 Log: Added function DefHomeView in commonutils Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Mar 9 01:09:57 2006 @@ -1236,12 +1236,17 @@ return mkdir($dir, $mode); } return FALSE; - -} +} + function DefHomeView() { global $adb; global $current_user; $query="select defhomeview from users where id = ".$current_user->id; - $result=$adb->query($query); $defaultview=$adb->query_result($result,0,'defhomeview'); return $defaultview; } + $result=$adb->query($query); + $defaultview=$adb->query_result($result,0,'defhomeview'); + return $defaultview; + +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:10:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:10:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4104 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060309091011.2E0BE2CA66A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:10:05 2006 New Revision: 4104 Log: Image Path given to home_15.gif Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 9 02:10:05 2006 @@ -195,7 +195,7 @@ - +
    vtiger CRM
     
     
      
    + + + +
    + + + + + + + +
    +
    +
    + + +
    +
    + + +
    3
    +
    4
    +
    5
    +
    6
    +
    7
    +
    8
    +
    9
    +
    10
    +
    11
    +
    12
    +
    1
    +
    2
    +
    +
    + - - - - - - - - - -
    @@ -29,31 +23,16 @@ -
    - - - - - - - - - -
    @@ -99,13 +78,7 @@
    EOQ; Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 02:23:00 2006 @@ -44,10 +44,12 @@ require_once("include/utils/utils.php"); +require_once("include/calculator/Calc.php"); + global $currentModule; -global $app_list_strings; + global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -64,8 +66,6 @@ $smarty->assign("MODULE_NAME", $currentModule); -$smarty->assign("MODULELISTS", $app_list_strings['moduleList']); - $smarty->assign("DATE", getDisplayDate(date("Y-m-d H:i"))); if ($current_user->first_name != '') $smarty->assign("CURRENT_USER", $current_user->first_name); @@ -75,6 +75,7 @@ $smarty->assign("CURRENT_USER_ID", $current_user->id); $smarty->assign("CATEGORY",getParentTab()); +$smarty->assign("CALC",get_calc($image_path)); if (is_admin($current_user)) $smarty->assign("ADMIN_LINK", "".$app_strings['LBL_SETTINGS'].""); @@ -87,4 +88,4 @@ global $module_menu; $smarty->display("Header.tpl"); -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:31:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:31:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4108 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl DetailView.tpl HomePage.tpl ListView.tpl salesEditView.tpl Message-ID: <20060309093131.6687C4AF3CD@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:31:24 2006 New Revision: 4108 Log: clock and calculator has been integrated Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Thu Mar 9 02:31:24 2006 @@ -69,8 +69,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Mar 9 02:31:24 2006 @@ -52,8 +52,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 9 02:31:24 2006 @@ -55,7 +55,7 @@ - +
    Search in Accounts... 
    @@ -64,8 +64,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Thu Mar 9 02:31:24 2006 @@ -67,8 +67,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Thu Mar 9 02:31:24 2006 @@ -66,8 +66,8 @@ Open Calendar... - Show World Clock... - Open Calculator... + Show World Clock... + Open Calculator... From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 04:53:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 09:53:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4109 - in /vtigercrm/branches/4.2/pkg: ./ apache/ apache/bin/ apache/conf/ bin/ license/ php/ Message-ID: <20060309095326.E67094AE071@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 02:53:06 2006 New Revision: 4109 Log: added to generate build from svn Added: vtigercrm/branches/4.2/pkg/ vtigercrm/branches/4.2/pkg/apache/ vtigercrm/branches/4.2/pkg/apache/bin/ vtigercrm/branches/4.2/pkg/apache/bin/ShutdownApache.exe (with props) vtigercrm/branches/4.2/pkg/apache/conf/ vtigercrm/branches/4.2/pkg/apache/conf/lin_httpd.conf (with props) vtigercrm/branches/4.2/pkg/apache/conf/win_httpd.conf vtigercrm/branches/4.2/pkg/bin/ vtigercrm/branches/4.2/pkg/bin/datamigration.bat vtigercrm/branches/4.2/pkg/bin/datamigration.sh vtigercrm/branches/4.2/pkg/bin/find_replace.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.sh vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat vtigercrm/branches/4.2/pkg/bin/stopvTiger.sh vtigercrm/branches/4.2/pkg/bin/uninstallvtiger.sh vtigercrm/branches/4.2/pkg/license/ vtigercrm/branches/4.2/pkg/license/License_linux.txt vtigercrm/branches/4.2/pkg/license/License_windows.txt vtigercrm/branches/4.2/pkg/php/ vtigercrm/branches/4.2/pkg/php/php.ini From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:06:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:06:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4110 - /vtigercrm/trunk/themes/blue/header.php Message-ID: <20060309100640.7D91B4AF5CB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:06:36 2006 New Revision: 4110 Log: issue in jumpto has been fixed Modified: vtigercrm/trunk/themes/blue/header.php Modified: vtigercrm/trunk/themes/blue/header.php ============================================================================== --- vtigercrm/trunk/themes/blue/header.php (original) +++ vtigercrm/trunk/themes/blue/header.php Thu Mar 9 03:06:36 2006 @@ -49,7 +49,7 @@ global $currentModule; - +global $app_list_strings; global $moduleList; global $theme; $theme_path="themes/".$theme."/"; @@ -73,7 +73,7 @@ else $smarty->assign("CURRENT_USER", $current_user->user_name); $smarty->assign("CURRENT_USER_ID", $current_user->id); - +$smarty->assign("MODULELISTS",$app_list_strings['moduleList']); $smarty->assign("CATEGORY",getParentTab()); $smarty->assign("CALC",get_calc($image_path)); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:12:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:12:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4111 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060309101207.3E4B14AD1D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:12:03 2006 New Revision: 4111 Log: style sheet added for calculator and clock Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Mar 9 03:12:03 2006 @@ -1185,4 +1185,139 @@ font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; border:1px #EBEBEB; -} } +} + +/* clock */ + +.citystyle{ + position:relative; + top:0px; + left:0px; + text-align:left; + +} +#theClockLayer{ + position:relative; + height:180px; + left:20px; + text-align:center; +} +.handsanddotsstyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:2px; + height:2px; + font-size:2px; + background-color:#000000; +} + +.facestyle{ + margin-top:10px; + position:absolute; + top:0px; + left:0px; + width:15px; + height:15px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.datestyle{ + margin-top:20px; + position:absolute; + top:0px; + left:0px; + width:100px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +.ampmstyle{ + margin-top:23px; + position:absolute; + top:0px; + left:0px; + width:20px; + text-align:center; + font-family:arial,sans-serif; + font-size:10px; + color:#000000; +} +#wclock{ + position:absolute; + left:100px; + top:100px; + visibility:hidden; + display:block; + background-color:#CCCCCC; + width:175px; +} + +.leftFormBorder1 { + border: 1px solid #AFC8E4; + background-color: #FFFFFF; + opacity:.7; +} + + +/* Calculator */ +.calcBg { + background: url(images/cal_bg.gif); + border: 1px solid #009900; +} +.calcResult { + width: 100%; + height: 25; + background-color: #FFFFCC;/*CBDFD6*/ + border-top: 1px solid #CCC; + border-left: 0px; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + font-size: 10; + text-align: right; +} +.calcMem { + width: 100%; + height: 25; + border-top: 1px solid #CCC; + border-left: 1px solid #CCC; + border-right: 0px; + border-bottom: 1px solid #CCC; + background-color: #FFFFCC;/*CBDFD6*/ + font-family: Arial; + font-size: 10; + color: #BBB; + text-align: left; +} +.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn { + border: none; + width: 10; + height: 20; + font-size: 11px; + color: #FFF; + text-align:left; +} +.calcBackBtn { + background: url(images/calc_back_btn.gif) no-repeat; + width:25px; +} +.calcBlackBtn { + background: url(images/calc_black_btn.gif) no-repeat; + width:25px; +} +.calcGreyBtn { + background: url(images/calc_grey_btn.gif) no-repeat; +} +.calcCancBtn { + background: url(images/calc_canc_btn.gif) no-repeat; + +} +.calcMemBtn { + background: url(images/calc_mem_btn.gif) no-repeat; + width:25px; +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:22:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:22:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4112 - /vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Message-ID: <20060309102240.CF8AD4AD557@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:22:36 2006 New Revision: 4112 Log: Clock and calc integrated for related lists Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Thu Mar 9 03:22:36 2006 @@ -33,8 +33,8 @@ - - + +
    Open Calendar...Show World Clock...Open Calculator...Show World Clock...Open Calculator...
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 05:28:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 10:28:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4113 - /vtigercrm/trunk/include/calculator/Calc.php Message-ID: <20060309102859.F37664AF262@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 03:28:55 2006 New Revision: 4113 Log: border for the calculator has been removed Modified: vtigercrm/trunk/include/calculator/Calc.php Modified: vtigercrm/trunk/include/calculator/Calc.php ============================================================================== --- vtigercrm/trunk/include/calculator/Calc.php (original) +++ vtigercrm/trunk/include/calculator/Calc.php Thu Mar 9 03:28:55 2006 @@ -15,7 +15,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 06:14:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 11:14:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4114 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060309111422.39B9C4AD1D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 04:14:15 2006 New Revision: 4114 Log: issue in creating freetagged_object table has been fixed Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 9 04:14:15 2006 @@ -7139,7 +7139,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 07:07:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:07:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4115 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060309120717.C3E624AF59D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:07:12 2006 New Revision: 4115 Log: Slide menu heading changed to Go To & effect is changed to onclick Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 9 05:07:12 2006 @@ -277,8 +277,8 @@ {/foreach} -
    -
    J
    U
    M
    P

    T
    O
    +     		+

    G
    O

    T
    O
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 07:20:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:20:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4116 - in /vtigercrm/branches/4.2/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat Message-ID: <20060309122032.1B0C24AE159@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:20:24 2006 New Revision: 4116 Log: changes made for 424rc2 Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.bat vtigercrm/branches/4.2/pkg/bin/startvTiger.sh vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/4.2/pkg/bin/startvTiger.bat Thu Mar 9 05:20:24 2006 @@ -47,12 +47,12 @@ bin\apache -k uninstall -n vtigercrm4_2 echo "" echo "" -echo "installing vtigercrm4_2 apache service" +echo "installing vtigercrm4_2_4rc2 apache service" echo "" echo "" bin\apache -k install -n vtigercrm4_2 -f conf\httpd.conf echo "" -echo "Starting vtigercrm4_2 apache service" +echo "Starting vtigercrm4_2_4rc2 apache service" echo "" bin\apache -n vtigercrm4_2 -k start IF ERRORLEVEL 1 goto stopservice @@ -112,27 +112,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm4_2 database already exists" +echo "check to see if vtigercrm4_2_4 database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm4_2'" | "%WINDIR%\system32\find.exe" "vtigercrm4_2" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm4_2_4'" | "%WINDIR%\system32\find.exe" "vtigercrm4_2_4" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm4_2 database exists" +ECHO "vtigercrm4_2_4 database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm4_2 database does not exist" +ECHO "vtigercrm4_2_4 database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm4_2 and populate the same" +echo "Proceeding to create database vtigercrm4_2_4 and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm4_2" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm4_2_4" echo "" -echo "vtigercrm4_2 database created" +echo "vtigercrm4_2_4 database created" echo "" goto end Modified: vtigercrm/branches/4.2/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/startvTiger.sh (original) +++ vtigercrm/branches/4.2/pkg/bin/startvTiger.sh Thu Mar 9 05:20:24 2006 @@ -111,14 +111,14 @@ fi echo "" -echo "Checking if the vtigercrm4_2 database already exists" +echo "Checking if the vtigercrm4_2_4 database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm4_2 >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm4_2_4 >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm4_2 does not exist. Creating database vtigercrm4_2" + echo "Database vtigercrm4_2_4 does not exist. Creating database vtigercrm4_2_4" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm4_2" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm4_2_4" fi host=`hostname` Modified: vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/branches/4.2/pkg/bin/stopvTiger.bat Thu Mar 9 05:20:24 2006 @@ -32,11 +32,11 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm4_2 apache service" +echo "stopping vtigercrm4_2_4rc2 apache service" echo "" bin\apache -n vtigercrm4_2 -k stop echo "" -echo "uninstalling vtigercrm4_2 apache service" +echo "uninstalling vtigercrm4_2_4rc2 apache service" echo "" bin\apache -k uninstall -n vtigercrm4_2 rem .\bin\ShutdownApache.exe logs\httpd.pid From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 07:36:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 12:36:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4117 - /vtigercrm/branches/4.2/install/2setConfig.php Message-ID: <20060309123623.779594B0310@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 05:36:19 2006 New Revision: 4117 Log: database name changed for 424rc2 release Modified: vtigercrm/branches/4.2/install/2setConfig.php Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Thu Mar 9 05:36:19 2006 @@ -100,10 +100,10 @@ if (isset($_REQUEST['db_name'])) $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') $db_name = $dbconfig['db_name']; else - $db_name = 'vtigercrm'; + $db_name = 'vtigercrm4_2_4'; !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; @@ -143,7 +143,7 @@ !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; */ - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $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']; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 08:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4118 - in /vtigercrm/trunk/include/js: effectspack.js prototype_fade.js Message-ID: <20060309132744.895D4438959@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:27:26 2006 New Revision: 4118 Log: files added for fade effect Added: vtigercrm/trunk/include/js/effectspack.js vtigercrm/trunk/include/js/prototype_fade.js From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 08:28:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4119 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309132840.5D07C40113B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:28:25 2006 New Revision: 4119 Log: fade effect integrated Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 06:28:25 2006 @@ -2,6 +2,8 @@ + + @@ -42,194 +44,205 @@ -
     
    + +
    +
    + - - -
    - + - - - - + + + +
     {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} {$UMOD.LBL_USER_LOGIN_ROLE}{$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_ADDR_INFN} 
    -
    - - - -
     
    - - - - - - - - - + + - - - -
    {$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    +
    + + + -
     
    + + + + + + + + + {if $MODE eq 'edit'} - - - - - + + + + + {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_MORE_INFN}
    *{$UMOD.LBL_USER_NAME} {$USER_NAME}{$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    *{$UMOD.LBL_PASSWORD} *{$UMOD.LBL_CONFIRM_PASSWORD}
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    -
    -
    -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} -
     
    -
    -
    - -
    - - - -
     
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    -
    -
    -
     
    -
    - -
    -
    +
    {$UMOD.LBL_FIRST_NAME} {$FIRST_NAME}*{$UMOD.LBL_LAST_NAME}{$LAST_NAME}
    *{$UMOD.LBL_USER_ROLE}{$ROLEASSIGNED} {$UMOD.LBL_GROUP_NAME}{$GROUPASSIGNED}
    *{$UMOD.LBL_EMAIL}{$EMAIL1}*{$UMOD.LBL_STATUS}{$STATUS}
     
    {$UMOD.LBL_ACTIVITY_VIEW}{$ACTIVITY_VIEW}{$UMOD.LBL_LEAD_VIEW}{$LEAD_VIEW}
    *{$UMOD.LBL_COLOR}{$COLORASSIGNED}{$UMOD.LBL_CURRENCY_NAME}{$CURRENCY_NAME}
     
    + + +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_TITLE}{$TITLE}{$UMOD.LBL_OFFICE_PHONE}{$PHONE_WORK}
    {$UMOD.LBL_DEPARTMENT}{$DEPARTMENT}{$UMOD.LBL_MOBILE_PHONE}{$PHONE_MOBILE}
    {$UMOD.LBL_REPORTS_TO}{$REPORTS_TO_NAME}{$REPORTS_TO_ID} {$UMOD.LBL_OTHER_PHONE}{$PHONE_OTHER}
    {$UMOD.LBL_OTHER_EMAIL}{$EMAIL2}{$UMOD.LBL_FAX}{$PHONE_FAX}
    {$UMOD.LBL_YAHOO_ID}{$YAHOO_ID}{$UMOD.LBL_HOME_PHONE}{$PHONE_HOME}
    {$UMOD.LBL_DATE_FORMAT}{$DATE_FORMAT}  
    {$UMOD.LBL_SIGNATURE}{$SIGNATURE}{$UMOD.LBL_NOTES}{$DESCRIPTION} +
     
    +
    +
    +
    + + + +
     
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$UMOD.LBL_USER_INFORMATION}
    {$UMOD.LBL_ADDRESS}{$ADDRESS_STREET}  
    {$UMOD.LBL_CITY}{$ADDRESS_CITY}  
    {$UMOD.LBL_STATE}{$ADDRESS_STATE}  
    {$UMOD.LBL_POSTAL_CODE}{$ADDRESS_POSTALCODE}  
    {$UMOD.LBL_COUNTRY}{$ADDRESS_COUNTRY}  
     
    +
    +
    + + + +   + + +
    + +
    + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 08:33:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 13:33:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4120 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309133340.9900C4B0326@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 06:33:34 2006 New Revision: 4120 Log: table heading changed Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 06:33:34 2006 @@ -55,7 +55,7 @@   {$UMOD.LBL_USER_LOGIN_ROLE} - {$UMOD.LBL_USER_MORE_INFN} + {$UMOD.LBL_USER_MORE_INFN} {$UMOD.LBL_USER_ADDR_INFN}   @@ -70,7 +70,7 @@ - + @@ -128,7 +128,7 @@
    {$UMOD.LBL_USER_MORE_INFN}{$UMOD.LBL_USER_INFORMATION}
    *{$UMOD.LBL_USER_NAME}
    - + @@ -184,7 +184,7 @@
    {$UMOD.LBL_USER_ADDR_INFN}{$UMOD.LBL_USER_MORE_INFN}
    {$UMOD.LBL_TITLE}
    - + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 09:45:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 14:45:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4121 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060309144538.148674AD496@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 07:45:33 2006 New Revision: 4121 Log: slider added Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 09:47:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 14:47:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4122 - /vtigercrm/trunk/themes/images/scaler_slider_track.gif Message-ID: <20060309144742.E87D54AD496@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 07:47:38 2006 New Revision: 4122 Log: slider image added Added: vtigercrm/trunk/themes/images/scaler_slider_track.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 9 10:01:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 09 Mar 2006 15:01:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4123 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060309150149.C64224AF3CC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 08:01:46 2006 New Revision: 4123 Log: default position assigned to the slider for image resize Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Mar 9 08:01:46 2006 @@ -234,6 +234,8 @@ {ldelim} contents[i].style.display = 'none'; {rdelim} +//to set the slider to the default size +document.getElementById('handle1').style.left='45px'; From vtiger-tickets at vtiger.fosslabs.com Thu Mar 9 13:03:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 09 Mar 2006 18:03:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.5fdc98124a14605d3eaf2082810f2ca1@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by anonymous): Hi Pieter, As soon as 4.2.4 releases we will make a branch to coordinate the postgres support. As of 4.2.4 it will take a bit of work for postgres support. As for how much work it will be, I'll leave for others to say. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 01:37:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 06:37:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4124 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060310063712.BB2334B4D47@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 9 23:37:07 2006 New Revision: 4124 Log: colum name changed from tagg_id to tag_id Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 9 23:37:07 2006 @@ -7120,7 +7120,7 @@
    {$UMOD.LBL_USER_INFORMATION}{$UMOD.LBL_USER_ADDR_INFN}
    {$UMOD.LBL_ADDRESS}
    - + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 05:11:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 10:11:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4125 - in /vtigercrm/trunk: Smarty/templates/UserListView.tpl include/utils/utils.php modules/Users/ListView.php Message-ID: <20060310101155.C7B214B048A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 03:11:46 2006 New Revision: 4125 Log: fade images added for userlistview Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/modules/Users/ListView.php Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Fri Mar 10 03:11:46 2006 @@ -12,12 +12,25 @@ + -{$NAVIGATION} - + -
    +{if $USER_IMAGES neq ''} + + +
    +[X] Close +
    +{foreach item=imagename from=$USER_IMAGES} + {$imagename} +{/foreach} +
    +
    +{/if} +    		 {$RECORD_COUNTS}{$NAVIGATION}
     
    +
    Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Fri Mar 10 03:11:46 2006 @@ -1943,4 +1943,22 @@ } +function getUserImageNames() +{ + global $adb; + global $log; + $query = "select imagename from users where deleted=0"; + $result = $adb->query($query); + $image_name=array(); + for($i=0;$i<$adb->num_rows($result);$i++) + { + if($adb->query_result($result,$i,"imagename")!='') + $image_name[] = $adb->query_result($result,$i,"imagename"); + } + $log->debug("Inside getUserImageNames."); + if(count($image_name) > 0) + return $image_name; +} + + ?> Modified: vtigercrm/trunk/modules/Users/ListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 05:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 10:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4126 - in /vtigercrm/trunk: include/js/xfade2.js modules/Users/fade.css Message-ID: <20060310101303.3F4A74B048A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 03:12:51 2006 New Revision: 4126 Log: files added for fade effect Added: vtigercrm/trunk/include/js/xfade2.js vtigercrm/trunk/modules/Users/fade.css From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 08:35:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 13:35:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4127 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060310133533.6940D4B5F00@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 06:35:27 2006 New Revision: 4127 Log: Demo data populated for all the modules Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 08:40:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 13:40:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4128 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060310134001.4CF5549A48D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 10 06:39:57 2006 New Revision: 4128 Log: Added demo feeds for RSS & Portal Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Mar 10 06:39:57 2006 @@ -2145,9 +2145,19 @@ (7,27,2), (7,8,3)"); - $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); - - } + //portal feeds + $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); + $this->db->query("insert into portal values(2,'Zoho','http://www.zoho.com/',1)"); + $this->db->query("insert into portal values(3,'Search','http://www.lycos.com/',2)"); + $this->db->query("insert into portal values(4,'Yahoo Finance','http://finance.yahoo.com/',3)"); + + //rss feeds + + $this->db->query("insert into rss values(1,'http://finance.yahoo.com/rss/headline?s=IBM','IBM Finblog',0,1,'IBM Finance')"); + $this->db->query("insert into rss values(2,'http://finance.yahoo.com/rss/headline?s=HPQ','HP Blog',0,1,'HP Finance')"); + $this->db->query("insert into rss values(3,'http://finance.yahoo.com/rss/headline?s=GM','GM blog',0,0,'GM Finance')"); + + } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 17:32:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 22:32:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4129 - in /vtigercrm/trunk/modules/Settings: AddMailAccount.html AddMailAccount.php SaveMailAccount.php Message-ID: <20060310223242.A87A54C3308@vtiger.fosslabs.com> Author: mmbrich Date: Fri Mar 10 15:32:40 2006 New Revision: 4129 Log: added new email options to the settings page. Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.html vtigercrm/trunk/modules/Settings/AddMailAccount.php vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.html ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.html (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.html Fri Mar 10 15:32:40 2006 @@ -60,7 +60,29 @@ - + + + + + + + + + + + + @@ -78,22 +100,40 @@ -
    {MOD.LBL_MAIL_SERVER_INFO}
    {MOD.LBL_MAIL_PROTOCOL}:  {MOD.LBL_POP} {MOD.LBL_IMAP} +  {MOD.LBL_IMAP} +  {MOD.LBL_POP} +  IMAP2 +  IMAP4 +  IMAP4-rev1 +
    SSL Options: No TLS +   TLS +
    Certificate Validations Validate SSL Cert +  Don't Validate SSL Cert +
    Show Body in "Quick View" Yes (slower and marks all emails as "Seen") +  No

    - +
    +

    @@ -104,7 +144,7 @@
    {JAVASCRIPT} -{MOD.LBL_LIST_MAIL_ACCOUNT} + Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Fri Mar 10 15:32:40 2006 @@ -29,7 +29,6 @@ $xtpl=new XTemplate ('modules/Settings/AddMailAccount.html'); $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); -$xtpl->assign("POP_SELECT", "CHECKED"); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { @@ -48,29 +47,42 @@ $xtpl->assign("SERVERPASSWORD", $temprow['mail_password']); $xtpl->assign("SERVERNAME", $temprow['mail_servername']); $xtpl->assign("RECORD_ID", $temprow['account_id']); + $xtpl->assign("BOX_REFRESH", $temprow['box_refresh']); + $xtpl->assign("MAILS_PER_PAGE", $temprow['mails_per_page']); $xtpl->assign("EDIT", "TRUE"); + + if(strtolower($temprow['mail_protocol']) == "imap") + $xtpl->assign("IMAP", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap2") + $xtpl->assign("IMAP2", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap4") + $xtpl->assign("IMAP4", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "imap4rev1") + $xtpl->assign("IMAP4R1", "CHECKED"); + if(strtolower($temprow['mail_protocol']) == "pop3") + $xtpl->assign("POP3", "CHECKED"); + + if(strtolower($temprow['ssltype']) == "notls") + $xtpl->assign("NOTLS", "CHECKED"); + if(strtolower($temprow['ssltype']) == "tls") + $xtpl->assign("TLS", "CHECKED"); + + if(strtolower($temprow['sslmeth']) == "validate-cert") + $xtpl->assign("VALIDATECERT", "CHECKED"); + if(strtolower($temprow['sslmeth']) == "novalidate-cert") + $xtpl->assign("NOVALIDATECERT", "CHECKED"); + + if(strtolower($temprow['showbody']) == "yes") + $xtpl->assign("SHOWBODY", "CHECKED"); + if(strtolower($temprow['showbody']) == "no") + $xtpl->assign("NOSHOWBODY", "CHECKED"); } } } -/*$sql="select * from systems where server_type = 'email'"; -$result = $adb->query($sql); -$mail_server = $adb->query_result($result,0,'server'); -$mail_server_username = $adb->query_result($result,0,'server_username'); -$mail_server_password = $adb->query_result($result,0,'server_password'); -*/ - $xtpl->assign("RETURN_MODULE","Settings"); $xtpl->assign("RETURN_ACTION","index"); $xtpl->assign("JAVASCRIPT", get_validate_record_js()); -/*if (isset($mail_server)) - $xtpl->assign("MAILSERVER",$mail_server); -if (isset($mail_server_username)) - $xtpl->assign("USERNAME",$mail_server_username); -if (isset($mail_server_password)) - $xtpl->assign("PASSWORD",$mail_server_password); -*/ $xtpl->parse("main"); $xtpl->out("main"); - ?> Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Fri Mar 10 15:32:40 2006 @@ -19,6 +19,11 @@ $server_username = $_REQUEST['server_username']; $server_password = $_REQUEST['server_password']; $mail_servername = $_REQUEST['mail_servername']; +$box_refresh = $_REQUEST['box_refresh']; +$mails_per_page = $_REQUEST['mails_per_page']; +$ssltype = $_REQUEST["ssltype"]; +$sslmeth = $_REQUEST["sslmeth"]; +$showbody = $_REQUEST["showbody"]; if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { @@ -29,12 +34,12 @@ if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='') { - $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."' where account_id = ".$id; + $sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."', box_refresh='".$box_refresh."', mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', showbody='".$showbody."' where account_id = '".$id."'"; } else { $account_id = $adb->getUniqueID("mail_accounts"); - $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0)"; + $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0,'".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."')"; } $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 10 17:33:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 10 Mar 2006 22:33:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4130 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060310223326.9FAB74C330E@vtiger.fosslabs.com> Author: mmbrich Date: Fri Mar 10 15:33:25 2006 New Revision: 4130 Log: added new email settings to database. Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Fri Mar 10 15:33:25 2006 @@ -4474,6 +4474,16 @@ + + + + + + + + + + From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 12 16:49:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 12 Mar 2006 21:49:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4131 - in /vtigercrm/trunk/modules/Webmails: src/ templates/ tmp/ Message-ID: <20060312214927.E9CC54C3319@vtiger.fosslabs.com> Author: mmbrich Date: Sun Mar 12 14:49:25 2006 New Revision: 4131 Log: Removed tmp/, this will be dynamically created by the scripts for incoming attachements. Removed the FOSS Labs specific templates, sorry, should have cleaned those out earlier. Removed temporary src/ directory since it isn't needed This line, and those below, will be ignored-- D Webmails/src D Webmails/templates/Marketing Campaign D Webmails/templates/Distributor Annoucement (Contacts) D Webmails/templates/FOSS Quote D Webmails/templates/Invoice Due D Webmails/templates/Accept Order D Webmails/templates/Acceptance Proposal D Webmails/templates/Default FOSS Template D Webmails/templates/Thanks Note D Webmails/tmp Removed: vtigercrm/trunk/modules/Webmails/src/ vtigercrm/trunk/modules/Webmails/templates/Accept Order vtigercrm/trunk/modules/Webmails/templates/Acceptance Proposal vtigercrm/trunk/modules/Webmails/templates/Default FOSS Template vtigercrm/trunk/modules/Webmails/templates/Distributor Annoucement (Contacts) vtigercrm/trunk/modules/Webmails/templates/FOSS Quote vtigercrm/trunk/modules/Webmails/templates/Invoice Due vtigercrm/trunk/modules/Webmails/templates/Marketing Campaign vtigercrm/trunk/modules/Webmails/templates/Thanks Note vtigercrm/trunk/modules/Webmails/tmp/ From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 03:11:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 08:11:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4132 - /vtigercrm/trunk/modules/Settings/SaveMailAccount.php Message-ID: <20060313081127.4E3F34D8E29@vtiger.fosslabs.com> Author: mmbrich Date: Mon Mar 13 01:11:25 2006 New Revision: 4132 Log: correctly save the mail account info Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original) +++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Mon Mar 13 01:11:25 2006 @@ -39,7 +39,7 @@ else { $account_id = $adb->getUniqueID("mail_accounts"); - $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."',1,0,'".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."')"; + $sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$showbody."','1','0')"; } $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 04:28:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:28:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4133 - /vtigercrm/trunk/install/2setConfig.php Message-ID: <20060313092815.4364D4099CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:28:11 2006 New Revision: 4133 Log: databasename changed to 5beta Modified: vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 04:29:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:29:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4134 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060313092917.45DCD4099DF@vtiger.fosslabs.com> Author: richie Date: Mon Mar 13 02:29:13 2006 New Revision: 4134 Log: Stating that vtigercrm can run on a system having lamp/wamp setup Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 04:34:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:34:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4135 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060313093400.5A4A7409A16@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:33:56 2006 New Revision: 4135 Log: Removed the More Information Tab from Potential Detail View Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Mar 13 02:33:56 2006 @@ -120,7 +120,7 @@ - {if $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Potentials' || $MODULE eq 'Products'} + {if $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Products'} From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 04:46:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 09:46:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4136 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060313094608.47FCA409A6F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 02:46:04 2006 New Revision: 4136 Log: http conf path modifed for 5 beta Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Mon Mar 13 02:46:04 2006 @@ -25,8 +25,8 @@ # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "VTIGERCRM/vtigerCRM5_alpha1/apache" will be interpreted by the -# server as "VTIGERCRM/vtigerCRM5_alpha1/apache/logs/foo.log". +# with ServerRoot set to "VTIGERCRM/vtigerCRM5_beta/apache" will be interpreted by the +# server as "VTIGERCRM/vtigerCRM5_beta/apache/logs/foo.log". # ### Section 1: Global Environment @@ -47,7 +47,7 @@ # # Do NOT add a slash at the end of the directory path. # -ServerRoot "VTIGERCRM/vtigerCRM5_alpha1/apache" +ServerRoot "VTIGERCRM/vtigerCRM5_beta/apache" # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. @@ -305,7 +305,7 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # -DocumentRoot "VTIGERCRM/vtigerCRM5_alpha1/apache/htdocs/vtigerCRM" +DocumentRoot "VTIGERCRM/vtigerCRM5_beta/apache/htdocs/vtigerCRM" # # Each directory to which Apache has access can be configured with respect @@ -330,7 +330,7 @@ # # This should be changed to whatever you set DocumentRoot to. # - + # # Possible values for the Options directive are "None", "All", @@ -548,9 +548,9 @@ # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # -Alias /icons/ "VTIGERCRM/vtigerCRM5_alpha1/apache/icons/" - - +Alias /icons/ "VTIGERCRM/vtigerCRM5_beta/apache/icons/" + + Options Indexes MultiViews AllowOverride None Order allow,deny @@ -562,9 +562,9 @@ # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/vtigerCRM5_alpha1/apache/manual$1" - - +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "VTIGERCRM/vtigerCRM5_beta/apache/manual$1" + + Options Indexes AllowOverride None Order allow,deny @@ -586,7 +586,7 @@ # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # -ScriptAlias /cgi-bin/ "VTIGERCRM/vtigerCRM5_alpha1/apache/cgi-bin/" +ScriptAlias /cgi-bin/ "VTIGERCRM/vtigerCRM5_beta/apache/cgi-bin/" # @@ -597,10 +597,10 @@ # -# "VTIGERCRM/vtigerCRM5_alpha1/apache/cgi-bin" should be changed to whatever your ScriptAliased +# "VTIGERCRM/vtigerCRM5_beta/apache/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. # - + AllowOverride None Options None Order allow,deny @@ -916,7 +916,7 @@ # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the -# VTIGERCRM/vtigerCRM5_alpha1/apache/error/include/ files and copying them to /your/include/path/, +# VTIGERCRM/vtigerCRM5_beta/apache/error/include/ files and copying them to /your/include/path/, # even on a per-VirtualHost basis. The default include files will display # your Apache version number and your ServerAdmin email address regardless # of the setting of ServerSignature. @@ -924,9 +924,9 @@ # The internationalized error documents require mod_alias, mod_include # and mod_negotiation. To activate them, uncomment the following 30 lines. -# Alias /error/ "VTIGERCRM/vtigerCRM5_alpha1/apache/error/" -# -# +# Alias /error/ "VTIGERCRM/vtigerCRM5_beta/apache/error/" +# +# # AllowOverride None # Options IncludesNoExec # AddOutputFilter Includes html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:33:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:33:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4137 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060313103332.BEE9B409B75@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:33:27 2006 New Revision: 4137 Log: phpdoc has been included for getHourList() method and call to getCalendarHeader() has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Mon Mar 13 03:33:27 2006 @@ -8,6 +8,7 @@ * @module calendar_day */ require_once('modules/Users/User.php'); + require_once('modules/Calendar/CalendarCommon.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; @@ -25,34 +26,9 @@ echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'], true); echo "\n
    \n"; $t=Date("Ymd"); -?> -
     Basic Information More Information  
    - - - - - - - - - -
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - "; + } + $cnt_total=array_sum($mod_tot_cnt_array); + $mod_cnt_table.="
    - tablename = $calobj->table_name; } - - //for new UI + /** + * Function to get UI&Activities for each hour + * @param $hour -- hour(in am/pm) :: Type string + * @param $maxcol -- no. of events in particular hour :: Type integer + * @param $table -- events in array format :: Type Array + * @param $i -- count :: Type integer + * Constructs UI for each hour in html table format and calls formatted() to get activities for that hour + * returns the html table in string format + */ function getHourList($hour,$maxcol,$table,$i) { //echo '
    ';print_r($table);echo '
    '; @@ -285,23 +268,8 @@ $maxcol[$i] = max($maxcol[$i],count($table[$i])); } //New UI-integrated by minnie - echo ""; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($last_day,$next_day,"day",$from->ts,$this->pref); + echo $calendarheader; echo " From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 09:07:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:07:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4433 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060324140800.211934EBF6F@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:07:55 2006 New Revision: 4433 Log: MaxClients 100 has been removed at line no 98 Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 24 07:07:55 2006 @@ -98,7 +98,6 @@ # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 -MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 09:21:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:21:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4434 - in /vtigercrm/trunk/pkg/apache/conf: lin_httpd.conf win_httpd.conf Message-ID: <20060324142151.F13704EBF8F@vtiger.fosslabs.com> Author: richie Date: Fri Mar 24 07:21:46 2006 New Revision: 4434 Log: parameter values changed windows version has lots of changes done as typical entries were missing Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 24 07:21:46 2006 @@ -116,8 +116,8 @@ # MaxRequestsPerChild: maximum number of requests a server process serves StartServers 5 -MinSpareServers 5 -MaxSpareServers 10 +MinSpareServers 10 +MaxSpareServers 15 MaxClients 150 MaxRequestsPerChild 0 @@ -130,12 +130,12 @@ # ThreadsPerChild: constant number of worker threads in each server process # MaxRequestsPerChild: maximum number of requests a server process serves -StartServers 2 +StartServers 10 MaxClients 150 MinSpareThreads 25 MaxSpareThreads 75 ThreadsPerChild 25 -MaxRequestsPerChild 0 +MaxRequestsPerChild 20 # perchild MPM Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Fri Mar 24 07:21:46 2006 @@ -100,12 +100,101 @@ ## Server-Pool Size Regulation (MPM specific) ## +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 5 +MinSpareServers 10 +MaxSpareServers 15 +MaxClients 150 +MaxRequestsPerChild 0 + + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 10 +MaxClients 150 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 20 + + +# perchild MPM +# NumServers: constant number of server processes +# StartThreads: initial number of worker threads in each server process +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# MaxThreadsPerChild: maximum number of worker threads in each server process +# MaxRequestsPerChild: maximum number of connections per server process + +NumServers 5 +StartThreads 5 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxThreadsPerChild 20 +MaxRequestsPerChild 0 + + # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 MaxRequestsPerChild 0 + + +# BeOS MPM +# StartThreads: how many threads do we initially spawn? +# MaxClients: max number of threads we can have (1 thread == 1 client) +# MaxRequestsPerThread: maximum number of requests each thread will process + +StartThreads 10 +MaxClients 50 +MaxRequestsPerThread 10000 + + +# NetWare MPM +# ThreadStackSize: Stack size allocated for each worker thread +# StartThreads: Number of worker threads launched at server startup +# MinSpareThreads: Minimum number of idle threads, to handle request spikes +# MaxSpareThreads: Maximum number of idle threads +# MaxThreads: Maximum number of worker threads alive at the same time +# MaxRequestsPerChild: Maximum number of requests a thread serves. It is +# recommended that the default value of 0 be set for this +# directive on NetWare. This will allow the thread to +# continue to service requests indefinitely. + +ThreadStackSize 65536 +StartThreads 250 +MinSpareThreads 25 +MaxSpareThreads 250 +MaxThreads 1000 +MaxRequestsPerChild 0 +MaxMemFree 100 + + +# OS/2 MPM +# StartServers: Number of server processes to maintain +# MinSpareThreads: Minimum number of idle threads per process, +# to handle request spikes +# MaxSpareThreads: Maximum number of idle threads per process +# MaxRequestsPerChild: Maximum number of connections per server process + +StartServers 2 +MinSpareThreads 5 +MaxSpareThreads 10 +MaxRequestsPerChild 0 # From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 09:21:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:21:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4435 - /vtigercrm/trunk/include/CustomFieldUtil.php Message-ID: <20060324142157.28E004EBF8F@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:21:52 2006 New Revision: 4435 Log: changes made for customfield edit Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Fri Mar 24 07:21:52 2006 @@ -65,6 +65,10 @@ elseif($uitype == 21) { $fldname = 'Text Area'; + } + elseif($uitype == 33) + { + $fldname = 'Multi-Select Combo Box'; } return $fldname; } @@ -394,4 +398,71 @@ } } +function getCustomFieldData($tab,$id,$datatype) +{ + global $adb; + $query = "select * from field where tabid=".$tab." and fieldid=".$id; + $result = $adb->query($query); + $return_data=$adb->fetch_array($result); + return $return_data[$datatype]; +} + +function getFldTypeandLengthValue($label,$typeofdata) +{ + if($label == 'Text') + { + $types = explode("~",$typeofdata); + $data_array=array('0',$types[3]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Number') + { + $types = explode("~",$typeofdata); + $data_decimal = explode(",",$types[2]); + $data_array=array('1',$data_decimal[0],$data_decimal[1]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Percent') + { + $types = explode("~",$typeofdata); + $data_array=array('2','5',$types[3]); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Currency') + { + $types = explode("~",$typeofdata); + $data_decimal = explode(",",$types[2]); + $data_array=array('3',$data_decimal); + $fieldtype = implode(";",$data_array); + } + elseif($label == 'Date') + { + $fieldtype = '4'; + } + elseif($label == 'Email') + { + $fieldtype = '5'; + } + elseif($label == 'Phone') + { + $fieldtype = '6'; + } + elseif($label == 'PickList') + { + $fieldtype = '7'; + } + elseif($label == 'Url') + { + $fieldtype = '8'; + } + elseif($label == 'Checkbox') + { + $fieldtype = '9'; + } + elseif($label == 'Text Area') + { + $fieldtype = '10'; + } + return $fieldtype; +} ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 00:00:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 05:00:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4436 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327050033.6A6B94FF723@vtiger.fosslabs.com> Author: richie Date: Sun Mar 26 22:00:27 2006 New Revision: 4436 Log: fixed MaxClients parameter entry Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Sun Mar 26 22:00:27 2006 @@ -89,7 +89,6 @@ # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 -MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 01:06:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:06:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= Message-ID: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> #71: Sorting columns in listview fails -----------------------+---------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: postgres | -----------------------+---------------------------------------------------- {{{ Warning: pg_exec() [function.pg-exec]: Query failed: ERROR: SELECT DISTINCT ON expressions must match initial ORDER BY expressions in /home/allan/code/vtiger/4.2_postgresql_integration/adodb/drivers/adodb- postgres64.inc.php on line 766 (postgres7): select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid= cntactivityrel.contactid left join seactivityrel on seactivityrel.activityid = activity.activityid left outer join account on account.accountid = contactdetails.accountid left outer join recurringevents on recurringevents.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') ORDER BY subject ASC -1: ERROR: SELECT DISTINCT ON expressions must match initial ORDER BY expressions adodb_postgres7._execute( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde..., false) % line 857, file: adodb.inc.php adodb_postgres7.execute( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde...) % line 240, file: PearDatabase.php peardatabase.query( select DISTINCT ON (crmid) crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactde...) % line 303, file: ListView.php include(/home/allan/code/vtiger/4.2_postgresql_integration/modules/Activities/ListView.php) % line 27, file: index.php include(/home/allan/code/vtiger/4.2_postgresql_integration/modules/Activities/index.php) % line 777, file: index.php }}} Sorting the activity listview columns by subject (or other view/columns) creates the above database error. Blocks ticket #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:15:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 06:15:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4437 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060327061511.914C84FF7AE@vtiger.fosslabs.com> Author: saraj Date: Sun Mar 26 23:15:04 2006 New Revision: 4437 Log: Removed the default portal feeds Ahmed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Sun Mar 26 23:15:04 2006 @@ -2147,12 +2147,6 @@ (7,27,2), (7,8,3)"); - //portal feeds - $this->db->query("insert into portal values(1,'VtigerCRM','http://vtiger.com/',0)"); - $this->db->query("insert into portal values(2,'Zoho','http://www.zoho.com/',1)"); - $this->db->query("insert into portal values(3,'Search','http://www.lycos.com/',2)"); - $this->db->query("insert into portal values(4,'Yahoo Finance','http://finance.yahoo.com/',3)"); - //rss feeds $this->db->query("insert into rss values(1,'http://finance.yahoo.com/rss/headline?s=IBM','IBM Finblog',0,1,'IBM Finance')"); From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 01:20:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:20:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= In-Reply-To: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> References: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> Message-ID: <085.04eb0983f4b5e7ba1a610df890eef5db@vtiger.fosslabs.com> #71: Sorting columns in listview fails ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- Comment (by allanbush): This is a limitation of the distinct on method of postgres used as a work around for the strict behavior of the group by clause. The simple patch is to add the order by expressions into the distinct on list, this hides the underlining issue which is we are querying an indetermined set of our data. The preferred solution would be to rewrite the queries to avoid selecting columns we don't need. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 01:59:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Mar 2006 06:59:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2371=3A_S?= =?utf-8?q?orting_columns_in_listview_fails?= In-Reply-To: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> References: <076.044c3f5e5d54107ec6b882af85b8d5c2@vtiger.fosslabs.com> Message-ID: <085.4ed37056dcf39abd6f424b592d455fce@vtiger.fosslabs.com> #71: Sorting columns in listview fails ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: postgres ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [4438]) Added order by expression to the begining of the disinstct on expression to prevent postgres query error when sorting columns. Closes #71. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 01:59:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 06:59:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4438 - /vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Message-ID: <20060327065915.3F0474FF805@vtiger.fosslabs.com> Author: allanbush Date: Sun Mar 26 23:59:11 2006 New Revision: 4438 Log: Added order by expression to the begining of the disinstct on expression to prevent postgres query error when sorting columns. Closes #71. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Activities/ListView.php Sun Mar 26 23:59:11 2006 @@ -236,7 +236,13 @@ //Retreive the list from Database //<<<<<<<<>>>>>>>> -$distincton = $adb->isPostgres() ? 'crmid' : ''; +$distincton = ''; +if($adb->isPostgres()) { + if(isset($order_by) && $order_by != '') { + $distincton = $order_by . ', '; + } + $distincton .= 'crmid'; +} if($viewid != "0") { $listquery = getListQuery("Activities", '', $distincton); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:18:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:18:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4439 - in /vtigercrm/branches/4.2_postgresql_integration/modules: Import/UsersLastImport.php Leads/Lead.php Message-ID: <20060327071812.E03104FF826@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:18:08 2006 New Revision: 4439 Log: Proper aliasing for some import and export queries. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Import/UsersLastImport.php Mon Mar 27 00:18:08 2006 @@ -173,7 +173,7 @@ AND accounts.deleted=0 AND users.status='ACTIVE'";*/ $query = "SELECT distinct account.*, accountbillads.city, - users.user_name assigned_user_name, + users.user_name AS assigned_user_name, crmid, smownerid FROM account inner join crmentity on crmentity.crmid=account.accountid @@ -215,9 +215,9 @@ AND users.status='ACTIVE'";*/ $query = "SELECT distinct - account.accountid account_id, - account.accountname account_name, - users.user_name assigned_user_name, + account.accountid AS account_id, + account.accountname AS account_name, + users.user_name AS assigned_user_name, crmentity.crmid, smownerid, potential.* FROM potential @@ -236,7 +236,7 @@ else if($this->bean_type == 'Leads') { $query = "SELECT distinct leaddetails.*, crmentity.crmid, leadaddress.phone,leadsubdetails.website, - users.user_name assigned_user_name, + users.user_name AS assigned_user_name, smownerid FROM leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Leads/Lead.php Mon Mar 27 00:18:08 2006 @@ -211,7 +211,7 @@ { $query = $this->constructCustomQueryAddendum() . ", - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city AS city, leadaddress.state AS state,leadaddress.code AS code,leadaddress.country AS country, leadaddress.phone AS phone, users.user_name, users.status AS user_status FROM ".$this->entity_table." INNER JOIN leaddetails ON crmentity.crmid=leaddetails.leadid @@ -228,7 +228,7 @@ else { $query = "SELECT - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status AS user_status FROM ".$this->entity_table." INNER JOIN leaddetails ON crmentity.crmid=leaddetails.leadid LEFT JOIN leadsubdetails From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:26:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:26:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4440 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Message-ID: <20060327072609.EFF9B4FF84A@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:26:03 2006 New Revision: 4440 Log: Pervent attempt to update the status of a lead using an empty string as the id. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/updateLeadDBStatus.php Mon Mar 27 00:26:03 2006 @@ -21,6 +21,7 @@ global $adb; $storearray = explode(";",$idlist); +$storearray = array_filter($storearray); $date_var = date('YmdHis'); if(isset($_REQUEST['user_id']) && $_REQUEST['user_id']!='') From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:48:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:48:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4441 - /vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Message-ID: <20060327074817.530374FF867@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:48:13 2006 New Revision: 4441 Log: Fixed lead update problems by checking that groupname is given before trying to update database with a potential null value. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Users/UserInfoUtil.php Mon Mar 27 00:48:13 2006 @@ -425,6 +425,7 @@ global $adb; $sqldelete = "delete from users2group where userid = '" .$userid ."'"; $result_delete = $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $result = $adb->query($sql); } @@ -442,6 +443,7 @@ function insertUsers2GroupMapping($groupname,$userid) { global $adb; + if($groupname == '') return; $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')"; $adb->query($sql); } @@ -527,6 +529,7 @@ function insert2LeadGroupRelation($leadid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')"; $adb->query($sql); @@ -536,6 +539,7 @@ global $adb; $sqldelete = "delete from leadgrouprelation where leadid=".$leadid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')"; $adb->query($sql); @@ -545,6 +549,7 @@ global $adb; $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')"; $adb->query($sql); @@ -553,6 +558,7 @@ function insert2ActivityGroupRelation($activityid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')"; $adb->query($sql); @@ -561,6 +567,7 @@ function insert2TicketGroupRelation($ticketid,$groupname) { global $adb; + if($groupname == '') return; $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')"; $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 02:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 07:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4442 - /vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Message-ID: <20060327075416.E03BF4FF87B@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 00:54:14 2006 New Revision: 4442 Log: Removed extra set of quotes in query. Ref #17 Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Leads/LeadConvertToEntities.php Mon Mar 27 00:54:14 2006 @@ -279,7 +279,7 @@ $adb->query($sql_insert_contact); -$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')"; +$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")"; $adb->query($sql_insert_contactsubdetails); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:24:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:24:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4443 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060327092405.91E5E4FF91F@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 27 02:24:02 2006 New Revision: 4443 Log: expand lead street field to match street maxlen in contacts Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Mon Mar 27 02:24:02 2006 @@ -676,7 +676,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:42:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:42:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4444 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060327094226.047C24FF94E@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:42:21 2006 New Revision: 4444 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:46:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:46:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4445 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060327094610.130964FF959@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:46:05 2006 New Revision: 4445 Log: property changed Modified: vtigercrm/trunk/modules/Activities/Event.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 04:47:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 09:47:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4446 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060327094744.A9A794FF959@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 02:47:40 2006 New Revision: 4446 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Mon Mar 27 02:47:40 2006 @@ -95,51 +95,6 @@ return "$this->name"; } - function create_list_query(&$order_by, &$where) - { - $contact_required = ereg("contacts", $where); - - if($contact_required) - { - $query = "SELECT task.taskid, tasks.assigned_user_id, task.status, task.name, task.parent_type, tasks.parent_id, tasks.contact_id, tasks.datedue, contactdetails.firstname, contactdetails.lastname ,task.priority,task.description FROM contactdetails, task "; - $where_auto = "task.contact_id = contactdetails.contactid AND task.deleted=0 AND contact.deleted=0"; - } - else - { - $query = 'SELECT taskid, smcreatorid, task.status, duedate ,priority FROM task inner join crmentity on crmentity.crmid=task.taskid '; - $where_auto = " AND deleted=0"; - } - - if($where != "") - $query .= "where $where ".$where_auto; - else - $query .= "where ".$where_auto; - - if($order_by != "") - $query .= " ORDER BY $order_by"; - else - //$query .= " ORDER BY name"; - return $query; - - } - - function create_export_query(&$order_by, &$where) - { - $contact_required = ereg("contacts", $where); - - if($contact_required) - { - $query = "SELECT task.*, contactdetailss.firstname, contactdetails.lastname FROM task inner join seactivityrel on seactivityrel.activityid=task.taskid inner join crmentity on crmentity.crmid=task.taskid and crmentity.deleted=0"; - } - else - { - $query = 'SELECT * FROM task inner join seactivityrel on seactivityrel.activityid=task.taskid inner join crmentity on crmentity.crmid=task.taskid and crmentity.deleted=0'; - } - return $query; - - } - - function fill_in_additional_list_fields() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 05:07:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:07:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4447 - /vtigercrm/trunk/data/Tracker.php Message-ID: <20060327100740.7207C4FF984@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:07:35 2006 New Revision: 4447 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/data/Tracker.php (contents, props changed) Modified: vtigercrm/trunk/data/Tracker.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 05:09:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:09:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4448 - /vtigercrm/trunk/data/Tracker.php Message-ID: <20060327100927.9DDAA4FF985@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:09:23 2006 New Revision: 4448 Log: Functions not in use cleaned up Modified: vtigercrm/trunk/data/Tracker.php Modified: vtigercrm/trunk/data/Tracker.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 05:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4449 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327101000.77FEA4FF978@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 03:09:55 2006 New Revision: 4449 Log: reverted the changes back Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Mon Mar 27 03:09:55 2006 @@ -99,101 +99,12 @@ ## Server-Pool Size Regulation (MPM specific) ## -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# MaxClients: maximum number of server processes allowed to start -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 5 -MinSpareServers 10 -MaxSpareServers 15 -MaxClients 150 -MaxRequestsPerChild 0 - - -# worker MPM -# StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# ThreadsPerChild: constant number of worker threads in each server process -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 10 -MaxClients 150 -MinSpareThreads 25 -MaxSpareThreads 75 -ThreadsPerChild 25 -MaxRequestsPerChild 20 - - -# perchild MPM -# NumServers: constant number of server processes -# StartThreads: initial number of worker threads in each server process -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# MaxThreadsPerChild: maximum number of worker threads in each server process -# MaxRequestsPerChild: maximum number of connections per server process - -NumServers 5 -StartThreads 5 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxThreadsPerChild 20 -MaxRequestsPerChild 0 - - # WinNT MPM # ThreadsPerChild: constant number of worker threads in the server process # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 MaxRequestsPerChild 0 - - -# BeOS MPM -# StartThreads: how many threads do we initially spawn? -# MaxClients: max number of threads we can have (1 thread == 1 client) -# MaxRequestsPerThread: maximum number of requests each thread will process - -StartThreads 10 -MaxClients 50 -MaxRequestsPerThread 10000 - - -# NetWare MPM -# ThreadStackSize: Stack size allocated for each worker thread -# StartThreads: Number of worker threads launched at server startup -# MinSpareThreads: Minimum number of idle threads, to handle request spikes -# MaxSpareThreads: Maximum number of idle threads -# MaxThreads: Maximum number of worker threads alive at the same time -# MaxRequestsPerChild: Maximum number of requests a thread serves. It is -# recommended that the default value of 0 be set for this -# directive on NetWare. This will allow the thread to -# continue to service requests indefinitely. - -ThreadStackSize 65536 -StartThreads 250 -MinSpareThreads 25 -MaxSpareThreads 250 -MaxThreads 1000 -MaxRequestsPerChild 0 -MaxMemFree 100 - - -# OS/2 MPM -# StartServers: Number of server processes to maintain -# MinSpareThreads: Minimum number of idle threads per process, -# to handle request spikes -# MaxSpareThreads: Maximum number of idle threads per process -# MaxRequestsPerChild: Maximum number of connections per server process - -StartServers 2 -MinSpareThreads 5 -MaxSpareThreads 10 -MaxRequestsPerChild 0 # From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 05:31:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 10:31:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4450 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060327103159.369354FF9BE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 03:31:55 2006 New Revision: 4450 Log: Functions not in use removed Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 06:04:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 11:04:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4451 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060327110457.417344FF9CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 04:04:51 2006 New Revision: 4451 Log: Unused function removed Modified: vtigercrm/trunk/data/SugarBean.php (contents, props changed) Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:14:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:14:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4452 - /vtigercrm/trunk/include/listview.php Message-ID: <20060327121407.833574FFA81@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:14:03 2006 New Revision: 4452 Log: File not in use Removed: vtigercrm/trunk/include/listview.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:25:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:25:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4453 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060327122534.1F9EA4FFAA9@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:25:30 2006 New Revision: 4453 Log: echo in related lists has been removed Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Mar 27 05:25:30 2006 @@ -858,9 +858,7 @@ for($i=0; $i<$num_row; $i++) { $rel_tab_id = $adb->query_result($result,$i,"related_tabid"); - echo '
    '.$rel_tab_id.'
    '; - $funtion_name = $adb->query_result($result,$i,"name"); - echo '
    '.$funtion_name.'
    '; + $function_name = $adb->query_result($result,$i,"name"); $label = $adb->query_result($result,$i,"label"); if($rel_tab_id != 0) { @@ -869,13 +867,13 @@ { if($profileActionPermission[$rel_tab_id][3] == 0) { - $focus_list[$label] = $focus->$funtion_name($focus->id); + $focus_list[$label] = $focus->$function_name($focus->id); } } } else { - $focus_list[$label] = $focus->$funtion_name($focus->id); + $focus_list[$label] = $focus->$function_name($focus->id); } } return $focus_list; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:41:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:41:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4454 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060327124133.3CABA4FFAC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:41:28 2006 New Revision: 4454 Log: Removed the unused create_tables() & drop_tables() function as part of code cleanup Ahmed Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 07:42:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 12:42:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4455 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060327124229.7E4294FFAC8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 05:42:25 2006 New Revision: 4455 Log: Removed the unused create_tables() & drop_tables() function as part of code cleanup Ahmed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon Mar 27 05:42:25 2006 @@ -152,13 +152,6 @@ $this->column_fields = getColumnFields('Leads'); } - function create_tables () { - - } - - function drop_tables () { - } - function get_summary_text() { return "$this->firstname $this->lastname"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 08:38:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 13:38:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4456 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060327133828.82BEF4FFB03@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 06:38:23 2006 New Revision: 4456 Log: Unwanted function removed Modified: vtigercrm/trunk/data/SugarBean.php Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 09:01:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:01:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4457 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060327140109.9E3DA4FFB11@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 07:01:03 2006 New Revision: 4457 Log: Junk Code Removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 09:28:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:28:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4458 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060327142846.6D94D4FFB4D@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 07:28:36 2006 New Revision: 4458 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 09:31:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:31:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4459 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060327143115.D105D4FFB7D@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 07:31:09 2006 New Revision: 4459 Log: added php5module for loading Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Mon Mar 27 07:31:09 2006 @@ -169,7 +169,7 @@ #LoadModule usertrack_module modules/mod_usertrack.so #LoadModule vhost_alias_module modules/mod_vhost_alias.so #LoadModule ssl_module modules/mod_ssl.so - +LoadModule php5_module "VTIGER_HOME/php/php5apache2.dll" # # ExtendedStatus controls whether Apache will generate "full" status # information (ExtendedStatus On) or just basic information (ExtendedStatus From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 09:32:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 14:32:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4460 - /vtigercrm/trunk/modules/SalesOrder/DetailView.php Message-ID: <20060327143257.DE68B4FFB7C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 07:32:53 2006 New Revision: 4460 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/DetailView.php Mon Mar 27 07:32:53 2006 @@ -26,8 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; +global $mod_strings,$app_strings,$theme; $focus = new SalesOrder(); @@ -41,7 +40,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:18:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:18:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4461 - /vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Message-ID: <20060327151826.1221E4FFBDC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:18:22 2006 New Revision: 4461 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Mar 27 08:18:22 2006 @@ -3,13 +3,7 @@ require_once('modules/Orders/SalesOrder.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings,$products_per_page; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -17,11 +11,9 @@ // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new SalesOrder(); $focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder"); @@ -133,8 +125,6 @@ } // addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') // Default will place vtiger in the top left corner function addImage( $logo_name, $location=array('10','10','0','0') ) { if($logo_name)//error checking just in case, by OpenCRM @@ -175,38 +165,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -343,11 +306,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -377,14 +338,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -563,7 +516,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:19:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:19:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4462 - in /vtigercrm/trunk/install: 3confirmConfig.php 5createTables.inc.php 5createTables.php Message-ID: <20060327151910.9D7F44FFBDC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:19:04 2006 New Revision: 4462 Log: junk code removed Modified: vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/5createTables.inc.php vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Mon Mar 27 08:19:04 2006 @@ -24,7 +24,6 @@ require_once('include/logging.php'); require_once('modules/Leads/Lead.php'); require_once('modules/Settings/FileStorage.php'); -//require_once('modules/imports/Headers.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Accounts/Account.php'); require_once('modules/Potentials/Opportunity.php'); @@ -32,7 +31,6 @@ require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Users/User.php'); -require_once('modules/Import/SugarFile.php'); require_once('modules/Import/ImportMap.php'); require_once('modules/Import/UsersLastImport.php'); require_once('modules/Users/TabMenu.php'); @@ -59,79 +57,6 @@ echo $msg; } } - -/* -function createSchemaTable() { - global $log; - - // create the schema tables - $query = "CREATE TABLE modules (id int(11) NOT NULL auto_increment, name text,PRIMARY KEY ( ID ))"; - - $this->query($query); -} - -function createObjectTable() { - global $log; - - // create the object tables - $query = "CREATE TABLE objects (module_id int(11), name text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -function createAttributesTable() { - global $log; - - // create the attributes tables - $query = "CREATE TABLE attributes (module_id int(11), object_name text, name text, PRIMARY KEY ( module_id, object_name ))"; - // fk module_id, object_name -> object table. - - $this->query($query); -} - -function createLabelsTable() { - global $log; - - // create the translation tables - $query = "CREATE TABLE labels (module_id int(11), name text, value text, value_long text, value_popup text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -// drop old tables if table exists and told to drop it -function drop_table_install(&$focus) { - global $log, $db; - - $result = $db->requireSingleResult("SHOW TABLES LIKE '".$focus->table_name."'"); - - if (!empty($result)) { - $focus->drop_tables(); - $log->info("Dropped old ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Did not need to drop old ".$focus->table_name." table. It doesn't exist."); - return 0; - } -} - -// create new tables if they don't exist. -function create_table_install(&$focus) { - global $log, $db; - - $result = $db->query("SHOW TABLES LIKE '".$focus->table_name."'"); - - if ($db->getRowCount($result) == 0) { - $focus->create_tables(); - $log->info("Created ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Table ".$focus->table_name." already exists."); - return 0; - } -} -*/ function create_default_users() { global $log, $db; @@ -201,27 +126,6 @@ $startTime = microtime(); -$modules = array( - "Contact" - ,"Account" - ,"potential" - ,"Lead" - ,"Tab" - ,"Security" - ,"LoginHistory" - ,"FileStorage" - ,"User" - ,"Tracker" - ,"Activity" - ,"Note" - ,"Email" - ,"SugarFile" - ,"ImportMap" - ,"UsersLastImport" -); - -$focus = 0; - // tables creation eecho("Creating Core tables: "); $success = $db->createTables("schema/DatabaseSchema.xml"); @@ -234,56 +138,12 @@ else eecho("Tables Successfully created.\n"); -eecho ("Creating tables for module: "); -foreach ( $modules as $module ) { - $focus = new $module(); - - /* - if ($db_drop_tables == true ) { - $existed = drop_table_install($focus); - - if ($existed) - echo "Dropped existing ".$focus->table_name." table
    \n"; - else - echo "Table ".$focus->table_name." does not exist
    \n"; - } - - $success = create_table_install($focus); - - if ( $success) { - echo "Created new ".$focus->table_name." table
    \n"; - - if ( $module == "User") - $new_tables = 1; - } - else - echo "Table ".$focus->table_name." already exists
    \n"; - */ - - eecho ("$module"); - $focus->create_tables(); // inserts only rows - eecho (", "); -} -eecho ("Done."); - -/* -if ($new_tables) - create_default_users(); -*/ - -/* -if($success==2) { -*/ - create_default_users(); -//} +create_default_users(); // populate users table $uid = $db->getUniqueID("users"); $sql_stmt1 = "insert into users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')"; $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - -//$sql_stmt1 = "insert into user2role values(1,1)"; -//$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); $role_query = "select roleid from role where rolename='standard_user'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); @@ -309,7 +169,6 @@ require_once('modules/CustomView/PopulateCustomView.php'); // create and Populate PHPBB tables and data -//require_once('include/PopulatePhpBBtables.php'); //create_populate_phpbb(); // populate the db with seed data @@ -321,23 +180,12 @@ // populate forums data global $log, $db; -/* -$db->query("update phpbb_config set config_value='".$admin_email."' where config_name='board_email'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard/images/smiles' where config_name='smilies_path'"); -$db->query("update phpbb_config set config_value='".$server_name."' where config_name='server_name'"); -$db->query("update phpbb_config set config_value='".$server_port."' where config_name='server_port'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard' where config_name='script_path'"); -$curr_time=time(); -$db->query("insert phpbb_config values('board_startdate','".$curr_time."')"); -$db->query("insert phpbb_config values('default_lang', 'english')"); -*/ $endTime = microtime(); $deltaTime = microtime_diff($startTime, $endTime); // populate calendar data -//include("modules/Calendar/admin/scheme.php"); //eecho ("total time: $deltaTime seconds.\n"); ?> Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:21:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:21:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4463 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060327152114.F2B694FFBEB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:21:10 2006 New Revision: 4463 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon Mar 27 08:21:10 2006 @@ -30,10 +30,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $log->debug("Inside Sales Order EditView"); @@ -160,7 +157,6 @@ } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:22:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:22:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4464 - /vtigercrm/trunk/modules/SalesOrder/index.php Message-ID: <20060327152215.6F2424FFBE6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:22:11 2006 New Revision: 4464 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/index.php Modified: vtigercrm/trunk/modules/SalesOrder/index.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/index.php (original) +++ vtigercrm/trunk/modules/SalesOrder/index.php Mon Mar 27 08:22:11 2006 @@ -50,8 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/SalesOrder/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:24:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:24:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4465 - /vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Message-ID: <20060327152441.00DA94FFBEA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:24:37 2006 New Revision: 4465 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Mon Mar 27 08:24:37 2006 @@ -23,22 +23,10 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $current_language,$current_user,$list_max_entries_per_page,$theme,$adb; $current_module_strings = return_module_language($current_language, 'SalesOrder'); - global $list_max_entries_per_page; - global $urlPrefix; - $log = LoggerManager::getLogger('so_list'); - - global $currentModule; - global $theme; - global $adb; - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -56,7 +44,6 @@ } $focus = new SalesOrder(); - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:27:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:27:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4466 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060327152712.4432A4FFBFB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:27:07 2006 New Revision: 4466 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon Mar 27 08:27:07 2006 @@ -16,12 +16,7 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; -global $list_max_entries_per_page; - -global $currentModule; -global $theme; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:28:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:28:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4467 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Message-ID: <20060327152812.53E994FFBFB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:28:06 2006 New Revision: 4467 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Mon Mar 27 08:28:06 2006 @@ -317,8 +317,6 @@ var fldId = getOpenerObj("salesorder_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.salesorder_name.value = product_name; - //window.opener.document.EditView.salesorder_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_so_val'; window.opener.document.EditView.submit(); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:30:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:30:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4468 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060327153040.01BB04FFC08@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:30:36 2006 New Revision: 4468 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Mon Mar 27 08:30:36 2006 @@ -116,18 +116,6 @@ $this->column_fields = getColumnFields('SalesOrder'); } - function create_tables () { - /* - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - */ - - } - - function drop_tables () { - /* - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - } /** Function to get summary text * This function returns name property(ie.,summary text) of the SalesOrder class. @@ -149,13 +137,7 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id; - - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status !='Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 10:31:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Mar 2006 15:31:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4469 - /vtigercrm/trunk/modules/SalesOrder/SearchForm.html Message-ID: <20060327153144.390EB4FFC07@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 08:31:39 2006 New Revision: 4469 Log: unwanted file has been removed Removed: vtigercrm/trunk/modules/SalesOrder/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 20:29:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 01:29:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4470 - /vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Message-ID: <20060328012923.385AC4E9B3B@vtiger.fosslabs.com> Author: allanbush Date: Mon Mar 27 18:29:19 2006 New Revision: 4470 Log: Fixed date formatting. Ref #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Contacts/SaveBusinessCard.php Mon Mar 27 18:29:19 2006 @@ -59,7 +59,7 @@ $contactnotesdescription = $_POST['ContactNotesdescription']; -$date_var = date('YmdHis'); +$date_var = $adb->formatDate(date('YmdHis')); if(($acctname != '') && ($lastname != '')) { @@ -67,7 +67,7 @@ $account_id = $adb->getUniqueID("crmentity"); $idholderaccount = $account_id; - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$account_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Accounts','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$account_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Accounts','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertacct = "insert into account(accountid,accountname,phone,website) values(".$account_id.",'".$acctname."','".$acctphone."','".$acctwebsite ."')"; @@ -84,7 +84,7 @@ { $accountnote_id = $adb->getUniqueID("crmentity"); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$accountnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$accountnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertnote = "insert into notes(notesid,title,notecontent) values(".$accountnote_id.",'".$acctnotesname."','".$acctnotesdescription ."')"; @@ -102,7 +102,7 @@ $contact_id = $adb->getUniqueID("crmentity"); $idholdercontact = $contact_id; - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contact_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Contacts','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contact_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Contacts','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); @@ -113,7 +113,7 @@ $adb->query("insert into contactaddress (contactaddressid, mailingstreet, otherstreet, mailingcity, othercity, mailingstate, otherstate, mailingzip, otherzip, mailingcountry, othercountry) values(".$contact_id.", '', '', '".$mailingcity."', '', '".$mailingstate."', '', '".$mailingcode."', '', '".$mailingcountry."', '')"); - $adb->query("insert into contactsubdetails (contactsubscriptionid, homephone, leadsource, otherphone, birthday, assistant, assistantphone) values(".$contact_id.", '', '--None--', '', '', '', '')"); + $adb->query("insert into contactsubdetails (contactsubscriptionid, leadsource) values(".$contact_id.", '--None--')"); $adb->query("insert into contactscf (contactid) values(".$contact_id.")"); @@ -121,7 +121,7 @@ { $contactnote_id = $adb->getUniqueID("crmentity"); - $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contactnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql = "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$contactnote_id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'notes','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); $sql_insertnote = "insert into notes(notesid,contact_id,title,notecontent) values(".$contactnote_id.",".$contact_id.",'".$contactnotesname."','".$contactnotesdescription ."')"; @@ -230,7 +230,7 @@ $id = $adb->getUniqueID("crmentity"); $type = $_POST['appointment']; - $sql= "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Activities','created from business card','".$date_var."','".$date_var."','".$date_var."',0,0".")"; + $sql= "insert into crmentity (crmid,smcreatorid,smownerid,modifiedby,setype,description,createdtime,modifiedtime,viewedtime,presence,deleted) values(".$id.",".$current_user->id.",".$current_user->id.",".$current_user->id.",'Activities','created from business card',".$date_var.",".$date_var.",".$date_var.",0,0".")"; $adb->query($sql); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:01:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:01:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4471 - /vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Message-ID: <20060328030124.937644E8FFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:01:20 2006 New Revision: 4471 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Mar 27 20:01:20 2006 @@ -3,13 +3,7 @@ require_once('modules/PurchaseOrder/PurchaseOrder.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -21,7 +15,6 @@ $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new Order(); $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); @@ -175,38 +168,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -343,11 +309,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -377,14 +341,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -562,7 +518,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:03:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:03:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4472 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060328030316.1D04E4E8FFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:03:12 2006 New Revision: 4472 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Mon Mar 27 20:03:12 2006 @@ -26,8 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; +global $mod_strings,$app_strings,$theme,$profile_id; $focus = new Order(); @@ -41,7 +40,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -79,7 +77,6 @@ $smarty->assign("DELETE","permitted"); //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 22:05:46 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:05:46 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.5e6d937f73bafdb44025a0e7f2c23c53@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4473]) all fields go blank on mysql 4.1, reverting r4395. refs #63, reopen #63 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:05:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:05:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4473 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060328030547.5C8294E978E@vtiger.fosslabs.com> Author: mfedyk Date: Mon Mar 27 20:05:45 2006 New Revision: 4473 Log: all fields go blank on mysql 4.1, reverting r4395. refs #63, reopen #63 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Mar 27 20:05:45 2006 @@ -439,18 +439,7 @@ } $tabid= getTabid($module); - // MWC -- Fix hidden field saving issue - // $sql = "select * from field where tabid=" . $tabid . " and tablename='" . $table_name . "' and displaytype in (1,3)"; - $sql = "select * from field - inner join profile2field on profile2field.fieldid=field.fieldid - inner join def_org_field on def_org_field.fieldid=field.fieldid - where field.tabid=" . $tabid . " - and field.tablename='" . $table_name . "' - and field.displaytype in (1,3) - and profile2field.visible=0 - and def_org_field.visible=0 - and profile2field.profileid=" . $profile_id . " - order by sequence"; + $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -930,16 +919,7 @@ } $tabid = getTabid($module); - // MWC -- Fix hidden field saving issue - // $sql1 = "select * from field where tabid=" . $tabid; - $sql1 = "select * from field - inner join profile2field on profile2field.fieldid=field.fieldid - inner join def_org_field on def_org_field.fieldid=field.fieldid - where field.tabid=" . $tabid . " - and profile2field.visible=0 - and def_org_field.visible=0 - and profile2field.profileid=" . $profile_id . " - order by sequence"; + $sql1 = "select * from field where tabid=".$tabid; $result1 = $adb->query($sql1); $noofrows = $adb->num_rows($result1); for($i=0; $i<$noofrows; $i++) From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 22:07:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:07:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.bc7449142b65334dceb5af745c12b3dc@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by anonymous): * resolution: fixed => * version: 4.2.4rc3 => 4.2.4rc2 * status: closed => reopened -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 22:09:10 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:09:10 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.0ace64e79b95e5deccc55f70a99f943b@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: reopened Priority: critical | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:10:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:10:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4474 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060328031050.65F1C4E8AF0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:10:46 2006 New Revision: 4474 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Mon Mar 27 20:10:46 2006 @@ -29,10 +29,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $focus = new Order(); @@ -76,7 +73,6 @@ $focus->column_fields['ship_country']=$vend_focus->column_fields['country']; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:11:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:11:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4475 - /vtigercrm/trunk/modules/PurchaseOrder/index.php Message-ID: <20060328031158.E64C84E8AF0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:11:54 2006 New Revision: 4475 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/index.php Modified: vtigercrm/trunk/modules/PurchaseOrder/index.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/index.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/index.php Mon Mar 27 20:11:54 2006 @@ -50,8 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/PurchaseOrder/ListView.php'); ?> From vtiger-tickets at vtiger.fosslabs.com Mon Mar 27 22:13:02 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Mar 2006 03:13:02 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2372=3A_c?= =?utf-8?q?ustom_field-_date?= Message-ID: <076.5f56accc98932b203eae1d831846ecac@vtiger.fosslabs.com> #72: custom field- date --------------------------------+------------------------------------------- Reporter: howsday | Owner: developer Type: enhancement | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: custom field, date | --------------------------------+------------------------------------------- When created a custom field (date), edit the record will update to today's date instead of a default date or null value. This is very inconvinence when we want to update records (which the date field do not require for that particular contact/clients/potential). For example, i created a custom date field within potentials. Name: sales_closed_100%, only sales_closed as 100% will have date input for that particular field and when we generate monthly sales report, we can easily work out. But if a sales isn't closed and the sales person edit the potential record, it will automatically assign to today's date. The report generated will not be accurate. Please help! -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:15:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:15:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4476 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060328031540.EA3624E9CC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:15:36 2006 New Revision: 4476 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon Mar 27 20:15:36 2006 @@ -22,24 +22,17 @@ require_once('include/database/PearDatabase.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); -require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -111,7 +104,6 @@ '.$cvHTML; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:16:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:16:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4477 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Message-ID: <20060328031656.906B34E9CC7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:16:51 2006 New Revision: 4477 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Mon Mar 27 20:16:51 2006 @@ -318,8 +318,6 @@ var fldId = getOpenerObj("purchaseorder_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.purchaseorder_name.value = product_name; - //window.opener.document.EditView.purchaseorder_id.value = product_id; } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4478 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060328032007.13D054E9C94@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:20:02 2006 New Revision: 4478 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Mar 27 20:20:02 2006 @@ -110,16 +110,6 @@ $this->column_fields = getColumnFields('PurchaseOrder'); } - function create_tables () { - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - } - - function drop_tables () { - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - } - /** Function to get summary text * This function returns name property(ie.,summary text) of the Order class. */ @@ -140,12 +130,7 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id; - $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid,activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:21:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:21:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4479 - in /vtigercrm/trunk/modules/PurchaseOrder: PopupSearchForm.html SearchForm.html Message-ID: <20060328032127.53D974E4B0A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:21:23 2006 New Revision: 4479 Log: file has been removed Removed: vtigercrm/trunk/modules/PurchaseOrder/PopupSearchForm.html vtigercrm/trunk/modules/PurchaseOrder/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:50:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:50:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4480 - /vtigercrm/trunk/modules/Invoice/CreatePDF.php Message-ID: <20060328035004.974ED4EB1AE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:49:58 2006 New Revision: 4480 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Mar 27 20:49:58 2006 @@ -3,25 +3,16 @@ require_once('modules/Invoice/Invoice.php'); require_once('include/database/PearDatabase.php'); -//define('EURO', chr(128) ); -//define('EURO_VAL', 6.55957 ); -//define('USD',"?"); - -//Curency Settings By OpenCRM -global $adb; -global $app_strings; - +global $adb,$app_strings,$products_per_page; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); $currency_symbol = $adb->query_result($result,0,'currency_symbol'); // would you like and end page? 1 for yes 0 for no $endpage="1"; -global $products_per_page; $products_per_page="6"; $id = $_REQUEST['record']; -global $adb; //retreiving the invoice info $focus = new Invoice(); @@ -135,8 +126,6 @@ } // addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') // Default will place vtiger in the top left corner function addImage( $logo_name, $location=array('10','10','0','0') ) { if($logo_name)//error checking just in case, by OpenCRM @@ -177,38 +166,11 @@ $mid = $y1 + ($y2 / 2); $width=10; $this->SetFillColor(192); - //$this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 2.5, 'DF'); $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); $this->SetXY( $r1 + 4, $y1+1 ); $this->SetFont( "Helvetica", "B", 15); $this->Cell($width,5, $label." ".$total, 0, 0, "C"); } - -/* -// Label and number of invoice/estimate -function title( $label, $num, $position ) -{ - $length =strlen($label.$num); - $r1 = $position[0]; - $r2 = $r1 + ($length*2.5); - $y1 = 6; - $y2 = $y1 + 2; - $mid = $r1 + $r2; - - $text = $label ." ". $num; - $szfont = 23; - - $this->SetFont( "Helvetica", "", $szfont ); - $sz = $this->GetStringWidth( $text ); - - $this->SetLineWidth(0.1); - $this->SetFillColor(192); - //$this->RoundedRect($r1, $position[1], ($r2 - $r1), $y2, 2.5, 'DF'); - $this->RoundedRect($r1-15, $position[1]-3, $sz+5, 12, 2.5, 'DF'); - $this->SetXY($r1, $position[1]+1); - $this->Cell($r2-$r1 -1,5, $text, 0, 0, "C" ); -} -*/ // text block, non-wrapped function addTextBlock( $title,$text,$positions ) @@ -345,11 +307,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -379,14 +339,6 @@ } } -// add a line to the invoice/estimate -/* $line = array( "Product Name" => prodname, - "Description" => descr, - "Qty" => rty, - "List Price" => listprice, - "Unit Price" => unitprice, - "total" => total); -*/ function addProductLine( $line, $tab ) { global $columns, $format; @@ -564,7 +516,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:51:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:51:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4481 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060328035149.1FFCC4EB359@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:51:44 2006 New Revision: 4481 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Mon Mar 27 20:51:44 2006 @@ -26,9 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; -global $currentModule; +global $mod_strings,$app_strings,$currentModule,$theme; $focus = new Invoice(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { @@ -41,7 +39,6 @@ $focus->id = ""; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:56:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:56:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4482 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060328035658.AE6924EB7B2@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:56:54 2006 New Revision: 4482 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Mon Mar 27 20:56:54 2006 @@ -32,10 +32,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log; $focus = new Invoice(); $smarty = new vtigerCRM_Smarty(); @@ -142,7 +139,6 @@ $potfocus->column_fields['potential_id'] = $_REQUEST['opportunity_id']; $num_of_products = getNoOfAssocProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); $associated_prod = getAssociatedProducts("Potentials",$potfocus,$potfocus->column_fields['potential_id']); - //$focus->mode = ''; } if(isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '') { @@ -207,64 +203,27 @@ if(isset($_REQUEST['convertmode']) && $_REQUEST['convertmode'] == 'quotetoinvoice') { - /*$num_of_products = getNoOfAssocProducts("Quotes",$quote_focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Quotes",$quote_focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $quote_focus->mode); - /*$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($quote_focus->mode,"Quote",$quote_focus); } elseif(isset($_REQUEST['convertmode']) && ($_REQUEST['convertmode'] == 'sotoinvoice' || $_REQUEST['convertmode'] == 'update_so_val')) { - /*$num_of_products = getNoOfAssocProducts("SalesOrder",$so_focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("SalesOrder",$so_focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); - /*$smarty->assign("TAXVALUE", $so_focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $so_focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"SalesOrder",$so_focus); } elseif($focus->mode == 'edit') { $smarty->assign("UPDATEINFO",updateInfo($focus->id)); - /*$num_of_products = getNoOfAssocProducts("Invoice",$focus); - $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Invoice",$focus); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"Invoice",$focus); } elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') { - /*$smarty->assign("ROWCOUNT", $num_of_products); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); - $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']); - $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']); - $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);*/ $se_array=getProductDetailsBlockInfo($focus->mode,"",$focus,$num_of_products,$associated_prod); } elseif((isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '') || (isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] != '')) { - /*$smarty->assign("ROWCOUNT", $num_of_products); - $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); - $InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);*/ $smarty->assign("MODE", $focus->mode); -/* $smarty->assign("TAXVALUE", "0.000"); - $smarty->assign("ADJUSTMENTVALUE", "0.000"); - $smarty->assign("SUBTOTAL", $InvTotal.".00"); - $smarty->assign("GRANDTOTAL", $InvTotal.".00");*/ $focus->column_fields['txtTax'] = "0.000"; $focus->column_fields['txtAdjustment'] = "0.000"; $focus->column_fields['hdnSubTotal'] = ".00"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:58:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:58:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4483 - /vtigercrm/trunk/modules/Invoice/Forms.php Message-ID: <20060328035832.BE8574EB704@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:58:28 2006 New Revision: 4483 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Forms.php Modified: vtigercrm/trunk/modules/Invoice/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Forms.php (original) +++ vtigercrm/trunk/modules/Invoice/Forms.php Mon Mar 27 20:58:28 2006 @@ -171,53 +171,4 @@ return $the_script; } -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ -/* -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_quote_subject = $mod_strings['Subject']; -$lbl_quote_name = $mod_strings['Quote Name']; -$lbl_so_name = $mod_strings['Sales Order']; -$lbl_prod_name = $mod_strings['Product Name']; -$lbl_acct_name = $mod_strings['Account Name']; -$lbl_type = $mod_strings['Type']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$lbl_change_button_label = $app_strings['LBL_CHANGE_BUTTON_LABEL']; -$user_id = $current_user->id; - -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - $lbl_required_symbol$lbl_quote_subject
    -
    - $lbl_so_name
    -  
    - $lbl_acct_name
    -

    - - - - -EOQ; -$the_form .= get_left_form_footer(); - -$the_form .= get_validate_record_js(); - -return $the_form; -} -*/ ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 22:59:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 03:59:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4484 - /vtigercrm/trunk/modules/Invoice/index.php Message-ID: <20060328035956.90F684EB014@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 20:59:52 2006 New Revision: 4484 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/index.php Modified: vtigercrm/trunk/modules/Invoice/index.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/index.php (original) +++ vtigercrm/trunk/modules/Invoice/index.php Mon Mar 27 20:59:52 2006 @@ -42,7 +42,7 @@ -global $theme; +global $theme,$mod_strings; $theme_path="themes/".$theme."/"; @@ -50,9 +50,5 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - - - include ('modules/Invoice/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:01:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:01:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4485 - /vtigercrm/trunk/modules/Invoice/Invoice.js Message-ID: <20060328040113.034B14EB645@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:01:09 2006 New Revision: 4485 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Invoice.js Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Mon Mar 27 21:01:09 2006 @@ -165,25 +165,6 @@ return val; } -/* - - -function roundValue(val) { - if (val.indexOf(".")<0) { - val+=".00" - } else { - var dec=val.substring(val.indexOf(".")+1,val.length) - if (dec.length>2) - val=val.substring(0,val.indexOf("."))+"."+dec.substring(0,2) - else if (dec.length==1) - val=val+"0" - } - - return val; -} -*/ - - function copyAddressRight(form) { form.ship_street.value = form.bill_street.value; @@ -347,8 +328,6 @@ var fldId = getOpenerObj("product_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.product_name.value = product_name; - //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4486 - /vtigercrm/trunk/modules/Notes/Save.php Message-ID: <20060328041019.4FAC84EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:10:15 2006 New Revision: 4486 Log: Removed all the Junk & Commented code from the file Modified: vtigercrm/trunk/modules/Notes/Save.php Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:11:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:11:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4487 - /vtigercrm/trunk/modules/Invoice/Invoice.php Message-ID: <20060328041121.8B0A14EA894@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:11:17 2006 New Revision: 4487 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Invoice.php Modified: vtigercrm/trunk/modules/Invoice/Invoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.php (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Mar 27 21:11:17 2006 @@ -108,12 +108,6 @@ $this->column_fields = getColumnFields('Invoice'); } - function create_tables () { - } - - function drop_tables () { - } - function get_summary_text() { return $this->name; @@ -126,10 +120,6 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and crmentity.deleted=0 and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus != '' && activity.eventstatus = 'Planned')"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:12:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:12:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4488 - /vtigercrm/trunk/modules/Notes/index.php Message-ID: <20060328041211.657F84EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:12:07 2006 New Revision: 4488 Log: Removed all the Unuses & Commented code from the file Modified: vtigercrm/trunk/modules/Notes/index.php Modified: vtigercrm/trunk/modules/Notes/index.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:14:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:14:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4489 - /vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Message-ID: <20060328041458.CC5AB4EA917@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:14:54 2006 New Revision: 4489 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original) +++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Mon Mar 27 21:14:54 2006 @@ -23,22 +23,10 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $app_strings,$current_language,$current_user,$adb,$list_max_entries_per_page,$theme; $current_module_strings = return_module_language($current_language, 'Invoice'); - global $list_max_entries_per_page; - global $urlPrefix; - global $adb; $log = LoggerManager::getLogger('invoice_list'); - - global $currentModule; - global $theme; - - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -56,7 +44,6 @@ } $focus = new Invoice(); - global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:18:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:18:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4490 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060328041837.18F084ED8BC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:18:32 2006 New Revision: 4490 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Mon Mar 27 21:18:32 2006 @@ -25,21 +25,14 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('order_list'); - -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('accounttype'=>'account_type_dom' ,'industry'=>'industry_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -108,7 +101,6 @@ -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:18:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:18:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4491 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060328041854.875B14ED8BC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:18:50 2006 New Revision: 4491 Log: create table added for security.php Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Mon Mar 27 21:18:50 2006 @@ -125,7 +125,8 @@ } $startTime = microtime(); - +$modules = array("Security"); +$focus=0; // tables creation eecho("Creating Core tables: "); $success = $db->createTables("schema/DatabaseSchema.xml"); @@ -138,6 +139,12 @@ else eecho("Tables Successfully created.\n"); +foreach ( $modules as $module ) +{ + $focus = new $module(); + $focus->create_tables(); +} + create_default_users(); // populate users table From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:23:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:23:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4492 - /vtigercrm/trunk/modules/Invoice/Save.php Message-ID: <20060328042353.3F0CE4F291B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:23:49 2006 New Revision: 4492 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Mon Mar 27 21:23:49 2006 @@ -38,22 +38,15 @@ $focus->mode = $_REQUEST['mode']; } -//$focus->retrieve($_REQUEST['record']); - foreach($focus->column_fields as $fieldname => $val) { if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } } - -//print_r($focus->column_fields); $focus->save("Invoice"); @@ -80,7 +73,6 @@ } $query1 = "delete from invoiceproductrel where invoiceid=".$focus->id; - //echo $query1; $adb->query($query1); } @@ -118,8 +110,7 @@ function updateStk($product_id,$qty,$mode,$ext_prod_arr) { - global $adb; - global $current_user; + global $adb,$current_user; $prod_name = getProductName($product_id); $qtyinstk= getPrdQtyInStck($product_id); if($mode == 'edit') @@ -163,17 +154,13 @@ sendPrdStckMail($product_id,$upd_qty,$prod_name); } - - //$query= "update products set qtyinstock=".$upd_qty." where productid=".$product_id; - //$adb->query($query); //Check for reorder level and send mail } function sendPrdStckMail($product_id,$upd_qty,$prod_name) { - global $current_user; - global $adb; + global $current_user,$adb; $reorderlevel = getPrdReOrderLevel($product_id); if($upd_qty < $reorderlevel) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:26:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:26:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4493 - in /vtigercrm/trunk/modules/Invoice: Popup.html SearchForm.html Message-ID: <20060328042607.442944FD5E6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:26:02 2006 New Revision: 4493 Log: file has been removed Removed: vtigercrm/trunk/modules/Invoice/Popup.html vtigercrm/trunk/modules/Invoice/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:29:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:29:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4494 - /vtigercrm/trunk/modules/Notes/SearchForm.html Message-ID: <20060328042938.348094FD5E6@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:29:33 2006 New Revision: 4494 Log: Removed Commented code from the file Modified: vtigercrm/trunk/modules/Notes/SearchForm.html Modified: vtigercrm/trunk/modules/Notes/SearchForm.html ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:38:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:38:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4495 - in /vtigercrm/trunk/modules/PriceBooks: Popup.html SearchForm.html Message-ID: <20060328043841.AEC282BF16B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:38:37 2006 New Revision: 4495 Log: file has been removed Removed: vtigercrm/trunk/modules/PriceBooks/Popup.html vtigercrm/trunk/modules/PriceBooks/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:40:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:40:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4496 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060328044052.24DD44EA6B8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:40:48 2006 New Revision: 4496 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Mon Mar 27 21:40:48 2006 @@ -136,9 +136,6 @@ } } -function set_focus() -{ -} function cancelForm(frm) { window.history.back(); @@ -235,8 +232,6 @@ var fldId = getOpenerObj("vendor_id"); fldName.value = vendor_name; fldId.value = vendor_id; - //window.opener.document.EditView.vendor_name.value = vendor_name; - //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_inventory_pb(listprice, fldname) { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:42:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:42:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4497 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060328044251.307AC4EA6B8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:42:46 2006 New Revision: 4497 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon Mar 27 21:42:46 2006 @@ -78,10 +78,7 @@ $button = ''; - $button .= ' '; - $returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id; - $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; return getPriceBookRelatedProducts($query,$focus,$returnset); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:46:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:46:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4498 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060328044618.9E91E4FE007@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 21:46:13 2006 New Revision: 4498 Log: Removed commented lines Security.php Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Mar 27 21:46:13 2006 @@ -16,7 +16,6 @@ require_once('data/CRMEntity.php'); require_once('include/utils/utils.php'); -// TabMenu shown in the header page. class Security extends CRMEntity { var $table_name = "role"; @@ -358,7 +357,6 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); - //$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignid','campaign',1,'50','campaignid','Campaign ID',1,0,0,100,4,76,1,'V~M',0,2)"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); @@ -377,9 +375,7 @@ //Ticket Details -- START //Block25 -- Start -// $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'groupname','troubletickets',1,'54','groupname','Group',1,0,0,100,1,1,1)"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')"); - // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'crmid','seticketsrel',1,'59','parent_id','Product Name',1,0,0,100,3,1,1,'V~O')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')"); @@ -432,7 +428,6 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); -// $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'currency','products',1,'1','currency','Currency',1,0,0,100,3,2,1,'V~O')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); @@ -535,8 +530,6 @@ $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')"); -//Priority not needed in events -# $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,1,1,'V~O')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')"); @@ -571,7 +564,6 @@ //Block44-47 $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,null,'BAS')"); -// $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'company_name','vendor',1,'2','company_name','Company Name',1,0,0,100,2,1,1,'V~M')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,null,'BAS')"); $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')"); @@ -599,7 +591,6 @@ //Block48 $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,null,'BAS')"); -// $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'productid','pricebookproductrel',1,'59','product_id','Product Name',1,0,0,100,2,1,1,'I~O')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')"); @@ -621,13 +612,11 @@ $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'currency','quotes',1,'1','currency','Currency',1,0,0,100,7,1,1,'V~O')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')"); -// $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'type','quotes',1,'1','type','Type',1,0,0,100,12,1,1,'V~O')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')"); @@ -671,7 +660,6 @@ //Block57 $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')"); - //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'quoteid','purchaseorder',1,'78','quote_id','Quote Name',1,0,0,100,2,1,1,'I~M')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')"); @@ -679,7 +667,6 @@ $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'type','purchaseorder',1,'1','type','Type',1,0,0,100,9,1,1,'V~O')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')"); @@ -731,9 +718,7 @@ $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')"); - //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorterms','salesorder',1,'1','vendorterms','Vendor Terms',1,0,0,100,5,1,1,'V~O')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')"); - //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorid','salesorder',1,'75','vendor_id','Vendor Name',1,0,0,100,7,1,1,'I~O')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')"); @@ -788,7 +773,6 @@ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')"); -// $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'notes','invoice',1,'1','notes','Notes',1,0,0,100,4,1,1,'V~O')"); //to include contact name field in Invoice-start $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')"); @@ -796,9 +780,7 @@ $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')"); - //$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoiceterms','invoice',1,'1','invoiceterms','Invoice Terms',1,0,0,100,7,1,1,'V~O')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')"); -// $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'type','invoice',1,'1','type','Type',1,0,0,100,8,1,1,'V~O')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')"); $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')"); @@ -961,23 +943,12 @@ $this->db->query("insert into profile2tab values (".$profile4_id.",25,0)"); $this->db->query("insert into profile2tab values (".$profile4_id.",26,0)"); //Inserting into profile2standardpermissions Adminsitrator - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",1,4,0)"); - + $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,1,0)"); @@ -1089,24 +1060,11 @@ //Insert into Profile 2 std permissions for Sales User //Help Desk Create/Delete not allowed. Read-Only - - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",1,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,1,0)"); @@ -1206,7 +1164,7 @@ $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)"); + $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,3,0)"); @@ -1214,23 +1172,12 @@ //Inserting into profile2std for Support Profile // Potential is read-only - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",1,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,1,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,2,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,0,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,1,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,2,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,1,0)"); @@ -1330,7 +1277,7 @@ $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,4,0)"); - $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)"); + $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,1,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,2,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,3,0)"); @@ -1338,23 +1285,12 @@ //Inserting into profile2stdper for Profile Guest Profile //All Read-Only - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,0,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,1,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,2,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",1,4,0)"); - + $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,1,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,2,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,3,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,4,0)"); - - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,0,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,1,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,2,1)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,3,0)"); - //$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",3,4,0)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,0,1)"); $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,1,1)"); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:47:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:47:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4499 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060328044716.710184FE007@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:47:12 2006 New Revision: 4499 Log: status added for all faq Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:50:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:50:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4500 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060328045059.EFC5E4FE007@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:50:55 2006 New Revision: 4500 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Mon Mar 27 21:50:55 2006 @@ -14,13 +14,8 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; -global $list_max_entries_per_page; -global $currentModule; - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:51:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:51:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4501 - /vtigercrm/trunk/modules/PriceBooks/index.php Message-ID: <20060328045152.1E7174FEB46@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:51:48 2006 New Revision: 4501 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/index.php Modified: vtigercrm/trunk/modules/PriceBooks/index.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/index.php (original) +++ vtigercrm/trunk/modules/PriceBooks/index.php Mon Mar 27 21:51:48 2006 @@ -16,8 +16,6 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/PriceBooks/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:53:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:53:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4502 - /vtigercrm/trunk/modules/PriceBooks/EditView.php Message-ID: <20060328045357.991B34FEE28@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:53:53 2006 New Revision: 4502 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Mon Mar 27 21:53:53 2006 @@ -14,10 +14,7 @@ require_once('modules/PriceBooks/PriceBook.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; +global $app_strings,$mod_strings,$theme; $focus = new PriceBook(); $smarty = new vtigerCRM_Smarty(); @@ -35,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 27 23:59:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 04:59:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4503 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060328045902.2348B4FEC7F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 21:58:57 2006 New Revision: 4503 Log: changes made for uitype 33 Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Mar 27 21:58:57 2006 @@ -701,6 +701,19 @@ {/foreach} + {elseif $uitype eq 33} +     + {elseif $uitype eq 53}
    "; - echo ""; - echo ""; - echo ""; - echo ""; - echo "
    \n"; - echo ""; - echo $this->pref->menulink($callink ."calendar_dayview&t=".$last_day->getYYYYMMDD(),$this->pref->getImage(left,'list'),$last_day->getDate()).""; - echo " ". strftime($mod_strings['LBL_DATE_TITLE'],$from->ts) ." "; - echo ""; - echo $this->pref->menulink($callink ."calendar_dayview&t=".$next_day->getYYYYMMDD(),$this->pref->getImage(right,'list'),$next_day->getDate())."
    "; echo " From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:50:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:50:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4138 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060313105033.00B65409C1D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:50:29 2006 New Revision: 4138 Log: getTimeFilterOption() method has been defined and call to getCalendarHeader has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Mon Mar 13 03:50:29 2006 @@ -7,6 +7,7 @@ * @modulegroup appointment * @module calendar_week */ + require_once('modules/Calendar/CalendarCommon.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; $callink = 'index.php?module=Calendar&action='; @@ -20,35 +21,8 @@ echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_APPOINTMENT'], true); echo "\n
    \n"; $t=Date("Ymd"); -?> -
    - - - - - - - - - - '; - $output .= ''; - $output .= ''; - */ - if($module != 'Orders' && $focus->object_name != 'Order') - { - //$output .= ''; - //$output .= ''; + if($i%2 == 0) $row_class = "evenListRow"; + else $row_class = "oddListRow"; + + $product_Detail[$i]['txtProduct'.$i]= $productname; + + if($module != 'PurchaseOrder' && $focus->object_name != 'Order') + { $product_Detail[$i]['qtyInStock'.$i]=$qtyinstock; - } - #$output .= ''; + } $product_Detail[$i]['txtQty'.$i]=$qty; - #$output .=''; $product_Detail[$i]['unitPrice'.$i]=$unitprice; - #$output .= ''; - #$output .= ''; $product_Detail[$i]['txtListPrice'.$i]=$listprice; - #$output .= ''; - #$output .= ''; $product_Detail[$i]['total'.$i]=$total; - #$output .= ''; - $output .= ''; if($i != 1) { - #$output .= ''; + + $product_Detail[$i]['hdnProductId'.$i] = $productid; + $product_Detail[$i]['hdnRowStatus'.$i] = ''; + $product_Detail[$i]['hdnTotal'.$i] = $total; } return $product_Detail; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 03:02:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 08:02:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4417 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060324080227.662434EBC44@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 01:02:16 2006 New Revision: 4417 Log: * Added script function call settotalnoofrows in onBlur of Qty and added onBlur in ListPrice textbox Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Mar 24 01:02:16 2006 @@ -183,9 +183,11 @@
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - -
    -tablename = $calobj->table_name; } + + /** + * Function to get options for time filter combo + * @param $selcriteria -- selected option :: Type string + * Constructs html option tag + * returns html option tag in string format + */ + //Code added by Minnie - Starts + function getTimeFilterOption($selcriteria="") + { + $timefilter = Array("fullday"=>"Full day (24 Hours)", + "workhr"=>"Work hours (8am - 8pm)", + "morningtonoon"=>"Early morning to Noon (12am - 12pm)", + "noontomidnight"=>"Noon to Midnight (12pm - 12am)", + //"custom"=>"Custom" + ); + $thtml = ""; + foreach($timefilter as $FilterKey=>$FilterValue) + { + if($FilterKey == $selcriteria) + { + $thtml .= ""; + }else + { + $thtml .= ""; + } + } + return $thtml; + } + //Code added by Minnie - Ends + Function info() { // global $lang,$tutos,$calpath,$callink,$image_path,$mod_strings; global $lang,$tutos,$calpath,$callink,$image_path,$mod_strings,$adb; @@ -117,40 +122,17 @@ { $mn_name =""; } - echo ""; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($last_week,$next_week,"week",$day_from,$this->pref,$day_to,$m_name,$yy); + echo $calendarheader; echo "'; + // gettin' values + $alphabetical_search_values = & $app_list_strings['alphabetical_search_values']; + /* world alphabets has different count of letters. Plus we can add "special" (multucharacter) values in alphabetical seach bar */ + $count = count($alphabetical_search_values); + + // building alphabetical search bar from array values + for($i =0;$i<=$count;$i++) + $list .= ''; return $list; } From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 23:48:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:48:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.e2a84838d8dea6b536eead99768dab28@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4398]) merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 23:48:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:48:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.2d8fcf11c2c2dc5e7e13ad2f9c46e459@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4398]) merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 23:48:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 04:48:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4398 - in /vtigercrm/branches/4.2: data/CRMEntity.php modules/Potentials/updateRelations.php modules/Users/UserInfoUtil.php schema/DatabaseSchema.xml Message-ID: <20060323044859.D923C4EAD0A@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 21:48:54 2006 New Revision: 4398 Log: merge the non-postgres specific changes from 4.2_postgresql_integration. refs #17 and #62 Modified: vtigercrm/branches/4.2/data/CRMEntity.php vtigercrm/branches/4.2/modules/Potentials/updateRelations.php vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 21:48:54 2006 @@ -272,7 +272,7 @@ } //This check is done for products. - if($module == 'Products' || $module == 'Notes' || $module =='Faq') + if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'PriceBook' || $module == 'Vendor' || $module == 'Emails') { $vtlog->logthis("module is =".$module,'info'); $ownerid = $current_user->id; Modified: vtigercrm/branches/4.2/modules/Potentials/updateRelations.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/updateRelations.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/updateRelations.php Wed Mar 22 21:48:54 2006 @@ -15,8 +15,9 @@ //if($_REQUEST['module']=='Users') // $sql = "insert into salesmanactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; //else +if($_REQUEST['module']=='Potentials') $sql = "insert into contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")"; -$adb->query($sql); +else $sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")"; $adb->query($sql); header("Location: index.php?action=DetailView&module=Potentials&record=".$_REQUEST["parid"]); Modified: vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php ============================================================================== --- vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (original) +++ vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php Wed Mar 22 21:48:54 2006 @@ -571,6 +571,7 @@ global $adb; $sqldelete = "delete from activitygrouprelation where activityid=".$activityid; $adb->query($sqldelete); + if($groupname == '') return; $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')"; $adb->query($sql); Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Wed Mar 22 21:48:54 2006 @@ -160,7 +160,7 @@ Type=InnoDB modifiedby - + tabid @@ -225,7 +225,7 @@ fieldname - + tabidblockdisplaytype @@ -726,7 +726,6 @@ - @@ -808,10 +807,10 @@ Type=InnoDB accountid - + potentialid - + sales_stageType=InnoDB @@ -845,7 +844,7 @@ - + @@ -945,7 +944,7 @@ activityidsubject - + activitytypedate_start @@ -957,10 +956,10 @@ date_starttime_start - + eventstatus - + statuseventstatus @@ -1003,7 +1002,7 @@ Type=InnoDB - + attachmentsid @@ -1044,7 +1043,7 @@ Type=InnoDB crmid - + attachmentsidcrmid @@ -1180,7 +1179,7 @@ - + @@ -1582,7 +1581,7 @@ - + @@ -1757,7 +1756,7 @@ ticketid - + status @@ -1788,6 +1787,7 @@ + @@ -2381,6 +2381,7 @@ + @@ -3033,7 +3034,7 @@ - + Type=InnoDB @@ -3572,7 +3573,7 @@ - + profileidtabid @@ -3607,11 +3608,11 @@ tabidfieldname - + tabidprofileid - + visibleprofileid @@ -3657,10 +3658,10 @@ tabidfieldid - + tabid - + visiblefieldid @@ -3793,7 +3794,7 @@ - + relation_id @@ -4050,10 +4051,10 @@ - + quotestage - + potentialid @@ -4799,10 +4800,10 @@ - + - + cvid @@ -4873,6 +4874,7 @@
    "; - echo ""; - echo ""; - echo "\n"; - echo ""; - echo "
    \n"; - echo ""; - echo $this->pref->menulink($callink ."calendar_weekview&t=".$last_week,$this->pref->getImage(left,'list'),$mod_strings['LBL_LAST_WEEK']) .""; - echo $mod_strings['LBL_WEEK'] ." of " . $m_name . " ".$day_from." to ".$mn_name.$day_to." ". $yy ." "; - echo ""; - echo $this->pref->menulink($callink ."calendar_weekview&t=".$next_week,$this->pref->getImage(right,'list') ,$mod_strings['LBL_NEXT_WEEK']) ."
    "; echo "
    "; - echo " -
    - Time filter : - -
    "; + echo "
    "; + echo "Time filter : "; + echo "
    "; echo "
    "; echo ""; From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 05:58:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 10:58:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4139 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060313105846.64925409C4C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 03:58:42 2006 New Revision: 4139 Log: call to functions getHeaderTab() and getCalendarHeader() has been made Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Mon Mar 13 03:58:42 2006 @@ -1,4 +1,5 @@ \n"; $t=Date("Ymd"); -?> -
    - - - - -
    - - - - - - - - - - - -
     Day Week Month  
    -
    - - -
    -\n"; - echo "\n"; - echo ""; + $calendarheader = getCalendarHeader($lm,$nm,"month",$ly,$this->pref,$ny,$m_name,$y,$d,$f,$n); + echo $calendarheader; echo " - + {/section} @@ -50,6 +50,7 @@
    "; - echo ""; - echo "\n"; - echo ""; - echo "\n"; - echo ""; - echo "
    \n"; - echo ""; $nm = $m + 1; $ny = $y; if ( $nm == 13 ) @@ -135,22 +109,8 @@ } $m_name = $mod_strings['cal_month_long'][$m]; - - //echo $this->pref->menulink($callink."calendar_monthview&f=".$f."&n=".$n."&m=".$lm."&d=".$d."&y=".$ly,$this->pref->getImage(left,'list'),$mod_strings['LBL_LAST_WEEK']) .""; - - echo $m_name ." ". $y; - - echo ""; - - echo "
    "; echo " From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 06:14:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:14:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4140 - /vtigercrm/trunk/modules/Calendar/CalendarCommon.php Message-ID: <20060313111437.554F3409CB2@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:14:32 2006 New Revision: 4140 Log: CalendarCommon.php has been included Added: vtigercrm/trunk/modules/Calendar/CalendarCommon.php From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 06:17:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:17:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4141 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060313111748.B0422409CDA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:17:44 2006 New Revision: 4141 Log: in query activity.description has been changed to crmentity.description Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Mon Mar 13 04:17:44 2006 @@ -1976,7 +1976,7 @@ # Second query ( Get Recurring appointments ) # # - $q = "SELECT activity.activityid, activity.subject, activity.activitytype, activity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid"; + $q = "SELECT activity.activityid, activity.subject, activity.activitytype, crmentity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid"; $q.=" where ( activity.activitytype in ('Call','Meeting') AND "; if(!is_admin($current_user)) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 06:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 11:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4142 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060313112937.920A3409D30@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 04:29:31 2006 New Revision: 4142 Log: description column added for profile table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Mon Mar 13 04:29:31 2006 @@ -4011,6 +4011,7 @@ +
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 08:11:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:11:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4143 - in /vtigercrm/trunk: include/utils/UserInfoUtil.php modules/Users/ListProfiles.php modules/Users/SaveProfile.php Message-ID: <20060313131108.E8CD5409F61@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:10:58 2006 New Revision: 4143 Log: profile listview has been integrated Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php (contents, props changed) vtigercrm/trunk/modules/Users/ListProfiles.php (contents, props changed) vtigercrm/trunk/modules/Users/SaveProfile.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Mar 13 06:10:58 2006 @@ -1890,11 +1890,11 @@ * @param $profilename -- Profile Name:: Type varchar * @param $parentProfileId -- Profile Id:: Type integer */ -function createProfile($profilename,$parentProfileId) +function createProfile($profilename,$parentProfileId,$description) { global $adb; //Inserting values into Profile Table - $sql1 = "insert into profile values('','".$profilename."')"; + $sql1 = "insert into profile values('','".$profilename."','".$description."')"; $adb->query($sql1); //Retreiving the profileid Modified: vtigercrm/trunk/modules/Users/ListProfiles.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 08:12:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4144 - /vtigercrm/trunk/modules/Users/ListProfiles.php Message-ID: <20060313131221.3192C409F77@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:12:15 2006 New Revision: 4144 Log: xtpl include statement removed Modified: vtigercrm/trunk/modules/Users/ListProfiles.php Modified: vtigercrm/trunk/modules/Users/ListProfiles.php ============================================================================== --- vtigercrm/trunk/modules/Users/ListProfiles.php (original) +++ vtigercrm/trunk/modules/Users/ListProfiles.php Mon Mar 13 06:12:15 2006 @@ -10,7 +10,6 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -require_once('XTemplate/xtpl.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/utils/UserInfoUtil.php'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 08:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4145 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060313131303.6D4CA409F8C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:12:57 2006 New Revision: 4145 Log: new file added for profile listview Added: vtigercrm/trunk/Smarty/templates/UserProfile.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 08:58:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 13 Mar 2006 13:58:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4146 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060313135850.829D040A149@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 13 06:58:46 2006 New Revision: 4146 Log: issue in profile has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Mon Mar 13 06:58:46 2006 @@ -39,7 +39,7 @@ Edit {/if}      		{$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    +
    From vtiger-tickets at vtiger.fosslabs.com Mon Mar 13 22:17:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 14 Mar 2006 03:17:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= Message-ID: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ---------------------------------------+------------------------------------ Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Keywords: database postgresql adodb | ---------------------------------------+------------------------------------ Create a branch of source:vtigercrm/branches/4.2, called source:vtigercrm/branches/4.2_postgresql_integration, in which work can be done to remove the mysql-only behavior currently present in vtigercrm-4.2.x. ADODB is designed for transparent multidatabase support, and all issues identified which enable postgresql and other backends to be used should be considered fixed bugs. This branch and eventual merge is intended to serve as a model for source:vtigercrm/trunk to do the same before entering beta status. Please test simultaneously on mysql and postgresql while developing on this branch. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Mar 13 22:21:27 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 14 Mar 2006 03:21:27 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.31670f6a911ed2a2c8310af088bd7c00@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4147]) refs #62. Create a branch of vtigercrm/branches/4.2 named vtigercrm/branches/4.2_postgresql_integration. Development on this branch should be merged back to vtigercrm/branches/4.2 as soon as complete, to be included in vtigercrm/tags/vtigercrm-4.2.5 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 13 22:21:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 03:21:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4147 - /vtigercrm/branches/4.2_postgresql_integration/ Message-ID: <20060314032128.3C5244AF411@vtiger.fosslabs.com> Author: jeffk Date: Mon Mar 13 20:21:23 2006 New Revision: 4147 Log: refs #62. Create a branch of vtigercrm/branches/4.2 named vtigercrm/branches/4.2_postgresql_integration. Development on this branch should be merged back to vtigercrm/branches/4.2 as soon as complete, to be included in vtigercrm/tags/vtigercrm-4.2.5 Added: vtigercrm/branches/4.2_postgresql_integration/ - copied from r4146, vtigercrm/branches/4.2/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 00:45:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 05:45:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4148 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060314054543.1D466438DE1@vtiger.fosslabs.com> Author: richie Date: Mon Mar 13 22:45:38 2006 New Revision: 4148 Log: Data changed to be more subtle Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:04:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:04:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4149 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060314070438.3BAF84D935E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:04:33 2006 New Revision: 4149 Log: mysql5 changes made Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Tue Mar 14 00:04:33 2006 @@ -46,30 +46,30 @@ $table_name="user2role"; $table_name="role2tab"; - $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home','','',1)"); - $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads','','',1)"); - $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts','','',1)"); - $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials','','',1)"); - $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities','','',1)"); - $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails','','',1)"); - $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk','','',1)"); - $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products','','',1)"); - $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards','','',1)"); - $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq','','',1)"); - $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events','','',1)"); - $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar','','',1)"); - $this->db->query("INSERT INTO tab VALUES (18,'Vendors',0,15,'Vendors','','',1)"); - $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks','','',1)"); - $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes','','',1)"); - $this->db->query("INSERT INTO tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,19,'SalesOrder','','',1)"); - $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice','','',1)"); - $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss','','',1)"); - $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports','','',1)"); - $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns','','',1)"); - $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal','','',1)"); + $this->db->query("INSERT INTO tab VALUES (3,'Home',0,1,'Home',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (7,'Leads',0,4,'Leads',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (8,'Notes',0,9,'Notes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (9,'Activities',0,3,'Activities',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (10,'Emails',0,10,'Emails',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (14,'Products',0,8,'Products',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (15,'Faq',2,14,'Faq',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (16,'Events',2,13,'Events',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (24,'Rss',0,21,'Rss',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (25,'Reports',0,22,'Reports',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)"); + $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)"); // Populate the blocks table $this->db->query("insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)"); @@ -159,52 +159,52 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'phone','account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,'','ADV')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')"); //Added field emailoptout for accounts -- after 4.2 patch2 - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,null,'BAS')"); //Block 11 -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,'','BAS')"); - -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')"); + +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')"); //Block12 -$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')"); @@ -215,46 +215,46 @@ //Block13 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'firstname','leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'phone','leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lastname','leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'company','leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'email','leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,'','ADV')"); -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')"); //Block13 -- End //Block15 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')"); //Block15 --End //Block16 -- Start -$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')"); //Block16 -- End @@ -264,64 +264,64 @@ //Contact Details -- START //Block4 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'firstname','contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'phone','contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'lastname','contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'email','contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')"); //Block4 -- End //Block6 - Begin Customer Portal -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,'','ADV')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,'','ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')"); //Block6 - End Customer Portal //Block 7 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')"); //Block7 -- End //ContactImageInformation - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')"); //Block8 -- Start -$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')"); //Block8 -- End //Contact Details -- END @@ -333,20 +333,20 @@ $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'amount','potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'accountid','potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'closingdate','potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'sales_stage','potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')"); //Block1 -- End //Block3 -- Start - $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')"); //Block3 -- End //Potential Details -- END @@ -360,16 +360,16 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); //$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignid','campaign',1,'50','campaignid','Campaign ID',1,0,0,100,4,76,1,'V~M',0,2)"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'actualcost','campaign',1,'15','actualcost','Actual Cost',1,0,0,100,8,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedresponse','campaign',1,'16','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,'','BAS')"); - -$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,76,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,76,2,'T~O',1,null,'BAS')"); + +$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,77,1,'V~O',1,null,'BAS')"); //Campaign entries end @@ -378,24 +378,24 @@ //Block25 -- Start // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'groupname','troubletickets',1,'54','groupname','Group',1,0,0,100,1,1,1)"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'crmid','seticketsrel',1,'59','parent_id','Product Name',1,0,0,100,3,1,1,'V~O')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','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 field values (13,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'title','troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'description','troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')"); //Block25-30 -- End //Ticket Details -- END @@ -405,67 +405,67 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productname','products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',0,1,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcode','products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',0,2,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcategory','products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',0,3,'BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_end_date','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,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,26,1,'D~O~OTH~GE~start_date~Start Date',1,'','BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','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 field values (14,".$this->db->getUniqueID("field").",'sales_end_date','products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,26,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,'','BAS')"); - - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')"); + + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,'BAS')"); //Block32 Pricing Information -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,'','BAS')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); // $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'currency','products',1,'1','currency','Currency',1,0,0,100,3,2,1,'V~O')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','products',1,'15','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')"); //Block 33 stock info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','ADV')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','ADV')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')"); //ProductImageInformation - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')"); //Block 36 Description Info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')"); //Product Details -- END //Note Details -- START //Block17 -- Start -$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,'','BAS')"); +$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'title','notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')"); -$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')"); //Block17 -- End //Note Details -- END @@ -474,14 +474,14 @@ //Block21 -- Start $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',0,2,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,'')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,'')"); @@ -491,75 +491,75 @@ //Task Details --START //Block19 -- Start $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'status','activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,'','BAS')"); -$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,'','BAS')"); - - -$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')"); +$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); + + +$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')"); - $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,'','BAS')"); - - $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')"); + + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')"); //Block19 -- End //Task Details -- END //Event Details --START //Block41-43-- Start $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,'','BAS')"); - - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')"); + + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')"); //Priority not needed in events # $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,1,1,'V~O')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,'','BAS')"); - $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,'','BAS')"); - $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')"); //Block41-43 -- End //Event Details -- END //Faq Details -- START //Block37-40 -- Start -$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,'','BAS')"); +$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')"); //Block37-40 -- End @@ -568,43 +568,43 @@ //Vendor Details --START //Block44-47 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'company_name','vendor',1,'2','company_name','Company Name',1,0,0,100,2,1,1,'V~M')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')"); //Block 46 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','treet','Street',1,0,0,100,1,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','treet','Street',1,0,0,100,1,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'BAS')"); //Block 47 -$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'BAS')"); //Vendor Details -- END //PriceBook Details Start //Block48 -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',1,null,'BAS')"); // $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'productid','pricebookproductrel',1,'59','product_id','Product Name',1,0,0,100,2,1,1,'I~O')"); - $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')"); //Block50 -$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')"); //PriceBook Details End @@ -612,55 +612,55 @@ //Quote Details -- START //Block51 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'currency','quotes',1,'1','currency','Currency',1,0,0,100,7,1,1,'V~O')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')"); // $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'type','quotes',1,'1','type','Type',1,0,0,100,12,1,1,'V~O')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')"); //Block 53 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,'','BAS')"); - -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')"); + +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')"); //Block55 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'BAS')"); //Block 56 -$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'BAS')"); //Quote Details -- END @@ -668,113 +668,113 @@ //Purchase Order Details -- START //Block57 -$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,'','BAS')"); +$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')"); //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'quoteid','purchaseorder',1,'78','quote_id','Quote Name',1,0,0,100,2,1,1,'I~M')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'type','purchaseorder',1,'1','type','Type',1,0,0,100,9,1,1,'V~O')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')"); //Block 59 -$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')"); //Block61 - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'BAS')"); //Block62 - $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'BAS')"); //Purchase Order Details -- END //Sales Order Details -- START //Block63 -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,'','BAS')"); -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')"); +$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')"); //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorterms','salesorder',1,'1','vendorterms','Vendor Terms',1,0,0,100,5,1,1,'V~O')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')"); //$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'vendorid','salesorder',1,'75','vendor_id','Vendor Name',1,0,0,100,7,1,1,'I~O')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')"); //Block 65 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')"); //Block67 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'BAS')"); //Block68 - $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'BAS')"); //Sales Order Details -- END @@ -782,58 +782,58 @@ //Invoice Details -- START //Block69 -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')"); // $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'notes','invoice',1,'1','notes','Notes',1,0,0,100,4,1,1,'V~O')"); //to include contact name field in Invoice-start -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')"); //end -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')"); //$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoiceterms','invoice',1,'1','invoiceterms','Invoice Terms',1,0,0,100,7,1,1,'V~O')"); -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')"); // $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'type','invoice',1,'1','type','Type',1,0,0,100,8,1,1,'V~O')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,'','BAS')"); -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); //Block 71 -$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,'','BAS')"); - - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,'','BAS')"); - - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,'','BAS')"); +$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')"); + + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')"); + + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')"); //Block73 - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'BAS')"); //Block74 - $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'BAS')"); //Invoice Details -- END @@ -845,10 +845,10 @@ //New Security Start //Inserting into profile table - $this->db->query("insert into profile values ('".$profile1_id."','Administrator')"); - $this->db->query("insert into profile values ('".$profile2_id."','Sales Profile')"); - $this->db->query("insert into profile values ('".$profile3_id."','Support Profile')"); - $this->db->query("insert into profile values ('".$profile4_id."','Guest Profile')"); + $this->db->query("insert into profile values ('".$profile1_id."','Administrator',null)"); + $this->db->query("insert into profile values ('".$profile2_id."','Sales Profile',null)"); + $this->db->query("insert into profile values ('".$profile3_id."','Support Profile',null)"); + $this->db->query("insert into profile values ('".$profile4_id."','Guest Profile',null)"); //Inserting into profile2gloabal permissions $this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',1,0)"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:35:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:35:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4150 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060314073528.5412F4DE588@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 00:35:24 2006 New Revision: 4150 Log: Form changed from massdelete to selectall Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Tue Mar 14 00:35:24 2006 @@ -28,7 +28,7 @@
    -
    + cvid From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:08:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:08:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4161 - /vtigercrm/trunk/temp/test1/ Message-ID: <20060314090813.6DCBC4098A0@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:08:08 2006 New Revision: 4161 Log: test Removed: vtigercrm/trunk/temp/test1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:09:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:09:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4162 - /vtigercrm/trunk/temp/test/ Message-ID: <20060314090910.D62414097EF@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:09:05 2006 New Revision: 4162 Log: test Removed: vtigercrm/trunk/temp/test/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:22:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:22:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4163 - /vtigercrm/trunk/temp/a.txt Message-ID: <20060314092233.2B4CC4CBE83@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:22:27 2006 New Revision: 4163 Log: test Added: vtigercrm/trunk/temp/a.txt From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:24:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:24:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4164 - /vtigercrm/trunk/temp/a.txt Message-ID: <20060314092426.5C75F4D3BB5@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:24:18 2006 New Revision: 4164 Log: test Modified: vtigercrm/trunk/temp/a.txt Modified: vtigercrm/trunk/temp/a.txt ============================================================================== --- vtigercrm/trunk/temp/a.txt (original) +++ vtigercrm/trunk/temp/a.txt Tue Mar 14 02:24:18 2006 @@ -1,1 +1,8 @@ +djjd +sd +d +d +d ihddhnccn + + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:47:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:47:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4165 - /vtigercrm/tags/TEST0.1/ Message-ID: <20060314094729.14E3D4CE15C@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:47:23 2006 New Revision: 4165 Log: tagging the files for test Added: vtigercrm/tags/TEST0.1/ - copied from r4164, vtigercrm/trunk/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:58:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:58:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4166 - /vtigercrm/trunk/temp/ Message-ID: <20060314095834.313354D3BBA@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:58:29 2006 New Revision: 4166 Log: test Removed: vtigercrm/trunk/temp/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:00:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:00:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4167 - /vtigercrm/tags/TEST0.1/ Message-ID: <20060314100014.8EB214DEB4C@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 03:00:10 2006 New Revision: 4167 Log: test Removed: vtigercrm/tags/TEST0.1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:25:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:25:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4168 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060314102544.B1B014DE9B7@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:25:40 2006 New Revision: 4168 Log: Removed the GroupName field in Edit View Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Mar 14 03:25:40 2006 @@ -66,7 +66,7 @@ - + @@ -86,14 +86,17 @@ - - + + + + + - - - - {$USER_STATUS_OPTIONS} + + + {$USER_STATUS_OPTIONS} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:30:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:30:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4169 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060314103024.EB5164DEEDC@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:30:21 2006 New Revision: 4169 Log: Groups Associated with the user is fully resolved Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:42:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:42:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4170 - /vtigercrm/trunk/include/utils/GetUserGroups.php Message-ID: <20060314104217.96506438DD2@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:42:13 2006 New Revision: 4170 Log: Fixed the issue in RoleHandling Modified: vtigercrm/trunk/include/utils/GetUserGroups.php Modified: vtigercrm/trunk/include/utils/GetUserGroups.php ============================================================================== --- vtigercrm/trunk/include/utils/GetUserGroups.php (original) +++ vtigercrm/trunk/include/utils/GetUserGroups.php Tue Mar 14 03:42:13 2006 @@ -16,7 +16,7 @@ class GetUserGroups { var $user_groups=Array(); - var $userRole=''; + //var $userRole=''; /** to get all the parent groups of the specified group * @params $groupId --> Group Id :: Type Integer @@ -38,12 +38,16 @@ } } + + //Setting the User Role + $userRole = fetchUserRole($userid); + //echo 'user2group Array
    '; //print_r($this->user_groups); //echo 'user2group Array
    '; //Retreiving from the user2role - $query="select * from group2role where roleid='".$this->userRole."'"; + $query="select * from group2role where roleid='".$userRole."'"; $result = $adb->query($query); $num_rows=$adb->num_rows($result); for($i=0;$i<$num_rows;$i++) @@ -57,13 +61,13 @@ } //Retreiving from the user2rs - $parentRoles=getParentRole($this->userRole); + $parentRoles=getParentRole($userRole); $parentRolelist="("; foreach($parentRoles as $par_rol_id) { $parentRolelist .= "'".$par_rol_id."',"; } - $parentRolelist .= "'".$this->userRole."')"; + $parentRolelist .= "'".$userRole."')"; //echo '
    '.$parentRolelist.'
    '; $query="select * from group2rs where roleandsubid in".$parentRolelist; $result = $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 05:44:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 10:44:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4171 - /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Message-ID: <20060314104449.69CB5438DD2@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 03:44:45 2006 New Revision: 4171 Log: Fixed the issue in RoleHandling when calling GetUserGroups Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Mar 14 03:44:45 2006 @@ -43,7 +43,7 @@ $user_role_info=getRoleInformation($user_role); $user_role_parent=$user_role_info[$user_role][1]; $userGroupFocus=new GetUserGroups(); - $userGroupFocus->userRole=$user_role; + //$userGroupFocus->userRole=$user_role; $userGroupFocus->getAllUserGroups($userid); $subRoles=getRoleSubordinates($user_role); $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 06:23:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 11:23:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4172 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060314112324.AFF984DCC1D@vtiger.fosslabs.com> Author: don Date: Tue Mar 14 04:23:20 2006 New Revision: 4172 Log: Modified fetchUserGroupsIds Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Mar 14 04:23:20 2006 @@ -13,6 +13,7 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +require_once('include/utils/GetUserGroups.php'); include('config.php'); global $log; @@ -69,17 +70,11 @@ function fetchUserGroupids($userid) { global $adb; - $sql= "select users2group.groupid from users2group inner join groups on groups.groupid=users2group.groupid where userid=" .$userid; - $result = $adb->query($sql); - //code changed to return a list of groups related to the userid as comma seperated - if($adb->num_rows($result)!=0) - { - for($i=0;$i<$adb->num_rows($result);$i++) - $groupid[]= $adb->query_result($result,$i,"groupid"); - - $groupidlists = implode (",",$groupid); - } - return $groupidlists; + $focus = new GetUserGroups(); + $focus->getAllUserGroups($userid); + $groupidlists = implode(",",$focus->user_groups); + return $groupidlists; + } /** Function to load all the permissions From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:40:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:40:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4173 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060314124034.9391A4CE1E7@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:40:30 2006 New Revision: 4173 Log: Removed the Hyperlink in the Role field value for users other than admin Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:52:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:52:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4174 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060314125248.941454DE60D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:52:44 2006 New Revision: 4174 Log: Updated the Role,Status, & Currency field to Readonly for standard users Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Tue Mar 14 05:52:44 2006 @@ -165,9 +165,24 @@ $status .= "\n"; $smarty->assign("USER_STATUS_OPTIONS", $status); - - - $ROLE_SELECT_OPTION = '\n"; + $smarty->assign("USER_STATUS_OPTIONS", $status); + +} + +if (is_admin($current_user)) { + + $ROLE_SELECT_OPTION = ''; } if($focus->id != '') { @@ -201,7 +216,7 @@ - +if (is_admin($current_user)) { $GROUP_SELECT_OPTION = ''; $smarty->assign("GROUP_NAME", $GROUP_SELECT_OPTION); + } + +if (is_admin($current_user)) { + $CURRENCY_SELECT_OPTION = ''; +} - $CURRENCY_SELECT_OPTION = ''; $smarty->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION); -} + $smarty->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view)); $smarty->assign("CLOUD_TAG", $focus->tagcloud); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 07:59:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 12:59:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4175 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060314125918.11C574E02B7@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 05:59:15 2006 New Revision: 4175 Log: Shout Box Removed from Homepage Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Mar 14 05:59:15 2006 @@ -125,7 +125,7 @@ - - - @@ -94,7 +92,7 @@
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:39:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:39:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4151 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060314073932.1B84B40A89C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 00:39:28 2006 New Revision: 4151 Log: Added id = 'parent_id' & id = return_module as well as closed the form tag Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Mar 14 00:39:28 2006 @@ -15,10 +15,10 @@ - + - + {if $MODULE eq 'Activities'} @@ -62,4 +62,4 @@ {elseif $MODULE eq 'HelpDesk'} {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:39:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:39:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4152 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060314073952.3BD2D40A89C@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:39:48 2006 New Revision: 4152 Log: mysql5 query support added Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Tue Mar 14 00:39:48 2006 @@ -30,11 +30,11 @@ { if($val != '') { - $adb->query("insert into ".$tableName. " values('','".$val."',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); } else { - $adb->query("insert into ".$tableName. " values('','--None--',".$i.",1)"); + $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); } $i++; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:40:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:40:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4153 - /vtigercrm/trunk/modules/Reports/PopulateReports.php Message-ID: <20060314074013.B0A08415CF7@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:40:09 2006 New Revision: 4153 Log: mysql5 query support added Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php ============================================================================== --- vtigercrm/trunk/modules/Reports/PopulateReports.php (original) +++ vtigercrm/trunk/modules/Reports/PopulateReports.php Tue Mar 14 00:40:09 2006 @@ -418,7 +418,7 @@ global $adb; $sql = "INSERT INTO reportfolder "; $sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) "; - $sql .= "VALUES ('','".$fldrname."','".$fldrdescription."','SAVED')"; + $sql .= "VALUES (null,'".$fldrname."','".$fldrdescription."','SAVED')"; $result = $adb->query($sql); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:40:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:40:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4154 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060314074052.1C722438DD2@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:40:48 2006 New Revision: 4154 Log: mysql5 query support added Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Tue Mar 14 00:40:48 2006 @@ -425,7 +425,7 @@ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,'BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')"); //Block32 Pricing Information @@ -482,8 +482,8 @@ $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,1,23,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,'')"); - $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,'')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')"); + $this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')"); //Block21 -- End //Email Details -- END From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 02:59:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 07:59:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4155 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060314075904.211B94D3BAF@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 00:59:00 2006 New Revision: 4155 Log: mysql5 support added Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 03:16:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 08:16:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4156 - /vtigercrm/trunk/modules/Users/LoginHistory.php Message-ID: <20060314081653.61B844CE15D@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 01:16:49 2006 New Revision: 4156 Log: mysql5 support Modified: vtigercrm/trunk/modules/Users/LoginHistory.php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/LoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/LoginHistory.php Tue Mar 14 01:16:49 2006 @@ -98,7 +98,7 @@ function user_login(&$usname,&$usip,&$intime) { //print("GS --> intime=".$intime); - $query = "Insert into loginhistory values ('','$usname','$usip','',".$this->db->formatDate($intime).",'Signedin')"; + $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4157 - /vtigercrm/trunk/temp/ Message-ID: <20060314090307.8F5194D3BC0@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:02:44 2006 New Revision: 4157 Log: test Added: vtigercrm/trunk/temp/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:05:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:05:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4158 - /vtigercrm/trunk/temp/test/ Message-ID: <20060314090521.EACB04097AC@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:05:18 2006 New Revision: 4158 Log: test Added: vtigercrm/trunk/temp/test/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:06:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:06:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4159 - /vtigercrm/trunk/temp/test1/ Message-ID: <20060314090637.837C64097EF@vtiger.fosslabs.com> Author: ramy Date: Tue Mar 14 02:06:32 2006 New Revision: 4159 Log: test Added: vtigercrm/trunk/temp/test1/ From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 04:06:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 09:06:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4160 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060314090652.C48224097EF@vtiger.fosslabs.com> Author: richie Date: Tue Mar 14 02:06:47 2006 New Revision: 4160 Log: start and end date default values set Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Tue Mar 14 02:06:47 2006 @@ -5276,10 +5276,10 @@ - + - +
    *{$UMOD.LBL_USER_NAME} {$UMOD.LBL_ADMIN}
    *{$UMOD.LBL_USER_ROLE}{$USER_ROLE} {$UMOD.LBL_GROUP_NAME}{$GROUP_NAME}{$USER_ROLE}*{$UMOD.LBL_EMAIL}
    *{$UMOD.LBL_EMAIL}*{$UMOD.LBL_STATUS}*{$UMOD.LBL_STATUS} 
     
      
    + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 10:21:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:21:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4182 - in /vtigercrm/trunk/install: 1checkSystem.php 2setConfig.php Message-ID: <20060314152127.C1EDC4E2C25@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:21:17 2006 New Revision: 4182 Log: config file name changed Modified: vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 10:24:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:24:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4183 - /vtigercrm/trunk/config.php Message-ID: <20060314152404.4590C4E2C22@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:23:59 2006 New Revision: 4183 Log: contents modified for mutilple packaging support Modified: vtigercrm/trunk/config.php Modified: vtigercrm/trunk/config.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 10:42:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 15:42:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4184 - /vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Message-ID: <20060314154227.6BE1D4E2C4E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 08:42:22 2006 New Revision: 4184 Log: Removed the form ending tag Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Modified: vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl (original) +++ vtigercrm/trunk/Smarty/templates/RelatedListsHidden.tpl Tue Mar 14 08:42:22 2006 @@ -62,4 +62,4 @@ {elseif $MODULE eq 'HelpDesk'} {/if} - + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 12:04:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 17:04:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4185 - /vtigercrm/trunk/config.inc.php Message-ID: <20060314170435.5E2FC4E2CF8@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 10:04:30 2006 New Revision: 4185 Log: file checked in with no contents Modified: vtigercrm/trunk/config.inc.php Modified: vtigercrm/trunk/config.inc.php ============================================================================== --- vtigercrm/trunk/config.inc.php (original) +++ vtigercrm/trunk/config.inc.php Tue Mar 14 10:04:30 2006 @@ -1,71 +1,0 @@ - From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 12:11:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 17:11:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4186 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060314171101.5B7094E2D1B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 10:10:57 2006 New Revision: 4186 Log: updated for utils path Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Tue Mar 14 10:10:57 2006 @@ -39,7 +39,7 @@ require_once('modules/Users/LoginHistory.php'); require_once('modules/Settings/FileStorage.php'); require_once('data/Tracker.php'); -require_once('include/utils.php'); +require_once('include/utils/utils.php'); require_once('modules/Users/Security.php'); // load the config_override.php file to provide default user settings From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 02:24:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 07:24:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4187 - /vtigercrm/trunk/Smarty/templates/EditProfile.tpl Message-ID: <20060315072409.7F6174E33FC@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 00:24:03 2006 New Revision: 4187 Log: Added profile name and description as hidden parameters Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed Mar 15 00:24:03 2006 @@ -34,9 +34,11 @@
    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - elseif($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $global_per_arry = getProfileGlobalPermission($profileId); - //print_r($global_per_arry); - $view_all_per = $global_per_arry[1]; - $edit_all_per = $global_per_arry[2]; - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - - - } - - - -} -elseif($secondaryModule == 'stand_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - //Updating the Edit Save Option - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $act_perr_arry = getTabsActionPermission($profileId); - foreach($act_perr_arry as $tabid=>$action_array) - { - $entity_name = getTabname($tabid); - //Create/Edit Permission - $tab_create_per_id = $action_array['1']; - $tab_create_per = getDisplayValue($tab_create_per_id,$tabid,'1'); - //Delete Permission - $tab_delete_per_id = $action_array['2']; - $tab_delete_per = getDisplayValue($tab_delete_per_id,$tabid,'2'); - //View Permission - $tab_view_per_id = $action_array['4']; - $tab_view_per = getDisplayValue($tab_view_per_id,$tabid,'4'); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - - - } - if($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $act_perr_arry = getTabsActionPermission($profileId); - foreach($act_perr_arry as $tabid=>$action_array) - { - $entity_name = getTabname($tabid); - //Create/Edit Permission - $tab_create_per_id = $action_array['1']; - $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); - //Delete Permission - $tab_delete_per_id = $action_array['2']; - $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); - //View Permission - $tab_view_per_id = $action_array['4']; - $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - -} -elseif($secondaryModule == 'tab_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $tab_perr_array = getTabsPermission($profileId); - $no_of_tabs = sizeof($tab_perr_array); - $i=1; - foreach($tab_perr_array as $tabid=>$tab_perr) - { - $entity_name = getTabname($tabid); - $tab_allow_per_id = $tab_perr_array[$tabid]; - $tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,''); - - if ($i%2==0) +$mode=$_REQUEST['mode']; + +//Global Privileges + +if($mode == 'view') +{ + $global_per_arry = getProfileGlobalPermission($profileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayValue($view_all_per,1); + $privileges_global[]=getGlobalDisplayValue($edit_all_per,2); +} +elseif($mode == 'edit') +{ + $global_per_arry = getProfileGlobalPermission($profileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayOutput($view_all_per,1); + $privileges_global[]=getGlobalDisplayOutput($edit_all_per,2); +} +elseif($mode == 'create') +{ + if($parentProfileId != '') + { + $global_per_arry = getProfileGlobalPermission($parentProfileId); + $view_all_per = $global_per_arry[1]; + $edit_all_per = $global_per_arry[2]; + $privileges_global[]=getGlobalDisplayOutput($view_all_per,1); + $privileges_global[]=getGlobalDisplayOutput($edit_all_per,2); + } + else + { + $privileges_global[]=getGlobalDisplayOutput(0,1); + $privileges_global[]=getGlobalDisplayOutput(0,2); + } + +} + +$smarty->assign("GLOBAL_PRIV",$privileges_global); + +//standard privileges +if($mode == 'view') +{ + $act_perr_arry = getTabsActionPermission($profileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayValue($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayValue($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayValue($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } +} +if($mode == 'edit') +{ + $act_perr_arry = getTabsActionPermission($profileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } +} +if($mode == 'create') +{ + if($parentProfileId != '') + { + $act_perr_arry = getTabsActionPermission($parentProfileId); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput($tab_create_per_id,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput($tab_delete_per_id,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput($tab_view_per_id,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } + } + else + { + $act_perr_arry = getTabsActionPermission(1); + foreach($act_perr_arry as $tabid=>$action_array) + { + $stand = array(); + $entity_name = getTabname($tabid); + //Create/Edit Permission + $tab_create_per_id = $action_array['1']; + $tab_create_per = getDisplayOutput(0,$tabid,'1'); + //Delete Permission + $tab_delete_per_id = $action_array['2']; + $tab_delete_per = getDisplayOutput(0,$tabid,'2'); + //View Permission + $tab_view_per_id = $action_array['4']; + $tab_view_per = getDisplayOutput(0,$tabid,'4'); + + $stand[]=$entity_name; + $stand[]=$tab_create_per; + $stand[]=$tab_delete_per; + $stand[]=$tab_view_per; + $privileges_stand[]=$stand; + } + $act_perr_arry = getTabsActionPermission($parentProfileId); + } + +} +$smarty->assign("STANDARD_PRIV",$privileges_stand); + +//tab Privileges + +if($mode == 'view') +{ + $tab_perr_array = getTabsPermission($profileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } +} +if($mode == 'edit') +{ + $tab_perr_array = getTabsPermission($profileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } +} +if($mode == 'create') +{ + if($parentProfileId != '') + { + $tab_perr_array = getTabsPermission($parentProfileId); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } + } + else + { + $tab_perr_array = getTabsPermission(1); + $no_of_tabs = sizeof($tab_perr_array); + foreach($tab_perr_array as $tabid=>$tab_perr) + { + $tab=array(); + $entity_name = getTabname($tabid); + $tab_allow_per_id = $tab_perr_array[$tabid]; + $tab_allow_per = getDisplayOutput(0,$tabid,''); + $tab[]=$entity_name; + $tab[]=$tab_allow_per; + $privileges_tab[]=$tab; + } + } + +} +$privileges_tab = array_chunk($privileges_tab, 2); +$smarty->assign("TAB_PRIV",$privileges_tab); + +//utilities privileges + +if($mode == 'view') +{ + $act_utility_arry = getTabsUtilityActionPermission($profileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayValue($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } +} +elseif($mode == 'edit') +{ + $act_utility_arry = getTabsUtilityActionPermission($profileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } +} +elseif($mode == 'create') +{ + if($parentProfileId != '') + { + $act_utility_arry = getTabsUtilityActionPermission($parentProfileId); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } + } + else + { + $act_utility_arry = getTabsUtilityActionPermission(1); + foreach($act_utility_arry as $tabid=>$action_array) + { + $util=array(); + $entity_name = getTabname($tabid); + $no_of_actions=sizeof($action_array); + foreach($action_array as $action_id=>$act_per) + { + $action_name = getActionName($action_id); + $tab_util_act_per = $action_array[$action_id]; + $tab_util_per = getDisplayOutput(0,$tabid,$action_id); + $util[]=$action_name; + $util[]=$tab_util_per; + } + $util=array_chunk($util,2); + $util=array_chunk($util,2); + $privilege_util[$entity_name] = $util; + } + + } + +} +$smarty->assign("UTILITIES_PRIV",$privilege_util); + +//Field privileges +$modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); +$no_of_mod=sizeof($modArr); +for($i=0;$i<$no_of_mod; $i++) +{ + $fldModule=key($modArr); + $lang_str=$modArr[$fldModule]; + $privilege_fld[]=$fldModule; + next($modArr); +} +$smarty->assign("PRI_FIELD_LIST",$privilege_fld); + +if($mode=='view') +{ + $fieldListResult = getProfile2AllFieldList($modArr,$profileId); + for($i=0; $i"; + } + else + { + $visible = ""; + } + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } +} +elseif($mode=='edit') +{ + $fieldListResult = getProfile2AllFieldList($modArr,$profileId); + for($i=0; $i'; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } +} +elseif($mode=='create') +{ + if($parentProfileId != '') + { + $fieldListResult = getProfile2AllFieldList($modArr,$parentProfileId); + for($i=0; $i'; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; + $mandatory = '*'; + $readonly = 'disabled'; + } + if($fieldListResult[$module_name][$j][3] == 0) + { + $visible = "checked"; } else { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; + $visible = ""; } - $i++; - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - if($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $tab_perr_array = getTabsPermission($profileId); - $no_of_tabs = sizeof($tab_perr_array); - $i=1; - foreach($tab_perr_array as $tabid=>$tab_perr) - { - $entity_name = getTabname($tabid); - $tab_allow_per_id = $tab_perr_array[$tabid]; - $tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,''); - - if ($i%2==0) + $field[]=$mandatory.' '.$fldLabel; + $field[]=''; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } + } + else + { + $fieldListResult = getProfile2AllFieldList($modArr,1); + for($i=0; $i'; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - $i++; - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - - } - - -} -elseif($secondaryModule == 'util_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $i=1; - if($mode == 'view') - { - - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $act_utility_arry = getTabsUtilityActionPermission($profileId); - - foreach($act_utility_arry as $tabid=>$action_array) - { - - $entity_name = getTabname($tabid); - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - $k=1; - $no_of_actions=sizeof($action_array); - foreach($action_array as $action_id=>$act_per) - { - - - $action_name = getActionName($action_id); - $tab_util_act_per = $action_array[$action_id]; - $tab_util_per = getDisplayValue($tab_util_act_per,$tabid,$action_id); - - - - if($k%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - } - else - { - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - if($k == $no_of_actions) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - } - $k++; - - - - - } - - } - - - - - - - } - elseif($mode == 'edit') - { - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $act_utility_arry = getTabsUtilityActionPermission($profileId); - - foreach($act_utility_arry as $tabid=>$action_array) - { - - $entity_name = getTabname($tabid); - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - $k=1; - $no_of_actions=sizeof($action_array); - foreach($action_array as $action_id=>$act_per) - { - - - $action_name = getActionName($action_id); - $tab_util_act_per = $action_array[$action_id]; - $tab_util_per = getDisplayOutput($tab_util_act_per,$tabid,$action_id); - - - - if($k%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - - - } - else - { - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - if($k == $no_of_actions) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - } - $k++; - - } - } - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); - -} -elseif($secondaryModule == 'field_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfSelectedTab'); - if($mode == 'list') - { - $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendor'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBook'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); - - $no_of_mod=sizeof($modArr); - for($i=0;$i<$no_of_mod; $i++) - { - $fldModule=key($modArr); - $lang_str=$modArr[$fldModule]; - - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $i++; - next($modArr); - $fldModule=key($modArr); - $lang_str=$modArr[$fldModule]; - - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - next($modArr); - } - - - } - elseif($mode=='view') - { - - $fld_module=$_REQUEST['fld_module']; - $xtpl->assign("FIELDMODULE", '  - '.$fld_module.' Field Access'); - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $fieldListResult = getProfile2FieldList($fld_module, $profileId); - $noofrows = $adb->num_rows($fieldListResult); - for($i=0; $i<$noofrows; $i++) - { - $fldLabel= $adb->query_result($fieldListResult,$i,"fieldlabel"); - if($adb->query_result($fieldListResult,$i,"visible") == 0) - { - $visible = ""; - } - else - { - $visible = ""; - } - - if(($i+1)%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - } - - - } - elseif($mode=='edit') - { - $fld_module=$_REQUEST['fld_module']; - $xtpl->assign("FIELDMODULE", '  - '.$fld_module.' Field Access'); - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $edit_save .= ''; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $fieldListResult = getProfile2FieldList($fld_module, $profileId); - $noofrows = $adb->num_rows($fieldListResult); - for($i=0; $i<$noofrows; $i++) - { - $fldLabel= $adb->query_result($fieldListResult,$i,"fieldlabel"); - $uitype = $adb->query_result($fieldListResult,$i,"uitype"); - $mandatory = ''; - $readonly = ''; - - if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16) - { - $mandatory = '*'; - $readonly = 'disabled'; - } - if($adb->query_result($fieldListResult,$i,"visible") == 0) - { - $visible = "checked"; - } - else - { - $visible = ""; - } - - if(($i+1)%2 == 0) - { - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .= ''; - $output1 .=''; - } - else - { - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - } - } - - - } - $xtpl->assign("OUTPUT", $output); - $xtpl->assign("OUTPUT1", $output1); -} - -$xtpl->assign("THEME", $theme); -$xtpl->assign("IMAGE_PATH", $image_path); - -$xtpl->parse("main"); - -$xtpl->out("main"); - + $mandatory = '*'; + $readonly = 'disabled'; + } + $visible = "checked"; + $field[]=$mandatory.' '.$fldLabel; + $field[]=''; + $field_module[]=$field; + } + $privilege_field[$module_name] = array_chunk($field_module,2); + next($fieldListResult); + } + } +} + +$smarty->assign("FIELD_PRIVILEGES",$privilege_field); +$smarty->assign("THEME", $theme); +$smarty->assign("IMAGE_PATH", $image_path); +if($mode == 'view') + $smarty->display("ProfileDetailView.tpl"); +else + $smarty->display("EditProfile.tpl"); function getGlobalDisplayValue($id,$actionid) { - global $image_path; - if($id == '') - { - $value = ' '; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - else - { - $value = ' '; - } - - return $value; + global $image_path; + if($id == '') + { + $value = ' '; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + else + { + $value = ' '; + } + + return $value; } function getGlobalDisplayOutput($id,$actionid) { - if($actionid == '1') - { - $name = 'view_all'; - } - elseif($actionid == '2') - { - - $name = 'edit_all'; - } - - if($id == '') - { - $value = ''; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - return $value; + if($actionid == '1') + { + $name = 'view_all'; + } + elseif($actionid == '2') + { + + $name = 'edit_all'; + } + + if($id == '' && $id != 0) + { + $value = ''; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + return $value; } function getDisplayValue($id) { - global $image_path; - - if($id == '') - { - $value = ' '; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - else - { - $value = ' '; - } - return $value; + global $image_path; + + if($id == '') + { + $value = ' '; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + else + { + $value = ' '; + } + return $value; } function getDisplayOutput($id,$tabid,$actionid) { - if($actionid == '') - { - $name = $tabid.'_tab'; - } - else - { - $temp_name = getActionname($actionid); - $name = $tabid.'_'.$temp_name; - } - - - - if($id == '') - { - $value = ''; - } - elseif($id == 0) - { - $value = ''; - } - elseif($id == 1) - { - $value = ''; - } - return $value; + if($actionid == '') + { + $name = $tabid.'_tab'; + } + else + { + $temp_name = getActionname($actionid); + $name = $tabid.'_'.$temp_name; + } + + + + if($id == '' && $id != 0) + { + $value = ''; + } + elseif($id == 0) + { + $value = ''; + } + elseif($id == 1) + { + $value = ''; + } + return $value; } Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Tue Mar 14 07:22:46 2006 @@ -1320,4 +1320,80 @@ background: url(images/calc_mem_btn.gif) no-repeat; width:25px; } - +/* profile */ + +.small { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.prvPrfBigText { + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +.prvPrfTopBg { + background-color:#ebebeb; +} + +.prvPrfBottomBg { + background-color:#ebebeb; +} + +.prvPrfOutline { + 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; +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:24:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:24:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4179 - in /vtigercrm/trunk: Smarty/templates/CreateProfile.tpl Smarty/templates/CreateProfile1.tpl Smarty/templates/EditProfile.tpl Smarty/templates/ProfileDetailView.tpl modules/Users/CreateProfile1.php Message-ID: <20060314142448.775AD4E1FA4@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:24:39 2006 New Revision: 4179 Log: new files added for profile Added: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (with props) vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl (with props) vtigercrm/trunk/Smarty/templates/EditProfile.tpl vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl vtigercrm/trunk/modules/Users/CreateProfile1.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:26:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:26:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4180 - /vtigercrm/trunk/modules/Users/CreateProfile.php Message-ID: <20060314142627.101874E2424@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:26:24 2006 New Revision: 4180 Log: new UI for profile has been integrated Modified: vtigercrm/trunk/modules/Users/CreateProfile.php Modified: vtigercrm/trunk/modules/Users/CreateProfile.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:32:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:32:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4181 - /vtigercrm/trunk/Smarty/templates/UserProfile.tpl Message-ID: <20060314143215.CDC264E26AC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:32:11 2006 New Revision: 4181 Log: issue in profile listview has been fixed Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Tue Mar 14 07:32:11 2006 @@ -40,7 +40,7 @@ Edit {/if}   - + {/section} @@ -50,6 +50,7 @@ +
    @@ -202,60 +202,6 @@

    - - - - -
    YOUR SHOUT!!!Minimize / Maximize
     
    -
    -
    {if $TAGCLOUD_JS ne ''} From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 08:14:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 13:14:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4176 - in /vtigercrm/trunk: ./ include/database/ install/ Message-ID: <20060314131420.33BC24C67EE@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 06:14:07 2006 New Revision: 4176 Log: Modifications made for multi-package support Added: vtigercrm/trunk/config.db.php vtigercrm/trunk/config.inc.php vtigercrm/trunk/config.template.php vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/include/database/PearDatabase.php vtigercrm/trunk/index.php (contents, props changed) vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Tue Mar 14 06:14:07 2006 @@ -701,9 +701,9 @@ global $dbconfig, $dbconfigoption; $this->disconnect(); $this->setDatabaseType($dbconfig['db_type']); - $this->setUserName($dbconfig['db_user_name']); + $this->setUserName($dbconfig['db_username']); $this->setUserPassword($dbconfig['db_password']); - $this->setDatabaseHost( $dbconfig['db_host_name']); + $this->setDatabaseHost( $dbconfig['db_hostname']); $this->setDatabaseName($dbconfig['db_name']); $this->dbOptions = $dbconfigoption; $this->enableSQLlog = ($dbconfig['log_sql'] == true); @@ -734,9 +734,9 @@ { $this->disconnect(); $this->setDatabaseType($dbconfig['db_type']); - $this->setUserName($dbconfig['db_user_name']); + $this->setUserName($dbconfig['db_username']); $this->setUserPassword($dbconfig['db_password']); - $this->setDatabaseHost( $dbconfig['db_host_name']); + $this->setDatabaseHost( $dbconfig['db_hostname']); $this->setDatabaseName($dbconfig['db_name']); $this->dbOptions = $dbconfigoption; if($dbconfig['log_sql']) Modified: vtigercrm/trunk/index.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 08:33:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 13:33:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4177 - /vtigercrm/trunk/install.php Message-ID: <20060314133320.ABB414DEECC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 06:33:12 2006 New Revision: 4177 Log: modified to use it when called from the command line Modified: vtigercrm/trunk/install.php (contents, props changed) Modified: vtigercrm/trunk/install.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 14 09:22:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 14 Mar 2006 14:22:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4178 - in /vtigercrm/trunk: Smarty/templates/UserProfile.tpl include/utils/utils.php modules/Users/profilePrivileges.php themes/blue/style.css Message-ID: <20060314142257.CF5194E1BE3@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 14 07:22:46 2006 New Revision: 4178 Log: new UI integrated for profiles Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl vtigercrm/trunk/include/utils/utils.php vtigercrm/trunk/modules/Users/profilePrivileges.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Tue Mar 14 07:22:46 2006 @@ -8,6 +8,7 @@ + - + {/section} @@ -50,7 +51,6 @@

    @@ -36,10 +37,10 @@
      {if $LIST_ENTRIES[entries].del_permission eq 'yes'} - Edit + Edit {/if}  {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    -
    Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Tue Mar 14 07:22:46 2006 @@ -1005,6 +1005,44 @@ $result = $adb->query($query); return $result; } + +//added by jeri + +function getProfile2FieldPermissionList($fld_module, $profileid) +{ + global $log; + $log->info("in getProfile2FieldList ".$fld_module. ' profile id is '.$profileid); + + global $adb; + $tabid = getTabid($fld_module); + + $query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid; + $result = $adb->query($query); + $return_data=array(); + for($i=0; $i<$adb->num_rows($result); $i++) + { + $return_data[]=array($adb->query_result($result,$i,"fieldlabel"),$adb->query_result($result,$i,"visible"),$adb->query_result($result,$i,"uitype"),$adb->query_result($result,$i,"visible"),$adb->query_result($result,$i,"fieldid")); + } + return $return_data; +} + +function getProfile2AllFieldList($mod_array,$profileid) +{ + global $log; + $log->info("in getProfile2AllFieldList profile id is " .$profileid); + + global $adb; + $profilelist=array(); + for($i=0;$iassign("PROFILEID", $profileId); -$xtpl->assign("PROFILE_NAME", $profileName); +$smarty->assign("PROFILEID", $profileId); +$smarty->assign("PROFILE_NAME", $profileName); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); //Initially setting the secondary selected tab -if(isset($_REQUEST['secmodule']) && $_REQUEST['secmodule'] != '') -{ - $secondaryModule=$_REQUEST['secmodule']; - $mode=$_REQUEST['mode']; - -} -else -{ - - $secondaryModule='global_priv'; - $mode='view'; - -} - -if($secondaryModule == 'global_priv') -{ - $xtpl->assign("GLOBAL_PRIV_CLASS", 'prvPrfSelectedTab'); - $xtpl->assign("TAB_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("STAND_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("UTIL_PRIV_CLASS", 'prvPrfUnSelectedTab'); - $xtpl->assign("FIELD_PRIV_CLASS", 'prvPrfUnSelectedTab'); - - if($mode == 'view') - { - $edit_save='Edit Privileges'; - $xtpl->assign("EDIT_SAVE", $edit_save); - - $global_per_arry = getProfileGlobalPermission($profileId); - $view_all_per = $global_per_arry[1]; - $edit_all_per = $global_per_arry[2]; - - $output .= '
    View All'.getGlobalDisplayValue($view_all_per,1).'
    Edit All'.getGlobalDisplayValue($edit_all_per,2).'
    View All'.getGlobalDisplayOutput($view_all_per,1).'
    Edit All'.getGlobalDisplayOutput($edit_all_per,2).'
    Create/EditDeleteView
    Entity
    '.$tab_create_per.''.$tab_delete_per.''.$tab_view_per.'
    '.$entity_name.'
    Create/EditDeleteView
    Entity
    '.$tab_create_per.''.$tab_delete_per.''.$tab_view_per.'
    '.$entity_name.'
    '.$tab_allow_per.'
    '.$entity_name.''.$tab_allow_per.'
    '.$tab_allow_per.'
    '.$entity_name.''.$tab_allow_per.'
    '.$entity_name.'
    '.$action_name.''.$tab_util_per.'
    '.$action_name.''.$tab_util_per.'
    '.$entity_name.'
    '.$action_name.''.$tab_util_per.'
    '.$action_name.''.$tab_util_per.'
    '.$mod_strings[$lang_str].'
    '.$mod_strings[$lang_str].'
    '.$fldLabel.''.$visible.'
    '.$fldLabel.''.$visible.'
    '.$mandatory.' '.$fldLabel.'
    '.$mandatory.' '.$fldLabel.'
    {$LIST_ENTRIES[entries].profilename}{$LIST_ENTRIES[entries].profilename} {$LIST_ENTRIES[entries].description} 
     
    - - - + + + + + From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 04:29:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:29:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4188 - in /vtigercrm/trunk/modules/Users: createnewgroup.php listgroups.php Message-ID: <20060315092941.52FF54E34FF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:29:34 2006 New Revision: 4188 Log: Groups list and edit view has been smartified Modified: vtigercrm/trunk/modules/Users/createnewgroup.php vtigercrm/trunk/modules/Users/listgroups.php Modified: vtigercrm/trunk/modules/Users/createnewgroup.php ============================================================================== --- vtigercrm/trunk/modules/Users/createnewgroup.php (original) +++ vtigercrm/trunk/modules/Users/createnewgroup.php Wed Mar 15 02:29:34 2006 @@ -14,21 +14,11 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -?> - - - - - - Role Details - - - - -$memberValue) + { + foreach($memberValue as $memberId) + { + if($memberType == 'groups') + { + $memberName=fetchGroupName($memberId); + $memberDisplay="Group::"; + } + elseif($memberType == 'roles') + { + $memberName=getRoleName($memberId); + $memberDisplay="Roles::"; + } + elseif($memberType == 'rs') + { + $memberName=getRoleName($memberId); + $memberDisplay="RoleAndSubordinates::"; + } + elseif($memberType == 'users') + { + $memberName=getUserName($memberId); + $memberDisplay="User::"; + } + $member[]=$memberType.'::'.$memberId; + $member[]=$memberDisplay.$memberName; + } + } + $smarty->assign("MEMBER", array_chunk($member,2)); +} +$smarty->assign("MOD", return_module_language($current_language,'Settings')); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); -?> +//for javascript +$smarty->assign("ROLEIDSTR",$roleIdStr); +$smarty->assign("ROLENAMESTR",$roleNameStr); +$smarty->assign("USERIDSTR",$userIdStr); +$smarty->assign("USERNAMESTR",$userNameStr); +$smarty->assign("GROUPIDSTR",$grpIdStr); +$smarty->assign("GROUPNAMESTR",$grpNameStr); - - -
    - - - - - - -
    - - - -
    Settings
    Groups > Add Group
    - -
    -
    - - - - -
    - - -
    Group Details
    +//echo $Err_msg; - - - - - - - - - - - - - +$smarty->assign("GROUPNAME",$groupInfo[0]); - - - - - - - - - - - - - -
    (Use A-Z, a-z, 1-9)
    - -
    Select Members
    		 -
    - - -     		- - - - - - -
    - - -
    - - -
    -     		- -
    -     		(Use CTRL to select multiple)
    Description
    +$smarty->assign("DESCRIPTION",$groupInfo[1]); - - - - - - -
    - - - -
    -
    - -
    - - +$smarty->display("GroupEditView.tpl"); +?> Modified: vtigercrm/trunk/modules/Users/listgroups.php ============================================================================== --- vtigercrm/trunk/modules/Users/listgroups.php (original) +++ vtigercrm/trunk/modules/Users/listgroups.php Wed Mar 15 02:29:34 2006 @@ -11,55 +11,36 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); -?> +require_once('include/utils/UserInfoUtil.php'); - - - - Roles List - - - - - -
    - -
    - - -    - -

    - - - - - - -$groupInfo) { - if ($cnt%2==0) - { - $output .= ""; - $output .= ""; - $output .= ""; + + $standCustFld = array(); + $standCustFld['groupid']= $groupId; + $standCustFld['groupname']= $groupInfo[0]; + $standCustFld['description']= $groupInfo[1]; + $return_data[]=$standCustFld; $cnt++; } - echo $output; + +$smarty->assign("LIST_HEADER",$list_header); +$smarty->assign("LIST_ENTRIES",$return_data); +$smarty->assign("PROFILES", $standCustFld); +$smarty->assign("IMAGE_PATH",$image_path); +$smarty->assign("APP", $app_strings); +$smarty->assign("CMOD", $mod_strings); +$smarty->assign("MOD", return_module_language($current_language,'Settings')); + +$smarty->display("ListGroup.tpl"); ?> - -
    "; - } - else - { - $output .= "
    "; - } - $output .=" edit | del ".$groupInfo[0]."".$groupInfo[1]."
    - - From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 04:30:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:30:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4189 - /vtigercrm/trunk/modules/Users/profilePrivileges.php Message-ID: <20060315093010.0488C4E3509@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 02:30:02 2006 New Revision: 4189 Log: Supported latest ui Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Wed Mar 15 02:30:02 2006 @@ -10,11 +10,13 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $profileId=$_REQUEST['profileid']; -$profileName=getProfileName($profileId); +$profileName=''; $parentProfileId=$_REQUEST['parentprofile']; if($_REQUEST['mode'] =='create' && $_REQUEST['radiobutton'] != 'baseprofile') $parentProfileId = ''; + + $smarty = new vtigerCRM_Smarty; $secondaryModule=''; @@ -22,13 +24,40 @@ $output =''; $output1 =''; $smarty->assign("PROFILEID", $profileId); -$smarty->assign("PROFILE_NAME", $profileName); $smarty->assign("MOD", return_module_language($current_language,'Settings')); $smarty->assign("APP", $app_strings); $smarty->assign("CMOD", $mod_strings); +if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '' && $_REQUEST['mode'] == 'create') +{ + $profileName=$_REQUEST['profile_name']; +} +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']); +if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '') + $smarty->assign("MODE",$_REQUEST['mode']); + + + + //Initially setting the secondary selected tab $mode=$_REQUEST['mode']; +if($mode == 'create') +{ + $smarty->assign("ACTION",'SaveProfile'); +} +elseif($mode == 'edit') +{ + $smarty->assign("ACTION",'UpdateProfileChanges'); +} + //Global Privileges From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 04:30:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:30:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4190 - in /vtigercrm/trunk/Smarty/templates: GroupEditView.tpl ListGroup.tpl Message-ID: <20060315093026.4A8E94E3516@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:30:19 2006 New Revision: 4190 Log: files added to integrate new UI for groups Added: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 04:34:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:34:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4191 - in /vtigercrm/trunk/modules/Users: SaveProfile.php UpdateProfileChanges.php Message-ID: <20060315093407.487AA4E351D@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 02:34:01 2006 New Revision: 4191 Log: Modified to support latest UI Modified: vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Wed Mar 15 02:34:01 2006 @@ -14,7 +14,6 @@ require_once('include/utils/utils.php'); global $adb; $profileid = $_REQUEST['profileid']; -$secmodule = $_REQUEST['secmodule']; //Retreiving the tabs permission array $tab_perr_result = $adb->query("select * from profile2tab where profileid=".$profileid); @@ -24,8 +23,6 @@ $num_act_per = $adb->num_rows($act_perr_result); $num_act_util_per = $adb->num_rows($act_utility_result); -if($secmodule=='global_priv') -{ //Updating profile2global permissons table $view_all_req=$_REQUEST['view_all']; $view_all = getPermissionValue($view_all_req); @@ -38,11 +35,8 @@ $update_query = "update profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid; $adb->query($update_query); - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=global_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='tab_priv') -{ + + //profile2tab permissions for($i=0; $i<$num_tab_per; $i++) { $tab_id = $adb->query_result($tab_perr_result,$i,"tabid"); @@ -67,12 +61,8 @@ } } } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=tab_priv&mode=view&profileid=".$profileid; - header($loc); - -} -elseif($secmodule=='stand_priv') -{ + + //profile2standard permissions for($i=0; $i<$num_act_per; $i++) { $tab_id = $adb->query_result($act_perr_result,$i,"tabid"); @@ -116,11 +106,8 @@ } } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=stand_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='util_priv') -{ + + //Update Profile 2 utility for($i=0; $i<$num_act_util_per; $i++) { $tab_id = $adb->query_result($act_utility_result,$i,"tabid"); @@ -146,12 +133,29 @@ } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=util_priv&mode=view&profileid=".$profileid; - header($loc); -} -elseif($secmodule=='field_priv') + + + + $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); + +foreach($modArr as $fld_module => $fld_label) { - $fld_module = $_REQUEST['fld_module']; $fieldListResult = getProfile2FieldList($fld_module, $profileid); $noofrows = $adb->num_rows($fieldListResult); $tab_id = getTabid($fld_module); @@ -178,18 +182,10 @@ $adb->query($update_query); } - $loc = "Location: index.php?action=profilePrivileges&module=Users&secmodule=field_priv&mode=view&fld_module=".$fld_module."&profileid=".$profileid; +} + $loc = "Location: index.php?action=profilePrivileges&module=Users&mode=view&profileid=".$profileid; header($loc); -} -/* -//Updating the profile2tab table - -//Updating the profile2standardpermissions table - - -//Updating the profile2utility table - -*/ + function getPermissionValue($req_per) { if($req_per == 'on') @@ -202,8 +198,5 @@ } return $permission_value; } -/* -$loc = "Location: index.php?action=ProfileDetailView&module=Users&fld_module=".$fld_module."&profileid=".$profileid; -header($loc); -*/ + ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 04:38:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 09:38:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4192 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060315093803.B12F04E3529@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 02:37:59 2006 New Revision: 4192 Log: entry for info_type of field table has been included Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Wed Mar 15 02:37:59 2006 @@ -269,7 +269,7 @@ if(is_numeric($blockid)) { - $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0)"; + $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 05:07:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 10:07:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4193 - in /vtigercrm/trunk/Smarty/templates: GroupEditView.tpl ListGroup.tpl Message-ID: <20060315100748.2897B4E3568@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 03:07:33 2006 New Revision: 4193 Log: issue in group has been fixed Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl vtigercrm/trunk/Smarty/templates/ListGroup.tpl Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Mar 15 03:07:33 2006 @@ -120,6 +120,7 @@ + - + {/section} From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 05:53:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 10:53:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4194 - in /vtigercrm/trunk/pkg/bin: startvTiger.bat startvTiger.sh stopvTiger.bat uninstallvtiger.sh Message-ID: <20060315105310.AC6894E35C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 03:53:04 2006 New Revision: 4194 Log: changes made for 5 beta Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat vtigercrm/trunk/pkg/bin/startvTiger.sh vtigercrm/trunk/pkg/bin/stopvTiger.bat vtigercrm/trunk/pkg/bin/uninstallvtiger.sh Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Wed Mar 15 03:53:04 2006 @@ -43,18 +43,18 @@ echo "" echo "making an attempt to kill any existing vtigercrm service" echo "" -bin\apache -k stop -n vtigercrm5_alpha -bin\apache -k uninstall -n vtigercrm5_alpha +bin\apache -k stop -n vtigercrm5_beta +bin\apache -k uninstall -n vtigercrm5_beta echo "" echo "" -echo "installing vtigercrm5_alpha apache service" +echo "installing vtigercrm5_beta apache service" echo "" echo "" -bin\apache -k install -n vtigercrm5_alpha -f conf\httpd.conf +bin\apache -k install -n vtigercrm5_beta -f conf\httpd.conf echo "" -echo "Starting vtigercrm5_alpha apache service" +echo "Starting vtigercrm5_beta apache service" echo "" -bin\apache -n vtigercrm5_alpha -k start +bin\apache -n vtigercrm5_beta -k start IF ERRORLEVEL 1 goto stopservice goto checkmysql @@ -112,27 +112,27 @@ :checkdatabase echo "" -echo "check to see if vtigercrm5_alpha database already exists" +echo "check to see if vtigercrm5_beta database already exists" echo "" -mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_alpha'" | "%WINDIR%\system32\find.exe" "vtigercrm5_alpha" > NUL +mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases like 'vtigercrm5_beta'" | "%WINDIR%\system32\find.exe" "vtigercrm5_beta" > NUL IF ERRORLEVEL 1 goto dbnotexists echo "" -ECHO "vtigercrm5_alpha database exists" +ECHO "vtigercrm5_beta database exists" echo "" goto end :dbnotexists echo "" -ECHO "vtigercrm5_alpha database does not exist" +ECHO "vtigercrm5_beta database does not exist" echo "" echo %cd% echo "" -echo "Proceeding to create database vtigercrm5_alpha and populate the same" +echo "Proceeding to create database vtigercrm5_beta and populate the same" echo "" -mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_alpha" +mysql --user=%mysql_username% --password=%mysql_password% --port=%mysql_port% -e "create database if not exists vtigercrm5_beta" echo "" -echo "vtigercrm5_alpha database created" +echo "vtigercrm5_beta 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 Wed Mar 15 03:53:04 2006 @@ -111,20 +111,20 @@ fi echo "" -echo "Checking if the vtigercrm5_alpha database already exists" +echo "Checking if the vtigercrm5_beta database already exists" echo "" -echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_alpha >/dev/null +echo "select 1" | ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -D vtigercrm5_beta >/dev/null if [ $? -ne 0 ]; then echo "" - echo "Database vtigercrm5_alpha does not exist. Creating database vtigercrm5_alpha" + echo "Database vtigercrm5_beta does not exist. Creating database vtigercrm5_beta" echo "" - ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_alpha" + ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket -e "create database if not exists vtigercrm5_beta" fi host=`hostname` echo "*****************************************************************************************************" if [ $apache_bundled == 'false' ];then - echo "Please access the product at http://${host}:/vtigerCRM5_alpha1/vtigerCRM" + echo "Please access the product at http://${host}:/vtigerCRM5_beta/vtigerCRM" else echo "Please access the product at http://${host}:" echo "*****************************************************************************************************" Modified: vtigercrm/trunk/pkg/bin/stopvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/stopvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/stopvTiger.bat Wed Mar 15 03:53:04 2006 @@ -32,11 +32,11 @@ cd /d %apache_dir% rem shut down apache echo "" -echo "stopping vtigercrm4_5 apache service" +echo "stopping vtigercrm5_beta apache service" echo "" bin\apache -n vtigercrm4_5 -k stop echo "" -echo "uninstalling vtigercrm4_5 apache service" +echo "uninstalling vtigercrm5_beta apache service" echo "" bin\apache -k uninstall -n vtigercrm4_5 rem .\bin\ShutdownApache.exe logs\httpd.pid Modified: vtigercrm/trunk/pkg/bin/uninstallvtiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/uninstallvtiger.sh (original) +++ vtigercrm/trunk/pkg/bin/uninstallvtiger.sh Wed Mar 15 03:53:04 2006 @@ -17,42 +17,42 @@ cd ${PREV_DIR} if [ ${APACHE_STATUS} == "false" ] then - diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5_alpha1/httpd.conf > /dev/null; + diff conf/httpd.conf conf/vtiger_conf/vtigerCRM5_beta/httpd.conf > /dev/null; if [ $? -eq 0 ] then - cp conf/vtigerCRMBackup/vtigerCRM5_alpha1/httpd.vtiger.crm.conf conf/httpd.conf + cp conf/vtigerCRMBackup/vtigerCRM5_beta/httpd.vtiger.crm.conf conf/httpd.conf echo "The httpd.conf file successfully reverted" else - echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5_alpha1/httpd.vtiger.crm.conf. Kindly revert the same manually" + echo "The httpd.conf file under apache/conf has been edited since installation. Hence the uninstallation will not revert the httpd.conf file. The original httpd.conf file is present in /conf/vtigerCRMBackup/vtigerCRM5_beta/httpd.vtiger.crm.conf. Kindly revert the same manually" fi - diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5_alpha1/libphp4.so > /dev/null; + diff modules/libphp4.so modules/vtiger_modules/vtigerCRM5_beta/libphp4.so > /dev/null; if [ $? -eq 0 ] then - cp modules/vtigerCRMBackup/vtigerCRM5_alpha1/libphp4.vtiger.crm.so modules/libphp4.so + cp modules/vtigerCRMBackup/vtigerCRM5_beta/libphp4.vtiger.crm.so modules/libphp4.so echo "The libphp4.so file successfully reverted" else - echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5_alpha1/libphp4.vtiger.crm.so. Kindly revert the same manually" + echo "The libphp4.so file under apache/modules has been edited since installation. Hence the uninstallation will not revert the libphp4.so file. The original libphp4.so file is present in /modules/vtigerCRMBackup/vtigerCRM5_beta/libphp4.vtiger.crm.so. Kindly revert the same manually" fi cd - - if [ -d $PWD/vtigerCRM5_alpha1 ]; then + if [ -d $PWD/vtigerCRM5_beta ]; then echo "Uninstalling vtigerCRM from the system..." - rm -rf ../conf/vtiger_conf/vtigerCRM5_alpha1 - rm -rf ../modules/vtiger_modules/vtigerCRM5_alpha1 - rm -rf vtigerCRM5_alpha1 + rm -rf ../conf/vtiger_conf/vtigerCRM5_beta + rm -rf ../modules/vtiger_modules/vtigerCRM5_beta + rm -rf vtigerCRM5_beta echo "Uninstallation of vtigerCRM completed" cd ${HOME} fi else cd - - if [ -d $PWD/vtigerCRM5_alpha1 ]; then + if [ -d $PWD/vtigerCRM5_beta ]; then echo "Uninstalling vtigerCRM from the system..." - rm -rf ../conf/vtiger_conf/vtigerCRM5_alpha1 - rm -rf ../modules/vtiger_modules/vtigerCRM5_alpha1 - rm -rf vtigerCRM5_alpha1 + rm -rf ../conf/vtiger_conf/vtigerCRM5_beta + rm -rf ../modules/vtiger_modules/vtigerCRM5_beta + rm -rf vtigerCRM5_beta echo "Uninstallation of vtigerCRM completed" cd ${HOME} fi From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 06:26:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:26:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4195 - in /vtigercrm/trunk/adodb/drivers: adodb-odbc_db2.inc.php adodb-pdo_mssql.inc.php adodb-pdo_mysql.inc.php adodb-pdo_oci.inc.php adodb-pdo_pgsql.inc.php adodb-postgres8.inc.php adodb-sybase_ase.inc.php Message-ID: <20060315112610.628BD4E3612@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:26:01 2006 New Revision: 4195 Log: added for multiple database support Added: vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 06:29:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:29:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4196 - in /vtigercrm/trunk/adodb/lang: adodb-da.inc.php adodb-esperanto.inc.php adodb-uk1251.inc.php Message-ID: <20060315112923.355894E3612@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:29:17 2006 New Revision: 4196 Log: added to support few more languages Added: vtigercrm/trunk/adodb/lang/adodb-da.inc.php vtigercrm/trunk/adodb/lang/adodb-esperanto.inc.php vtigercrm/trunk/adodb/lang/adodb-uk1251.inc.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 06:31:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 11:31:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4197 - /vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php Message-ID: <20060315113104.BFD474E3620@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 04:31:00 2006 New Revision: 4197 Log: added for encrypt Added: vtigercrm/trunk/adodb/session/adodb-encrypt-sha1.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 08:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 13:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4198 - /vtigercrm/trunk/modules/Users/DeleteUser.php Message-ID: <20060315131019.CED684E36EB@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 06:10:14 2006 New Revision: 4198 Log: done handling for roles and groups during use delete Modified: vtigercrm/trunk/modules/Users/DeleteUser.php Modified: vtigercrm/trunk/modules/Users/DeleteUser.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 08:34:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 13:34:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4199 - in /vtigercrm/trunk: Smarty/templates/GroupDetailview.tpl modules/Users/GroupDetailView.php Message-ID: <20060315133418.3FA3A4E3717@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 06:34:10 2006 New Revision: 4199 Log: files added to integrate new UI for groups Added: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl vtigercrm/trunk/modules/Users/GroupDetailView.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 09:38:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 14:38:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4200 - in /vtigercrm/trunk/schema: ./ DatabaseSchema.xml Message-ID: <20060315143856.20D0C4E3750@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 07:38:51 2006 New Revision: 4200 Log: new folder Added: vtigercrm/trunk/schema/ vtigercrm/trunk/schema/DatabaseSchema.xml From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 09:50:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 14:50:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4201 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060315145006.08E094E37B5@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 07:50:01 2006 New Revision: 4201 Log: query changed to state rolename instead of role in the select query Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 15 07:50:01 2006 @@ -190,7 +190,7 @@ } // insert values into user2role table - $role_query = "select roleid from role where name='administrator'"; + $role_query = "select roleid from role where rolename='administrator'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); @@ -285,7 +285,7 @@ //$sql_stmt1 = "insert into user2role values(1,1)"; //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); -$role_query = "select roleid from role where name='standard_user'"; +$role_query = "select roleid from role where rolename='standard_user'"; $db->database->SetFetchMode(ADODB_FETCH_ASSOC); $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:05:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:05:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4202 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060315150522.7705D4E37E0@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:05:17 2006 New Revision: 4202 Log: Added new label for Email Templates Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:12:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:12:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4203 - /vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Message-ID: <20060315151217.5082F4E37EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:12:12 2006 New Revision: 4203 Log: Added tpl file for Email Templates List View for New UI & smartification Added: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:12:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:12:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4204 - /vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Message-ID: <20060315151257.C3A8D4E37EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:12:53 2006 New Revision: 4204 Log: Added tpl file for Email Templates Detail View for New UI & smartification Added: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:17:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:17:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4205 - in /vtigercrm/trunk/modules: MessageBoard/ squirrelmail-1.4.4/ Message-ID: <20060315151707.B835E4E37FD@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:17:03 2006 New Revision: 4205 Log: MessageBoard and squirrelmail folders removed Removed: vtigercrm/trunk/modules/MessageBoard/ vtigercrm/trunk/modules/squirrelmail-1.4.4/ From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:17:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:17:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4206 - /vtigercrm/trunk/modules/Users/deleteemailtemplate.php Message-ID: <20060315151740.B5B1C4E37FD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:17:36 2006 New Revision: 4206 Log: Added idlist & id_array for new delete button functionality in ListView Email Templates tpl Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:26:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:26:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4207 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060315152611.376AF4E3818@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:26:07 2006 New Revision: 4207 Log: Smartification of ListView Email Templates done with modifications in the corr php file Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Wed Mar 15 08:26:07 2006 @@ -10,52 +10,49 @@ * ********************************************************************************/ +require_once('Smarty_setup.php'); require_once('include/database/PearDatabase.php'); -?> - - - -Roles List - - - - - - - - -
    - -
    -
    -

    Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Wed Mar 15 03:07:33 2006 @@ -38,9 +38,9 @@
      - Edit + Edit  {$LIST_ENTRIES[entries].groupname}{$LIST_ENTRIES[entries].groupname} {$LIST_ENTRIES[entries].description} 
    - - - - - query($sql); $temprow = $adb->fetch_array($result); + //echo '
    '; print_r($temprow); echo '
    '; + + $edit="Edit "; $del="Del "; $bar=" | "; $cnt=1; require_once('include/utils/UserInfoUtil.php'); +global $app_strings; +global $app_list_strings; +global $mod_strings; +global $theme; +$theme_path="themes/".$theme."/"; +$image_path=$theme_path."images/"; + + +$smarty = new vtigerCRM_Smarty; +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); +$smarty->assign("IMAGE_PATH", $image_path); + +$return_data=array(); do { - $name=$temprow["name"]; - if ($cnt%2==0) - printf("",$temprow["templatename"]); - printf("",$temprow["description"]); + $templatearray=array(); + $templatearray['templatename'] = $temprow["templatename"]; + $templatearray['templateid'] = $temprow["templateid"]; + $templatearray['description'] = $temprow["description"]; + $templatearray['foldername'] = $temprow["foldername"]; + $return_data[]=$templatearray; $cnt++; }while($temprow = $adb->fetch_array($result)); +$smarty->assign("TEMPLATES",$return_data); +$smarty->display("ListEmailTemplates.tpl"); + ?> -
    "); - else - printf("
    "); - $templatename = $temprow["templatename"]; - printf("%s%s
    - - From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:27:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:27:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4208 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060315152752.447D24E3810@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:27:48 2006 New Revision: 4208 Log: Smartification of DetailView Email Templates done with modifications in the corr php file Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Wed Mar 15 08:27:48 2006 @@ -8,7 +8,7 @@ * All Rights Reserved. * ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); @@ -16,14 +16,21 @@ global $mod_strings; global $app_strings; global $app_list_strings; +global $current_language; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Users/detailviewemailtemplate.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->assign("THEME", $theme); + +$smarty = new vtigerCRM_smarty; + +$smarty->assign("APP", $app_strings); +$smarty->assign("THEME", $theme); +$smarty->assign("UMOD", $mod_strings); +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); +$smarty->assign("IMAGE_PATH", $image_path); if(isset($_REQUEST['templateid']) && $_REQUEST['templateid']!='') { @@ -47,18 +54,16 @@ // $emailtemplateResult = $adb->fetch_array($result); } -$xtpl->assign("FOLDERNAME", $emailtemplateResult["foldername"]); +$smarty->assign("FOLDERNAME", $emailtemplateResult["foldername"]); -$xtpl->assign("TEMPLATENAME", $emailtemplateResult["templatename"]); -$xtpl->assign("DESCRIPTION", $emailtemplateResult["description"]); -$xtpl->assign("TEMPLATEID", $emailtemplateResult["templateid"]); +$smarty->assign("TEMPLATENAME", $emailtemplateResult["templatename"]); +$smarty->assign("DESCRIPTION", $emailtemplateResult["description"]); +$smarty->assign("TEMPLATEID", $emailtemplateResult["templateid"]); -$xtpl->assign("SUBJECT", $emailtemplateResult["subject"]); -$xtpl->assign("BODY", nl2br($emailtemplateResult["body"])); +$smarty->assign("SUBJECT", $emailtemplateResult["subject"]); +$smarty->assign("BODY", nl2br($emailtemplateResult["body"])); -$xtpl->parse("main"); -$xtpl->out("main"); - +$smarty->display("DetailViewEmailTemplate.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:29:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:29:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4209 - in /vtigercrm/trunk: Smarty/templates/RoleEditView.tpl modules/Users/createrole.php Message-ID: <20060315152916.B2B1F4E381C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:29:09 2006 New Revision: 4209 Log: new files added for implementing the new UI for role Added: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl vtigercrm/trunk/modules/Users/createrole.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:33:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:33:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4210 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060315153325.297AD4E382B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:33:21 2006 New Revision: 4210 Log: Style changes done to reflect corr changes for new UI of email templates Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Wed Mar 15 08:33:21 2006 @@ -858,8 +858,9 @@ font-size:11px; text-align:left; width:100%; - border-left:1px solid #CCCCCC; + border-left:0px solid #CCCCCC; border-right:0px solid #CCCCCC; + border-collapse: collapse; } .prdTab tr th{ @@ -867,6 +868,7 @@ font-size:11px; text-align:left; border-right:1px solid #CCCCCC; + border-left:1px solid #CCCCCC; padding-left:5px; background-color:#E5E5E5; height:20px; @@ -881,6 +883,7 @@ 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; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:40:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:40:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4211 - /vtigercrm/trunk/themes/blue/images/private.gif Message-ID: <20060315154048.27DAC4E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:40:43 2006 New Revision: 4211 Log: Added private.gif Added: vtigercrm/trunk/themes/blue/images/private.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:41:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:41:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4212 - /vtigercrm/trunk/themes/blue/images/public.gif Message-ID: <20060315154134.4C3614E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:41:29 2006 New Revision: 4212 Log: Added public.gif image for email templates ui Added: vtigercrm/trunk/themes/blue/images/public.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:42:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:42:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4213 - /vtigercrm/trunk/themes/blue/images/ViewTemplate.gif Message-ID: <20060315154220.37BC94E3841@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 08:42:15 2006 New Revision: 4213 Log: Added image for Detail view email templates ui Added: vtigercrm/trunk/themes/blue/images/ViewTemplate.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:44:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:44:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4214 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060315154441.B4DF24E3841@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:44:37 2006 New Revision: 4214 Log: query fixed for insert with addition of quotes Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 15 08:44:37 2006 @@ -195,7 +195,7 @@ $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); - $sql_stmt1 = "insert into user2role values(".$user->id.",".$role_id.")"; + $sql_stmt1 = "insert into user2role values(".$user->id.",'".$role_id."')"; $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); } @@ -229,8 +229,8 @@ // TODO HTML if($success==0) die("Error: Tables not created. Table creation failed.\n"); -elseif ($success==1) - die("Error: Tables partially created. Table creation failed.\n"); +//elseif ($success==1) +// die("Error: Tables partially created. Table creation failed.\n"); else eecho("Tables Successfully created.\n"); @@ -290,7 +290,7 @@ $role_result = $db->query($role_query); $role_id = $db->query_result($role_result,0,"roleid"); -$sql_stmt2 = "insert into user2role values(".$uid.",".$role_id.")"; +$sql_stmt2 = "insert into user2role values(".$uid.",'".$role_id."')"; $db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); // create and populate combo tables From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 10:45:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 15:45:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4215 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060315154541.387274E3853@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 08:45:37 2006 New Revision: 4215 Log: mysql version check temporarily disabled Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 13:48:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 15 Mar 2006 18:48:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4216 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060315184840.7C47B4E39BF@vtiger.fosslabs.com> Author: don Date: Wed Mar 15 11:48:33 2006 New Revision: 4216 Log: Handling for Groups and SharingRules when deleting roles is done Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Mar 15 11:48:33 2006 @@ -2276,25 +2276,77 @@ */ function deleteRole($roleId,$transferRoleId) { - global $adb; - $roleInfo=getRoleAndSubordinatesInformation($roleId); - foreach($roleInfo as $roleid=>$roleDetArr) - { - - $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'"; - $adb->query($sql1); - - //Deleteing from role2profile table - $sql2 = "delete from role2profile where roleid='".$roleid."'"; - $adb->query($sql2); - - //delete from role table; - $sql9 = "delete from role where roleid='".$roleid."'"; - $adb->query($sql9); - //echo $sql1.' '.$sql2.' '.$sql9; - } - -} + global $adb; + $roleInfo=getRoleAndSubordinatesInformation($roleId); + foreach($roleInfo as $roleid=>$roleDetArr) + { + + $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'"; + $adb->query($sql1); + + //Deleteing from role2profile table + $sql2 = "delete from role2profile where roleid='".$roleid."'"; + $adb->query($sql2); + + //delete handling for groups + $sql10 = "delete from group2role where roleid='".$roleid."'"; + $adb->query($sql10); + + $sql11 = "delete from group2rs where roleandsubid='".$roleid."'"; + $adb->query($sql11); + + + //delete handling for sharing rules + deleteRoleRelatedSharingRules($roleid); + + //delete from role table; + $sql9 = "delete from role where roleid='".$roleid."'"; + $adb->query($sql9); + //echo $sql1.' '.$sql2.' '.$sql9; + + + + } + +} + +/** Function to delete the role related sharing rules + * @param $roleid -- RoleId :: Type varchar + */ +function deleteRoleRelatedSharingRules($roleId) +{ + global $adb; + $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid', + 'datashare_grp2rs'=>'to_roleandsubid', + 'datashare_role2group'=>'share_roleid', + 'datashare_role2role'=>'share_roleid::to_roleid', + 'datashare_role2rs'=>'share_roleid::to_roleandsubid', + 'datashare_rs2grp'=>'share_roleandsubid', + 'datashare_rs2role'=>'share_roleandsubid::to_roleid', + 'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid'); + + foreach($dataShareTableColArr as $tablename=>$colname) + { + $colNameArr=explode('::',$colname); + $query="select shareid from ".$tablename." where ".$colNameArr[0]."='".$roleId."'"; + if(sizeof($colNameArr) >1) + { + $query .=" or ".$colNameArr[1]."='".$roleId."'"; + } + + + $result=$adb->query($query); + $num_rows=$adb->num_rows($result); + for($i=0;$i<$num_rows;$i++) + { + $shareid=$adb->query_result($result,$i,'shareid'); + deleteSharingRule($shareid); + } + + } +} + + /** Function to get userid and username of all users * @returns $userArray -- User Array in the following format: From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:18:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4217 - /vtigercrm/trunk/install/0welcome.php Message-ID: <20060316041831.231614E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:26 2006 New Revision: 4217 Log: Message changed a bit Modified: vtigercrm/trunk/install/0welcome.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:18:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4218 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060316041843.B57154E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:39 2006 New Revision: 4218 Log: Squirrelmail check removed Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 15 23:18:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 04:18:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4219 - /vtigercrm/trunk/install/3confirmConfig.php Message-ID: <20060316041855.20C6B4E419A@vtiger.fosslabs.com> Author: richie Date: Wed Mar 15 21:18:51 2006 New Revision: 4219 Log: Drop tables check removed Modified: vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:04:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:04:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4220 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl SettingsSubMenu.tpl Message-ID: <20060316060437.8FBBA4E4211@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:04:31 2006 New Revision: 4220 Log: field accessibility removed and icon for email templated has been added Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Wed Mar 15 23:04:31 2006 @@ -42,9 +42,7 @@
    		{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}
    -{$MOD.LBL_FIELD_ACCESSIBILITY}    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    +    		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		  
    -
    {$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    +    		{$MOD.LBL_CREATE_EMAIL_TEMPLATES}
    {$MOD.EMAILTEMPLATES}    		 {$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}
    Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed Mar 15 23:04:31 2006 @@ -14,39 +14,42 @@
    +
    -
    {$MOD.LBL_STUDIO}
    + +
    {$MOD.LBL_COMMUNICATION_TEMPLATES}
    +
    - Modified: vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl Wed Mar 15 23:04:31 2006 @@ -4,8 +4,7 @@ position:absolute; width:155px; background-color:#FFFFFF; - /*opacity:.7; -filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ + filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ border-top:1px solid #CCCCCC; border-left:1px solid #CCCCCC; border-right:2px solid #CCCCCC; @@ -25,7 +24,6 @@ width:140px; height:15px; padding:2px; - /*border-bottom:1px solid #999999;*/ {rdelim} a.mnuSub:Hover @@ -36,13 +34,11 @@ text-align:left; background-color:#E9DCE9; opacity:.7; - /*filter: progid:DXImageTransform.Microsoft.BasicImage(opacity=.7);*/ color:#000000; display:block; width:142px; height:15px; padding:2px; - /*border-bottom:1px solid #999999;*/ {rdelim}
    @@ -68,28 +64,6 @@
    -
    @@ -109,6 +83,7 @@
    +
    + @@ -124,14 +336,14 @@ - - - + @@ -159,215 +371,215 @@ - - - - - - - + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + @@ -393,143 +605,143 @@
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:44:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:44:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4221 - /vtigercrm/trunk/modules/Calendar/CalendarCommon.php Message-ID: <20060316064406.A1B6B4E42C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:44:01 2006 New Revision: 4221 Log: functions getSharedUserId(),getSharedCalendarId(),getSharedUserListViewHeader() and getSharedUserListViewEntries() have been defined Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Wed Mar 15 23:44:01 2006 @@ -11,6 +11,7 @@ //Code Added by Minnie -Starts include_once $calpath .'webelements.p3'; include_once $calpath .'permission.p3'; + require_once('include/database/PearDatabase.php'); require_once('modules/Calendar/preference.pinc'); global $calpath,$callink; @@ -21,21 +22,22 @@ $callink = 'index.php?module=Calendar&action='; /** - * Function to get the calendar header tabs + * Create HTML to display calendar header tabs * @param $t -- date :: Type string * @param $view -- view name(day/week/month) :: Type string - * takes date & view name as inputs and construct calendar header tabs - * in html table format and returns the html table in string format. + * Returns the html in string format. */ function getHeaderTab($t,$view) { - $day_selected = $week_selected = $month_selected = "dvtUnSelectedCell"; + $day_selected = $week_selected = $month_selected = $shared_selected = "dvtUnSelectedCell"; if($view == 'day') $day_selected="dvtSelectedCell"; if($view == 'week') $week_selected="dvtSelectedCell"; if($view == 'month') $month_selected="dvtSelectedCell"; + if($view == 'shared') + $shared_selected = "dvtSelectedCell"; $space_class = "dvtTabCache"; $tabhtml = ""; $tabhtml .= << - + @@ -54,6 +56,8 @@ + + @@ -71,7 +75,7 @@ } /** - * Function to get the calendar heading + * Create HTML to display calendar heading for each view * @params $prev,$next,$day_from,$day_to -- date :: Type string * @param $pref -- Object of preference class * @param $view -- view name(day/week/month) :: Type string @@ -80,8 +84,7 @@ * @param $f -- string :: Type string * @param $n -- Numeric representation of a month, without leading zeros :: Type string * $param $d -- Day of the month, 2 digits with leading zeros :: Type string - * constructs calendar heading in html table format - * and returns the html table in string format. + * Returns the html in string format. */ function getCalendarHeader($prev,$next,$view,$day_from,$pref="",$day_to="",$month="",$year="",$d="",$f="",$n="") { @@ -135,5 +138,74 @@ return $headerhtml; } + +/** + * Function to get the lists of sharedids related in calendar sharing of an user + * This function accepts the user id as arguments and + * returns the shared ids related with the user id + * as an array + */ +function getSharedUserId($id) +{ + global $adb; + $query = "SELECT * from sharedcalendar where userid=".$id; + $result = $adb->query($query); + $rows = $adb->num_rows($result); + for($j=0;$j<$rows;$j++) + { + $sharedid[] = $adb->query_result($result,$j,'sharedid'); + } + return $sharedid; +} + +/** + * Function to get the lists of user ids who shared their calendar with an user + * This function accepts the shared id as arguments and + * returns the user ids related with the shared id + * as a comma seperated string + */ +function getSharedCalendarId($sharedid) +{ + global $adb; + $query = "SELECT * from sharedcalendar where sharedid=".$sharedid; + $result = $adb->query($query); + if($adb->num_rows($result)!=0) + { + for($j=0;$j<$adb->num_rows($result);$j++) + $userid[] = $adb->query_result($result,$j,'userid'); + $shared_ids = implode (",",$userid); + } + return $shared_ids; +} + +/** + * Function to get the label for user lists + * Returns the label as an array + */ +function getSharedUserListViewHeader() +{ + global $mod_strings; + $header_label=array($mod_strings['LBL_LIST_NAME'], + $mod_strings['LBL_LIST_USER_NAME'], + ); + return $header_label; +} + +/** + * Function to get the entries for user lists + * This function accepts the shared id as arguments and + * returns the user entries related with the shared id + * as an array + */ +function getSharedUserListViewEntries($sharedid) +{ + global $adb; + $query = "SELECT * from users where id=".$sharedid; + $result =$adb->query($query); + $entries[]=$adb->query_result($result,0,'first_name').' '.$adb->query_result($result,0,'last_name'); + $entries[]=''.$adb->query_result($result,0,'user_name').''; + return $entries; + +} //Code Added by Minnie -Ends ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:48:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:48:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4222 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060316064810.74A164E42D5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:48:05 2006 New Revision: 4222 Log: file calendar_share.php has been included for calendar share option Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Wed Mar 15 23:48:05 2006 @@ -10,15 +10,7 @@ - - - From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:52:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:52:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4223 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060316065215.09FA74E42E1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:52:11 2006 New Revision: 4223 Log: labels related to calendar sharing have been included Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php 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 Wed Mar 15 23:52:11 2006 @@ -28,6 +28,12 @@ 'LBL_CONTACT'=>'Contact:', 'LBL_SAVE'=>'Save', 'LBL_RESET'=>'Cancel', +'LBL_LIST_USER_NAME'=>'User Name', +'LBL_LIST_NAME'=>'Name', +'LBL_CALENDAR_SHARED'=>'Calendar currently shared with', +'LBL_CALENDAR_SHARING'=>'Share calendar with', +'LBL_SHARING_OPTION'=>'Can see my calendar?', +'LBL_LIST_TOOLS'=>'Tools', 'LBL_CALL' => 'Call', 'LBL_MEET' => 'Meeting', From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 01:57:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 06:57:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4224 - /vtigercrm/trunk/index.php Message-ID: <20060316065745.1D5704E42EF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 15 23:57:41 2006 New Revision: 4224 Log: actions updateCalendarSharing and disable_sharing have been added in regular expression match statement Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Wed Mar 15 23:57:41 2006 @@ -402,7 +402,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action)) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:31:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:31:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4225 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060316073136.58DF24E4340@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:31:30 2006 New Revision: 4225 Log: query has been modified to share calendar and unwanted code has been removed Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Thu Mar 16 00:31:30 2006 @@ -29,7 +29,7 @@ include_once 'modules/Calendar/base.pinc'; require_once('include/database/PearDatabase.php'); - //require_once('modules/Calls/Call.php'); + require_once('modules/Calendar/CalendarCommon.php'); /** * options for calendar selection @@ -1890,10 +1890,7 @@ { global $msg,$current_user,$table,$db; - //if ( ! $current_user->feature_ok(usecalendar,PERM_SEE) ) { - // return; - //} - + $shared_ids = getSharedCalendarId($current_user->id,'shared'); $from->setDateTime($from->getYYYYMMDD()); $to->setDateTime($to->getYYYYMMDD()); @@ -1902,10 +1899,6 @@ $to->addDays(1); } - /* - $x1 = DateTime1($from); - $x2 = DateTime1($to); - */ $x1 = sprintf ("%04d-%02d-%02d %02d:%02d:%02d",$from->year,$from->month,$from->day,$from->hour,$from->min,$from->sec); $x2 = sprintf ("%04d-%02d-%02d %02d:%02d:%02d",$to->year,$to->month,$to->day,$to->hour,$to->min,$to->sec); @@ -1944,32 +1937,26 @@ if(!is_admin($current_user)) { - $q .= " ) AND (crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') "; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0)"; $q .= " ORDER by activity.date_start,activity.time_start"; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); $result = $this->db->fetchByAssoc($r); - //print_r($result); - //$o->read_result($r,$a); $o->read_result($result); $a++; if ( $o->see_ok() ) { /* Get all participants */ - //$o->read_participants(); - //print("GS --> see"); $obj->callist[$o->record_id] = &$o; } unset($o); } - // // Query created by Jaguar # @@ -1986,38 +1973,29 @@ $q .= " (recurringdate < '". $sx2 ."' AND recurringdate >= '". $sx1 . "') "; if(!is_admin($current_user)) { - $q .= " ) AND (crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) "; + $q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in ($shared_ids) and salesmanactivityrel.smid in ($shared_ids) and activity.visibility='Public'))"; } $q .= " AND crmentity.deleted = 0 )" ; $q .= " ORDER by recurringid"; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("
    GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); $result = $this->db->fetchByAssoc($r); - //print_r($result); - //$o->read_result($r,$a); $o->read_result($result); $a++; if ( $o->see_ok() ) { /* Get all participants */ - //$o->read_participants(); - //print("GS --> see"); $obj->callist[$o->record_id] = &$o; } unset($o); } - // - // Query created by Jagaur # query ( Get Group activities in the calendar ) # - //if(!is_admin($current_user)) - //{ $q=" Select activity.*,crmentity.*,account.accountname,account.accountid,activitygrouprelation.groupname FROM "; $q.=" activity inner join crmentity on activity.activityid = crmentity.crmid "; $q.=" inner join activitygrouprelation on activitygrouprelation.activityid=activity.activityid"; @@ -2036,11 +2014,9 @@ $q .= " and crmentity.smownerid=0 and users2group.userid=".$current_user->id; $q .= " ORDER by activity.date_start,activity.time_start"; - //echo $q; $r = $this->db->query($q); $n = $this->db->getRowCount($r); $a = 0; - // print("GS --> ".$n." q=".$q); while ( $a < $n ) { $o = &new appointment(); @@ -2052,57 +2028,7 @@ } unset($o); } - //} - // - - /* # - # First query ( non repeating appointments ) - # - $q = "SELECT * FROM ". $this->tablename." WHERE "; - $q .= " ("; - if(!is_admin($current_user)) - { - $q .= " ( "; - } - $q .= " (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - if(!is_admin($current_user)) - { - $q .= " ) AND ( creator = '".$current_user->id."' ) "; - } - $q .= " )"; - $q .= " ORDER by a_start"; - - //print("GS --> allowed ".is_admin($current_user)." q=".$q); - # always at the end of query - # check_dbacl( $q, $current_user->id); - - // srini cal appoint - $r = $this->db->query($q); - $n = $this->db->getRowCount($r); - $a = 0; - //print("GS --> ".$n." q=".$q); - while ( $a < $n ) - { - - $o = &new appointment(); - $result = mysql_fetch_assoc($r); - //$o->read_result($r,$a); - $o->read_result($result); - $a++; - if ( $o->see_ok() ) - { */ - /* Get all participants */ - /* //$o->read_participants(); - //print("GS --> see"); - $obj->callist[$o->id] = &$o; - } - unset($o); - } - //$r->free(); - - */ + $x = new DateTime(); $x->setDateTimeTS($from->ts); @@ -2118,70 +2044,6 @@ $ymd .= $pre ."'". Date("j/n",$x->getTimeStamp()) ."'"; $x->addDays(1); } - # - # Second query ( repeating appointments w/o end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 1 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= " ) AND ( a_start <= ". $x2 ." )"; - $q .= ""; - $q .= " ORDER by a_start"; - - */ - # always at the end of query - # check_dbacl( $q, $current_user->id); - - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - - # - # Third query ( repeating appointments with end ) - # - /* $q = "SELECT c.* FROM ". $obj->dbconn->prefix .$table['appointment1'][name]." c WHERE "; - $q .= " r_ignore = 0 AND ("; - $q .= " ( repeat = 1 AND r_arg in (". $wd .") )"; - $q .= " OR ( repeat = 2 AND r_arg in (". $md .") )"; - $q .= " OR ( repeat = 3 AND r_arg in (". $ymd .") )"; - $q .= " OR ( repeat = 4 )"; - $q .= ") AND ( (a_start < ". $x2 ." AND a_start >= ". $x1 .")"; - $q .= " OR (a_end < ". $x2 ." AND a_end >= ". $x1 .")"; - $q .= " OR (a_start < ". $x1 ." AND a_end >= ". $x2 .")"; - $q .= ")"; - $q .= " ORDER by a_start"; - */ - # $r = $obj->dbconn->Exec($q); - # $n = $r->numrows(); - # $a = 0; - # while ( $a < $n ) { - # $o = &new appointment($obj->dbconn); - # $o->read_result($r,$a); - # $a++; - # if ( $o->see_ok() ) { - /* Get all participants */ - # $o->read_participants(); - # $obj->callist[$o->id] = &$o; - # } - # unset($o); - # } - # $r->free(); - return; } /** From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:35:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:35:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4226 - /vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Message-ID: <20060316073510.DA7A04E4344@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:35:06 2006 New Revision: 4226 Log: updateCalendarSharing.php has been added to update the calendar sharing Added: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:36:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:36:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4227 - /vtigercrm/trunk/modules/Calendar/disable_sharing.php Message-ID: <20060316073602.D59C64E434E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:35:58 2006 New Revision: 4227 Log: disable_sharing.php has been added to disable sharing Added: vtigercrm/trunk/modules/Calendar/disable_sharing.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:37:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:37:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4228 - /vtigercrm/trunk/modules/Calendar/calendar_share.php Message-ID: <20060316073737.49C494E434E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:37:33 2006 New Revision: 4228 Log: calendar_share.php for calendar sharing page Added: vtigercrm/trunk/modules/Calendar/calendar_share.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:40:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:40:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4229 - /vtigercrm/trunk/modules/Activities/language/en_us.lang.php Message-ID: <20060316074012.03FF44E4356@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:40:08 2006 New Revision: 4229 Log: label for visibility has been included Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:44:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:44:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4230 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060316074423.8176B4E435E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:44:19 2006 New Revision: 4230 Log: entry for visibility has been added in field table Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Thu Mar 16 00:44:19 2006 @@ -504,6 +504,8 @@ $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,1 + 5,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); @@ -543,6 +545,7 @@ $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')"); $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')"); $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')"); + $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:46:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:46:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4231 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060316074652.7DE5E4E436A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:46:48 2006 New Revision: 4231 Log: visibility_dom array has been included Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:48:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:48:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4232 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060316074846.9AAD44E436A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:48:42 2006 New Revision: 4232 Log: visibility table has been added in $comboTables array Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Mar 16 00:48:42 2006 @@ -43,7 +43,7 @@ function create_tables () { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:52:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:52:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4233 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060316075224.CBB004E4379@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:52:20 2006 New Revision: 4233 Log: sharedcalendar table has been included Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 16 00:52:20 2006 @@ -154,6 +154,13 @@
    Week   Month Share    
    + + + + + +
    + @@ -1020,6 +1027,9 @@ + + + Type=InnoDB From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:53:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:53:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4234 - /vtigercrm/trunk/vtigerlogger.php Message-ID: <20060316075345.6E1524E4377@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 00:53:41 2006 New Revision: 4234 Log: initial version Added: vtigercrm/trunk/vtigerlogger.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 02:56:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 07:56:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4235 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060316075655.9BF214E4387@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 00:56:50 2006 New Revision: 4235 Log: js function DisableSharing has been defined Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Thu Mar 16 00:56:50 2006 @@ -102,3 +102,54 @@ return true; } } + + +function DisableSharing() +{ + + x = document.SharedList.selected_id.length; + idstring = ""; + + if ( x == undefined) + { + + if (document.SharedList.selected_id.checked) + { + document.SharedList.idlist.value=document.SharedList.selected_id.value; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + else + { + xx = 0; + for(i = 0; i < x ; i++) + { + if(document.SharedList.selected_id[i].checked) + { + idstring = document.SharedList.selected_id[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.SharedList.idlist.value=idstring; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + { + document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=index&sel=share"; + } + else + { + return false; + } +} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 03:05:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 08:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4236 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060316080539.003B64E439E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 01:05:36 2006 New Revision: 4236 Log: gshow() a js function has been called on mouse click Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 16 01:05:36 2006 @@ -235,7 +235,7 @@ } for ($column=0;$column<=6;$column++) { - echo "datefilterid From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 05:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4246 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060316102824.7FFCB4E44CA@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 03:28:20 2006 New Revision: 4246 Log: changed the default data population for activity table Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 05:49:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:49:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4247 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060316104943.42AA34E44FC@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 03:49:37 2006 New Revision: 4247 Log: broken line fixed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Thu Mar 16 03:49:37 2006 @@ -504,8 +504,7 @@ $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')"); - $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,1 - 5,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); + $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 06:59:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 11:59:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4248 - /vtigercrm/trunk/modules/Users/createemailtemplate.php Message-ID: <20060316115927.613C44E4590@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 04:59:22 2006 New Revision: 4248 Log: Modified the file for smartification of create new Email Template Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/createemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/createemailtemplate.php Thu Mar 16 04:59:22 2006 @@ -9,27 +9,35 @@ * ********************************************************************************/ require_once('database/DatabaseConnection.php'); -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('include/utils/utils.php'); - - +require_once('data/Tracker.php'); +require_once('include/utils/UserInfoUtil.php'); +require_once('include/database/PearDatabase.php'); global $app_strings; global $app_list_strings; global $mod_strings; global $current_user; +global $current_language; global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; +$smod_strings = return_module_language($current_language,'Settings'); require_once($theme_path.'layout_utils.php'); -$xtpl=new XTemplate ('modules/Users/createemailtemplate.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); -$xtpl->parse("main"); -$xtpl->out("main"); +$smarty = new vtigerCRM_smarty; +$smarty->assign("APP", $app_strings); +$smarty->assign("IMAGE_PATH", $image_path); +$smarty->assign("THEME_PATH", $theme_path); +$smarty->assign("UMOD", $mod_strings); + +$smarty->assign("MOD", $smod_strings); +$smarty->assign("MODULE", 'Settings'); + +$smarty->display("CreateEmailTemplate.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:00:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:00:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4249 - /vtigercrm/trunk/modules/Users/editemailtemplate.php Message-ID: <20060316120043.06EE84E459E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:00:38 2006 New Revision: 4249 Log: Modified the file for smartification of EditView Email Template Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:06:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:06:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4250 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060316120609.48CC34E45AB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:06:01 2006 New Revision: 4250 Log: Made corr changes in lang file for Email templates Smartification Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:10:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:10:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4251 - /vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Message-ID: <20060316121004.C06EF4E45AB@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 05:09:52 2006 New Revision: 4251 Log: Added createview tpl file for smartification of new email template ui Added: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 07:35:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 12:35:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4252 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060316123532.3C8F74E45EE@vtiger.fosslabs.com> Author: don Date: Thu Mar 16 05:35:27 2006 New Revision: 4252 Log: Delete handling for profiles is done Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 16 05:35:27 2006 @@ -1989,13 +1989,35 @@ $sql7 ="delete from profile2utility where profileid=".$prof_id; $adb->query($sql7); - //updating role2profile - if(isset($transfer_profileid) && $transfer_profileid != '') - { - $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id; - $adb->query($sql8); - } + if(isset($transfer_profileid) && $transfer_profileid != '') + { + + $sql8 = "select roleid from role2profile where profileid=".$prof_id; + $result=$adb->query($sql8); + $num_rows=$adb->num_rows($result); + + for($i=0;$i<$num_rows;$i++) + { + $roleid=$adb->query_result($result,$i,'roleid'); + $sql = "select profileid from role2profile where roleid='".$roleid."'"; + $profresult=$adb->query($sql); + $num=$adb->num_rows($profresult); + if($num>1) + { + $sql10="delete from role2profile where roleid='".$roleid."' and profileid=".$prof_id; + $adb->query($sql10); + } + else + { + $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_ +id." and roleid='".$roleid."'"; + $adb->query($sql8); + } + + + } + } //delete from profile table; $sql9 = "delete from profile where profileid=".$prof_id; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:51:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:51:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4253 - /vtigercrm/trunk/Smarty/templates/Header.tpl Message-ID: <20060316145154.BA5684E46FE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:51:50 2006 New Revision: 4253 Log: Modified for Global Search Modified: vtigercrm/trunk/Smarty/templates/Header.tpl Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Mar 16 07:51:50 2006 @@ -71,12 +71,18 @@ From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:52:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:52:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4254 - /vtigercrm/trunk/pkg/bin/startvTiger.bat Message-ID: <20060316145249.7A2414E4706@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 07:52:45 2006 New Revision: 4254 Log: additional parameters added to the mysql startup to log slow queries which need to be analyzed later Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat Modified: vtigercrm/trunk/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.bat (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.bat Thu Mar 16 07:52:45 2006 @@ -100,7 +100,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:54:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:54:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4255 - /vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Message-ID: <20060316145400.057334E4706@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:53:56 2006 New Revision: 4255 Log: Added for Global Search Added: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (with props) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:54:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:54:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4256 - /vtigercrm/trunk/pkg/bin/startvTiger.sh Message-ID: <20060316145407.DB7AB4E4706@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 07:54:03 2006 New Revision: 4256 Log: parameters added to the mysqld command to trace slow queries Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh Modified: vtigercrm/trunk/pkg/bin/startvTiger.sh ============================================================================== --- vtigercrm/trunk/pkg/bin/startvTiger.sh (original) +++ vtigercrm/trunk/pkg/bin/startvTiger.sh Thu Mar 16 07:54:03 2006 @@ -96,7 +96,7 @@ echo "" #chown -R nobody . #chgrp -R nobody . - ./bin/mysqld_safe --basedir=$MYSQL_HOME --datadir=$MYSQL_HOME/data --socket=$mysql_socket --tmpdir=$MYSQL_HOME/tmp --user=root --port=$mysql_port --default-table-type=INNODB > /dev/null & + ./bin/mysqld_safe --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --basedir=$MYSQL_HOME --datadir=$MYSQL_HOME/data --socket=$mysql_socket --tmpdir=$MYSQL_HOME/tmp --user=root --port=$mysql_port --default-table-type=INNODB > /dev/null & sleep 8 echo "select 1"| ./bin/mysql --user=$mysql_username --password=$mysql_password --port=$mysql_port --socket=$mysql_socket > /dev/null if [ $? -ne 0 ]; then From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:56:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:56:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4257 - /vtigercrm/trunk/modules/Home/UnifiedSearch.php Message-ID: <20060316145603.E49294E471A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:55:59 2006 New Revision: 4257 Log: Totally changed for new Global Search including all modules Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 09:57:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 14:57:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4258 - /vtigercrm/trunk/include/freetag/freetag.class.php Message-ID: <20060316145742.8DC424E471A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 07:57:38 2006 New Revision: 4258 Log: Modified to refer the UnifiedSearch.php file to get the data based on the tag Modified: vtigercrm/trunk/include/freetag/freetag.class.php Modified: vtigercrm/trunk/include/freetag/freetag.class.php ============================================================================== --- vtigercrm/trunk/include/freetag/freetag.class.php (original) +++ vtigercrm/trunk/include/freetag/freetag.class.php Thu Mar 16 07:57:38 2006 @@ -915,9 +915,12 @@ // by $step. $cloud_html = ''; $cloud_spans = array(); + //included to get the site URL + include("config.php"); + foreach ($tag_list as $tag => $qty) { $size = $min_font_size + ($qty - $min_qty) * 3; - $cloud_span[] = '' . htmlspecialchars(stripslashes($tag)) . ''; + $cloud_span[] = '' . htmlspecialchars(stripslashes($tag)) . ''; } $cloud_html = join("\n ", $cloud_span); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 10:21:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:21:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4259 - /vtigercrm/trunk/getCompanyProfile.php Message-ID: <20060316152152.312B74E4748@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 08:21:48 2006 New Revision: 4259 Log: changes made to get headlines for given tickersymbol Modified: vtigercrm/trunk/getCompanyProfile.php Modified: vtigercrm/trunk/getCompanyProfile.php ============================================================================== --- vtigercrm/trunk/getCompanyProfile.php (original) +++ vtigercrm/trunk/getCompanyProfile.php Thu Mar 16 08:21:48 2006 @@ -16,7 +16,7 @@ * @returns $desc -- desc:: Type string array * */ -function getComdata($url,$variable) +function getComdata($url,$variable="") { $h = new http(); $desc = array(); @@ -25,20 +25,36 @@ echo "

    There is a problem with the http request!

    "; echo $h->log; exit(); - } - $msft_stats = http::table_into_array($h->body, 'Find Symbol', 0, null); - //echo '
    ';print_r($msft_stats);echo '
    '; - //die; - if($msft_stats != '') - { - $desc=$msft_stats[0]; - $data=getQuoteData($variable); - foreach($data as $key=>$value) - array_push($desc,$value); - return $desc; + } + if($variable != "") + { + $msft_stats = http::table_into_array($h->body, 'Find Symbol', 0, null); + if($msft_stats != '') + { + $desc=$msft_stats[0]; + $data=getQuoteData($variable); + foreach($data as $key=>$value) + array_push($desc,$value); + return $desc; + } + else + return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol."; } else - return "Information on ".$variable." is not available or '".$variable."' is not a valid ticker symbol."; + { + $headlines = array(); + $news = http::table_into_array($h->body, 'HEADLINES',0, null); + if($news != '') + { + $headlines[] = $news[35]; + $headlines[] = $news[37]; + $headlines[] = $news[39]; + $headlines[] = $news[41]; + return $headlines; + } + else + return "No headlines available"; + } } /** Function to get company quotes from external site @@ -48,7 +64,6 @@ */ function getQuoteData($var) { - //$url = "http://moneycentral.msn.com/detail/stock_quote?Symbol=".$var; $url = "http://finance.yahoo.com/q?s=".$var; $h = new http(); $h->dir = "class_http_dir/"; @@ -59,8 +74,6 @@ } $res_arr=array(); $quote_data = http::table_into_array($h->body, 'Delayed quote data', 0, null); - //echo '
    ';print_r($quote_data);echo '
    '; - //die; if($quote_data[0][0] == '') { array_shift($quote_data); @@ -73,10 +86,6 @@ if($quote_data !='') $res_arr[]=$quote_data[$i]; } - //array_shift($res_arr); - //array_shift($res_arr); - //echo '
    ';print_r($quote_data);echo '
    '; - //die; return $res_arr; } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 10:24:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:24:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4260 - /vtigercrm/trunk/modules/Accounts/HeadLines.php Message-ID: <20060316152406.D91974E4752@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 08:24:02 2006 New Revision: 4260 Log: HeadLines.php has been added Added: vtigercrm/trunk/modules/Accounts/HeadLines.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 10:53:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 15:53:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4261 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060316155339.C460B4E478B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 08:53:35 2006 New Revision: 4261 Log: update query fixed Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 16 08:53:35 2006 @@ -2010,8 +2010,7 @@ } else { - $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_ -id." and roleid='".$roleid."'"; + $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'"; $adb->query($sql8); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 21:47:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 02:47:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4262 - /vtigercrm/trunk/Smarty/templates/HomePage.tpl Message-ID: <20060317024706.BA5F34E4D03@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 19:47:01 2006 New Revision: 4262 Log: js function has been added Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Thu Mar 16 19:47:01 2006 @@ -21,6 +21,22 @@ document.getElementById(selrow).className="mnuSel"; show (Sele); {rdelim} + + function ajaxResponse(response) + {ldelim} + document.getElementById('headlines').innerHTML = response.responseText; + document.getElementById('headlines').style.display="block"; + {rdelim} + + function getHeadLines(Ticker) + {ldelim} + if(Ticker!='') + {ldelim} + var ajaxObj = new Ajax(ajaxResponse); + var urlstring = "module=Accounts&action=HeadLines&tickersymbol="+Ticker; + ajaxObj.process("index.php?",urlstring); + {rdelim} + {rdelim} @@ -147,8 +163,8 @@ {/foreach}
    "; + echo ""; for ($c = 0 ; $c < $maxcol[$row] ; $c++ ) { if ( isset ( $table[$column][$row][$c] ) ) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 03:07:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 08:07:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4237 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060316080704.E816F4E439E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 01:07:01 2006 New Revision: 4237 Log: gshow() a js function has been called on mouse click Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Thu Mar 16 01:07:01 2006 @@ -236,7 +236,7 @@ } - echo "\n"; + echo "\n"; if (($xm == $m ) || $month_overlap) { #echo " ". $xxd .""; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:10:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:10:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4238 - in /vtigercrm/trunk/modules/Calendar: calendar_day.php calendar_week.php Message-ID: <20060316091051.4B1CC4E441E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:10:44 2006 New Revision: 4238 Log: calendar_day.php and calendar_week.php have been removed Removed: vtigercrm/trunk/modules/Calendar/calendar_day.php vtigercrm/trunk/modules/Calendar/calendar_week.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:12:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:12:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4239 - /vtigercrm/trunk/modules/Calendar/calendar_month.php Message-ID: <20060316091209.8E9B04E442B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:12:05 2006 New Revision: 4239 Log: calendar_month.php has been removed Removed: vtigercrm/trunk/modules/Calendar/calendar_month.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:17:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:17:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4241 - in /vtigercrm/trunk/modules/Calendar: dayHourList.php monthDaysList.php weekDaysList.php Message-ID: <20060316091701.807EA4E4428@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:16:56 2006 New Revision: 4241 Log: file has been removed Removed: vtigercrm/trunk/modules/Calendar/dayHourList.php vtigercrm/trunk/modules/Calendar/monthDaysList.php vtigercrm/trunk/modules/Calendar/weekDaysList.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:16:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:16:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4240 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060316091656.3D7D54E4415@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 02:16:51 2006 New Revision: 4240 Log: overwriting with the 4.2.4 changes for vtlogger and other misc fixes Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Thu Mar 16 02:16:51 2006 @@ -14,11 +14,12 @@ ********************************************************************************/ require_once('include/logging.php'); -//include('adodb/adodb.inc.php'); -include_once('adodb/adodb.inc.php'); +include('adodb/adodb.inc.php'); require_once("adodb/adodb-xmlschema.inc.php"); -$log1 =& LoggerManager::getLogger('VT'); +require_once('vtigerlogger.php'); +global $vtlog; +$vtlog = new vtigerLogger(); class PearDatabase{ var $database = null; @@ -34,11 +35,8 @@ var $lastmysqlrow = -1; var $enableSQLlog = false; - function isMySQL() { return dbType=='mysql'; } - function isOracle() { return dbType=='oci8'; } - function println($msg) { @@ -46,13 +44,11 @@ $log1 =& LoggerManager::getLogger('VT'); if(is_array($msg)) { - //$log1->fatal("PearDatabse ->".print_r($msg,true)); - $log1->info("PearDatabse ->".print_r($msg,true)); + $log1->fatal("PearDatabse ->".print_r($msg,true)); } else { - //$log1->fatal("PearDatabase ->".$msg); - $log1->info("PearDatabase ->".$msg); + $log1->fatal("PearDatabase ->".$msg); } return $msg; } @@ -162,13 +158,13 @@ if($this->dieOnError || $dieOnError) { - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg(),'error'); + $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); die ($msg."ADODB error ".$msg."->".$this->database->ErrorMsg()); } else { - //$this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); - $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()." (SQL=".$this->sql.")",'error'); + $this->println("ADODB error ".$msg."->[".$this->database->ErrorNo()."]".$this->database->ErrorMsg()); + } return false; } @@ -189,7 +185,7 @@ * Contributor(s): ______________________________________.. */ function checkConnection(){ -global $log1; +global $vtlog; if(!isset($this->database)) { $this->println("TRANS creating new connection"); @@ -206,9 +202,8 @@ else { // $this->println("checkconnect using old connection"); - //commenting as the above log will suffice. this was filling up the logs too much - //$log1->info('checkconnect using old connection'); - } + $vtlog->logthis('checkconnect using old connection','info'); + } } /* ADODB converted @@ -232,16 +227,11 @@ function query($sql, $dieOnError=false, $msg='') { - global $log1; + global $vtlog; //$this->println("ADODB query ".$sql); - $log1->debug('query being executed : '.$sql); - $mytime["start"] = $this->microtime_float(); + $vtlog->logthis('query being executed : '.$sql,'debug'); $this->checkConnection(); $result = & $this->database->Execute($sql); - $mytime["execute"] = $this->microtime_float(); - $mytime["total"] = $mytime["execute"]-$mytime["start"]; - if ( $mytime["total"] > 0.5 ) - $log1->error("TIME: sql statement $sql took {$mytime['total']} seconds."); $this->lastmysqlrow = -1; if(!$result)$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError); return $result; @@ -261,6 +251,15 @@ $this->checkConnection(); $result = $this->database->UpdateBlob($tablename, $colname, $data, $id); $this->println("updateBlob t=".$tablename." c=".$colname." id=".$id." status=".$result); + return $result; + } + + function updateBlobFile($tablename, $colname, $id, $filename) + { + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename); + $this->checkConnection(); + $result = $this->database->UpdateBlobFile($tablename, $colname, $filename, $id); + $this->println("updateBlobFile t=".$tablename." c=".$colname." id=".$id." f=".$filename." status=".$result); return $result; } @@ -283,9 +282,9 @@ function limitQuery($sql,$start,$count, $dieOnError=false, $msg='') { - global $log1; + global $vtlog; //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count); - $log1->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count); + $vtlog->logthis(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count,'debug'); $this->checkConnection(); $result =& $this->database->SelectLimit($sql,$count,$start); if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError); @@ -398,12 +397,12 @@ */ function getRowCount(&$result){ - global $log1; + global $vtlog; //$this->println("ADODB getRowCount"); if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $log1->debug('getRowCount rows= '.$rows); + $vtlog->logthis('getRowCount rows= '.$rows,'debug'); return $rows; } @@ -430,23 +429,13 @@ //$this->println("ADODB fetch_array return null"); return NULL; } - //return $this->change_key_case($result->FetchRow()); - $ret = @ $this->change_key_case($result->FetchRow()); - if ( !is_array($ret) ) - { - $this->println( "ERROR: SQL (".$this->sql.")" ); - $this->println( print_r($result,1) ); - //die; - } - return $ret; - + return $this->change_key_case($result->FetchRow()); } /* ADODB newly added. replacement for mysql_result() */ function query_result(&$result, $row, $col=0) - { - if ( !$result ) return; + { //$this->println("ADODB query_result r=".$row." c=".$col); $result->Move($row); $rowdata = $this->change_key_case($result->FetchRow()); @@ -470,12 +459,12 @@ }*/ function getAffectedRowCount(&$result){ - global $log1; + global $vtlog; // $this->println("ADODB getAffectedRowCount"); - $log1->debug('getAffectedRowCount'); + $vtlog->logthis('getAffectedRowCount','debug'); $rows =$this->database->Affected_Rows(); // $this->println("ADODB getAffectedRowCount rows=".rows); - $log1->info('getAffectedRowCount rows = '.$rows); + $vtlog->logthis('getAffectedRowCount rows = '.$rows,'debug'); return $rows; } @@ -585,10 +574,10 @@ */ function getNextRow(&$result, $encode=true){ - global $log1; + global $vtlog; //$this->println("ADODB getNextRow"); - $log1->info('getNextRow'); + $vtlog->logthis('getNextRow','info'); if(isset($result)){ $row = $this->change_key_case($result->FetchRow()); if($row && $encode&& is_array($row))return array_map('to_html', $row); @@ -608,12 +597,6 @@ return $result->FetchField($col); } - function microtime_float() - { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); - } - function getQueryTime(){ return $this->query_time; } @@ -773,7 +756,7 @@ function quote($string){ - return ADOConnection::qstr($string,get_magic_quotes_gpc()); + return ADOConnection::qstr($string); } @@ -825,12 +808,16 @@ //$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName)); $schema = new adoSchema( $db ); + //Debug Adodb XML Schema + $sehema->XMLS_DEBUG = TRUE; + //Debug Adodb + $sehema->debug = true; $sql = $schema->ParseSchema( $schemaFile ); $this->println("--------------Starting the table creation------------------"); //$this->println($sql); - + //integer ExecuteSchema ([array $sqlArray = NULL], [boolean $continueOnErr = NULL]) $result = $schema->ExecuteSchema( $sql, true ); if($result) print $db->errorMsg(); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:27:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:27:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4242 - /vtigercrm/trunk/modules/Calendar/calendar_weekview.php Message-ID: <20060316092749.CBBF84E4449@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:27:45 2006 New Revision: 4242 Log: addEventUI.php has been included Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_weekview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_weekview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_weekview.php Thu Mar 16 02:27:45 2006 @@ -8,6 +8,7 @@ * @module calendar_week */ require_once('modules/Calendar/CalendarCommon.php'); + require_once('modules/Calendar/addEventUI.php'); global $calpath,$callink; $calpath = 'modules/Calendar/'; $callink = 'index.php?module=Calendar&action='; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 04:29:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 09:29:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4243 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060316092932.872004E444E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 02:29:27 2006 New Revision: 4243 Log: addEventUI.php has been included Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Thu Mar 16 02:29:27 2006 @@ -1,5 +1,6 @@ Author: saraj Date: Thu Mar 16 02:52:31 2006 New Revision: 4244 Log: adodb upgraded to V4.72 21 Feb 2006 release Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php vtigercrm/trunk/adodb/adodb-datadict.inc.php vtigercrm/trunk/adodb/adodb-error.inc.php vtigercrm/trunk/adodb/adodb-errorhandler.inc.php vtigercrm/trunk/adodb/adodb-errorpear.inc.php vtigercrm/trunk/adodb/adodb-exceptions.inc.php vtigercrm/trunk/adodb/adodb-iterator.inc.php vtigercrm/trunk/adodb/adodb-lib.inc.php vtigercrm/trunk/adodb/adodb-pager.inc.php vtigercrm/trunk/adodb/adodb-pear.inc.php vtigercrm/trunk/adodb/adodb-perf.inc.php vtigercrm/trunk/adodb/adodb-php4.inc.php vtigercrm/trunk/adodb/adodb-time.inc.php vtigercrm/trunk/adodb/adodb-xmlschema.inc.php vtigercrm/trunk/adodb/adodb.inc.php vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php vtigercrm/trunk/adodb/datadict/datadict-access.inc.php vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php vtigercrm/trunk/adodb/drivers/adodb-access.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php vtigercrm/trunk/adodb/lang/adodb-ar.inc.php vtigercrm/trunk/adodb/lang/adodb-bg.inc.php vtigercrm/trunk/adodb/lang/adodb-en.inc.php vtigercrm/trunk/adodb/lang/adodb-es.inc.php vtigercrm/trunk/adodb/lang/adodb-hu.inc.php vtigercrm/trunk/adodb/lang/adodb-nl.inc.php vtigercrm/trunk/adodb/lang/adodb-pl.inc.php vtigercrm/trunk/adodb/lang/adodb-ro.inc.php vtigercrm/trunk/adodb/perf/perf-db2.inc.php vtigercrm/trunk/adodb/perf/perf-informix.inc.php vtigercrm/trunk/adodb/perf/perf-mssql.inc.php vtigercrm/trunk/adodb/perf/perf-mysql.inc.php vtigercrm/trunk/adodb/perf/perf-oci8.inc.php vtigercrm/trunk/adodb/perf/perf-postgres.inc.php vtigercrm/trunk/adodb/pivottable.inc.php vtigercrm/trunk/adodb/rsfilter.inc.php vtigercrm/trunk/adodb/server.php vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php vtigercrm/trunk/adodb/session/adodb-compress-gzip.php vtigercrm/trunk/adodb/session/adodb-cryptsession.php vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php vtigercrm/trunk/adodb/session/adodb-session-clob.php vtigercrm/trunk/adodb/session/adodb-session.php vtigercrm/trunk/adodb/session/crypt.inc.php vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php vtigercrm/trunk/adodb/session/old/adodb-session-clob.php vtigercrm/trunk/adodb/session/old/adodb-session.php vtigercrm/trunk/adodb/session/old/crypt.inc.php vtigercrm/trunk/adodb/tests/benchmark.php vtigercrm/trunk/adodb/tests/client.php vtigercrm/trunk/adodb/tests/pdo.php vtigercrm/trunk/adodb/tests/test-datadict.php vtigercrm/trunk/adodb/tests/test-pgblob.php vtigercrm/trunk/adodb/tests/test-php5.php vtigercrm/trunk/adodb/tests/test.php vtigercrm/trunk/adodb/tests/test3.php vtigercrm/trunk/adodb/tests/test4.php vtigercrm/trunk/adodb/tests/test5.php vtigercrm/trunk/adodb/tests/test_rs_array.php vtigercrm/trunk/adodb/tests/testcache.php vtigercrm/trunk/adodb/tests/testdatabases.inc.php vtigercrm/trunk/adodb/tests/testmssql.php vtigercrm/trunk/adodb/tests/testoci8.php vtigercrm/trunk/adodb/tests/testoci8cursor.php vtigercrm/trunk/adodb/tests/testpaging.php vtigercrm/trunk/adodb/tests/testpear.php vtigercrm/trunk/adodb/tests/testsessions.php vtigercrm/trunk/adodb/tests/tmssql.php vtigercrm/trunk/adodb/toexport.inc.php vtigercrm/trunk/adodb/tohtml.inc.php vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl vtigercrm/trunk/adodb/xsl/remove-0.2.xsl Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-error.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-errorhandler.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-errorpear.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-exceptions.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-iterator.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-lib.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-pager.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-pear.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-perf.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-php4.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-time.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb-xmlschema.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/adodb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/contrib/toxmlrpc.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-sapdb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-ar.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-bg.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-en.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-es.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-hu.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-nl.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-pl.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/lang/adodb-ro.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-db2.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-informix.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-mssql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-mysql.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-oci8.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/perf/perf-postgres.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/pivottable.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/rsfilter.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/server.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-compress-gzip.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-cryptsession.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-session-clob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/adodb-session.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/crypt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-session-clob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/adodb-session.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/session/old/crypt.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/benchmark.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/client.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/pdo.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-datadict.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-pgblob.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test-php5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test3.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test4.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test5.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/test_rs_array.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testcache.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testdatabases.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testmssql.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testoci8.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testoci8cursor.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testpaging.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testpear.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/testsessions.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tests/tmssql.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/toexport.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/tohtml.inc.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/convert-0.1-0.2.xsl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/convert-0.2-0.1.xsl ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/adodb/xsl/remove-0.2.xsl ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 05:19:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 16 Mar 2006 10:19:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4245 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060316101936.DC2684E44BC@vtiger.fosslabs.com> Author: richie Date: Thu Mar 16 03:19:31 2006 New Revision: 4245 Log: default values for startdate,enddate set sendnotification default value set to 0 Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Mar 16 03:19:31 2006 @@ -1010,7 +1010,7 @@ - + @@ -5595,10 +5595,10 @@ - + - +
    - - - - - - + + + + + +
    		- {foreach item=tabledetail from=$HOMEDETAILS} {if $tabledetail neq ''} {if $tabledetail.Title.2 neq $HOMEDEFAULTVIEW} @@ -157,6 +173,7 @@
    {/if} + @@ -178,7 +195,7 @@ {/foreach} - +
    {$tabledetail.Title.1} (Mark as Default View)
    {/if} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 21:52:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 02:52:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4263 - /vtigercrm/trunk/modules/Accounts/ListViewTop.php Message-ID: <20060317025204.D716C4E4D0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 19:52:00 2006 New Revision: 4263 Log: change4s made to get tickersymbol Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original) +++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Thu Mar 16 19:52:00 2006 @@ -32,7 +32,7 @@ $current_module_strings = return_module_language($current_language, "Accounts"); $log = LoggerManager::getLogger('top accounts_list'); - $list_query = 'select account.accountid, account.accountname, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; + $list_query = 'select account.accountid, account.accountname, account.tickersymbol, sum(potential.amount) as amount from potential inner join crmentity on (potential.potentialid=crmentity.crmid) inner join account on (potential.accountid=account.accountid) where crmentity.deleted=0 AND crmentity.smownerid="'.$current_user->id.'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_WON'].'" and potential.sales_stage <> "'.$app_strings['LBL_CLOSE_LOST'].'" group by account.accountname order by 3 desc;'; $list_result=$adb->query($list_query); $open_accounts_list = array(); $noofrows = min($adb->num_rows($list_result),7); @@ -42,6 +42,7 @@ $open_accounts_list[] = Array('accountid' => $adb->query_result($list_result,$i,'accountid'), 'accountname' => $adb->query_result($list_result,$i,'accountname'), 'amount' => $adb->query_result($list_result,$i,'amount'), + 'tickersymbol' => $adb->query_result($list_result,$i,'tickersymbol'), ); } @@ -67,12 +68,8 @@ 'AMOUNT' => ($account['amount']), ); - $value[]=''.$account['accountname'].''; + $value[]=''.$account['accountname'].''; $value[]=convertFromDollar($account['amount'],$rate); - - - - $entries[$account['accountid']]=$value; } $values=Array('Title'=>$title,'Header'=>$header,'Entries'=>$entries); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 22:56:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 03:56:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4264 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060317035626.6C3FC4E4D97@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 20:56:20 2006 New Revision: 4264 Log: key has been set in sharedcalendar table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Mar 16 20:56:20 2006 @@ -156,8 +156,10 @@ + +
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 23:50:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 04:50:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4265 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060317045024.7B5034E4E0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 21:50:19 2006 New Revision: 4265 Log: Added combo values in Campaign module for campaignstatus, campaigntype, expected response, actual cost, expected revenue fields Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 16 23:52:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 04:52:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4266 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060317045254.66DD34E4E0E@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 21:52:50 2006 New Revision: 4266 Log: Added the respective tablenames in the comboTables Array for campaign module Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Thu Mar 16 21:52:50 2006 @@ -43,7 +43,7 @@ function create_tables () { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 17 00:42:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 17 Mar 2006 05:42:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4267 - /vtigercrm/trunk/index.php Message-ID: <20060317054245.92DCB4E4E70@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 16 22:42:40 2006 New Revision: 4267 Log: changes made to escape header and footer Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Mar 16 22:42:40 2006 @@ -402,7 +402,7 @@ { $log->info("About to take action ".$action); $log->debug("in $action"); - if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action)) + if(ereg("^Save", $action) || ereg("^Delete", $action) || ereg("^Choose", $action) || ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Authenticate", $action) || ereg("^Logout", $action) || ereg("^Export",$action) || ereg("^add2db", $action) || ereg("^result", $action) || ereg("^LeadConvertToEntities", $action) || ereg("^downloadfile", $action) || ereg("^massdelete", $action) || ereg("^updateLeadDBStatus",$action) || ereg("^AddCustomFieldToDB", $action) || ereg("^updateRole",$action) || ereg("^UserInfoUtil",$action) || ereg("^deleteRole",$action) || ereg("^UpdateComboValues",$action) || ereg("^fieldtypes",$action) || ereg("^app_ins",$action) || ereg("^minical",$action) || ereg("^minitimer",$action) || ereg("^app_del",$action) || ereg("^send_mail",$action) || ereg("^populatetemplate",$action) || ereg("^TemplateMerge",$action) || ereg("^testemailtemplateusage",$action) || ereg("^saveemailtemplate",$action) || ereg("^lookupemailtemplate",$action) || ereg("^deletewordtemplate",$action) || ereg("^deleteemailtemplate",$action) || ereg("^CurrencyDelete",$action) || ereg("^deleteattachments",$action) || ereg("^MassDeleteUsers",$action) || ereg("^UpdateFieldLevelAccess",$action) || ereg("^UpdateDefaultFieldLevelAccess",$action) || ereg("^UpdateProfile",$action) || ereg("^updateRelations",$action) || ereg("^updateNotificationSchedulers",$action) || ereg("^Star",$action) || ereg("^addPbProductRelToDB",$action) || ereg("^UpdateListPrice",$action) || ereg("^PriceListPopup",$action) || ereg("^SalesOrderPopup",$action) || ereg("^CreatePDF",$action) || ereg("^CreateSOPDF",$action) || ereg("^redirect",$action) || ereg("^webmail",$action) || ereg("^left_main",$action) || ereg("^delete_message",$action) || ereg("^mime",$action) || ereg("^move_messages",$action) || ereg("^folders_create",$action) || ereg("^imap_general",$action) || ereg("^mime",$action) || ereg("^download",$action) || ereg("^about_us",$action) || ereg("^SendMailAction",$action) || ereg("^CreateXL",$action) || ereg("^savetermsandconditions",$action) || ereg("^home_rss",$action) || ereg("^ConvertAsFAQ",$action) || ereg("^Tickerdetail",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^updateCalendarSharing",$action) || ereg("^disable_sharing",$action) || ereg("^HeadLines",$action)) { $skipHeaders=true; if(ereg("^Popup", $action) || ereg("^ChangePassword", $action) || ereg("^Export", $action) || ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^lookupemailtemplate",$action) || ereg("^about_us",$action) || ereg("^home_rss",$action) || ereg("^".$module."Ajax",$action) || ereg("^chat",$action)|| ereg("^vtchat",$action)) @@ -753,7 +753,7 @@ $theme = $default_theme; } -if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat") +if((!$viewAttachment) && (!$viewAttachment && $action != 'home_rss') && $action != 'Tickerdetail' && $action != $module."Ajax" && $action != "chat" && $action != "HeadLines") { // Under the SPL you do not have the right to remove this copyright statement. $copyrightstatement=" -

    +

    +

    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,

    +

    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. +
    2. Features
      3. +
    +

    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 @@ -41,7 +253,7 @@

    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://www.vtiger.com/products/crm/demo_5alpha

    +

    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 @@ -110,7 +322,7 @@

    		vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. - URL: Click + URL: Click Here
    7 + 7 List of files modified between + List of files modified between alpha and alpha 2   
    Sl No. Ticket IDDescription
    1-Enhanced Dashboards with more + Ticket IDDescription
    1-Enhanced Dashboards with more than 20 charts
    2 - -Multiple currency support and + 2 + -Multiple currency support and currency conversion through Web service integration
    3-Campaign Management module for + 3-Campaign Management module for Marketing automation
    4 - -Update some of your publicly + 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' + 5 + -Stay-in-touch with your customers' by uploading their photos.
    6 -   - Analyze your customers business + 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 + 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 + 9 + 1006 Send E-mail notification to other users.
    10 - 736Show latest/new leads on a Home + 10 + 736Show latest/new leads on a Home page.
    11- Ajax-based multidimensional + 11- Ajax-based multidimensional product images upload.
    12 - - - Contact Images Scrolling in Contact + 12 + - + Contact Images Scrolling in Contact ListView
    13 - - - Ajax-based my Portal module + 13 + - + Ajax-based my Portal module under Tools tab.
    14-In Home page, display the status + 14-In Home page, display the status of modified records since last logout for users.
    15 - - - Tag Cloud - Integration + 15 + - + Tag Cloud - Integration (http://tagcloud.com)
    16 - - - Company-wide Announcements configuration + 16 + - + Company-wide Announcements configuration from Settings.
    17 - - - Thumbnail view on Mouseover for + 17 + - + Thumbnail view on Mouseover for Contact images in List View.
    18 - - - Upload vtiger CRM - Users' photos.
    19 - - - Resize the users photos and create - thumbnails.
    20 - - - Attach multiple files in single + 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 + 21 + - + FCK editor upgraded to the latest version (v2.2).
    22 - - - Shout Box integration with vtiger + 22 + - + Shout Box integration with vtiger CRM Home page for vtiger users to chat online.
    23 - - - Tabbed approach of Detail View + 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 + 24 + 445 + Addition of multiple Contacts in Activities, Emails, Potentials, Vendors related lists.
    25 - - - Add New E-mail in Related List + 25 + - + Add New E-mail in Related List of Leads & Contacts.
    26 - 502 Address Inheritance for Contacts.
    27 - - - Ajaxified detail view for all + 26 + 502 Address Inheritance for Contacts.
    27 + - + Ajaxified detail view for all modules.
    28-Separate Log Messages for Security + 28-Separate Log Messages for Security Management.
    - - - - - - - - + + + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - - - - - - + + + + + + + - - - + + @@ -553,6 +765,12 @@
  • 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: Release Notes

    @@ -778,14 +996,14 @@ - - - - - - - - - - - - + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - + + - - - + + - - - + + +
    SL No. + SL No. Ticket ID + Ticket ID Description
    1 - 1058While creating customview for + Description
    1 + 1058While creating customview for salesorder return action is not redirected to Salesorder Listview.
    2 - 1070In activity related list,when + 2 + 1070In activity related list,when I click on "Activity Information" link,activity detailview is not displayed
    3 - 1067minute combo box + 3 + 1067minute combo box of duration field is not displaying proper values
    4 - -In Popup SalesOrder and PurchaseOrder + 4 + -In Popup SalesOrder and PurchaseOrder "Hacking attempt" exception is thrown.
    5 - - - Adding New Event in Potential + 5 + - + Adding New Event in Potential Relatedlist will not be working
    6 - - - In Listview when a set of accounts + 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 + 7 + 866Problem with ticket creation
    8 + 898 Attachment Error Message not proper
    9 - 913 parent email id is not selected + 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' + 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 + 13 + 1088Ticket notification with wrong signature
    14 - - - Create New User, Edit & Detail + 14 + - + Create New User, Edit & Detail View of the My Preference/Settings Smartified
    15 - - - In create customview 'Choose + 15 + - + In create customview 'Choose columns' the 'Event information' and 'Event Description' does'nt list
    16 - - - Security Support for Reports -
    17 - - - Activity Reminder Notification + 16 + - + Security Support for Reports +
    17 + - + Activity Reminder Notication email
    18 - 964 - Activities are not in start date + 18 + 964 + Activities are not in start date order and not configurable
    S. No Ticket + Ticket ID Subject
    1 +
    		@@ -795,7 +1013,7 @@
    2 +
    		Default Organization Sharing in Security is modified @@ -804,13 +1022,13 @@
    3588 + 588 Suppress sending mail to account when a ticket is submitted.
    4 +
    		Product quantity in stock is automatically updated when @@ -822,7 +1040,7 @@
    5
    +
    		In Office Plug-in, fields from multiple modules (Accounts, Contacts, Leads, HelpDesk, and Users) can be merged while creating mail @@ -830,20 +1048,20 @@
    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 @@ -997,68 +1215,68 @@ vulnerability fix.
    21
    -     		833
    -     		test mail can be sent to test + 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 + 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, + 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 -> + 26
    +     		710
    +     		activity notifications -> display further information
    27
    -     		504 New Contact -Account addressNew + 27
    +     		504 New Contact -Account addressNew Contact -Account address
    28259Office Integration account name + 28259Office Integration account name in address block
    29378Office Plugin field selection29378Office Plugin field selection
    From vtiger-tickets at vtiger.fosslabs.com Tue Mar 21 13:21:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 21 Mar 2006 18:21:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2362=3A_a?= =?utf-8?q?dd_postgresql_support_to_vtigercrm-4=2E2=2Ex?= In-Reply-To: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> References: <076.1443774be51c11a69826f1418e20e4c8@vtiger.fosslabs.com> Message-ID: <085.96d413f57301d104adadab10f0e15295@vtiger.fosslabs.com> #62: add postgresql support to vtigercrm-4.2.x ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: jeffk Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql adodb ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4381]) refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 21 13:21:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 21 Mar 2006 18:21:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4381 - /vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Message-ID: <20060321182107.951CA4E98EA@vtiger.fosslabs.com> Author: jeffk Date: Tue Mar 21 11:21:03 2006 New Revision: 4381 Log: refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Import/ImportStep4.php Tue Mar 21 11:21:03 2006 @@ -89,7 +89,7 @@ { $has_header = 1; } -if($_REQUEST['modulename'] != '') +if(isset( $_REQUEST['modulename']) && $_REQUEST['modulename'] != '') $_REQUEST['module'] = $_REQUEST['modulename']; if (! isset( $_REQUEST['module'] ) || $_REQUEST['module'] == 'Contacts') @@ -239,23 +239,21 @@ { $datarows = $xrows; } -if($_REQUEST['skipped_record_count'] != '') +if(isset($_SESSION['skipped_record_count']) && $_REQUEST['skipped_record_count'] != '') $skipped_record_count = $_REQUEST['skipped_record_count']; else $_REQUEST['skipped_record_count'] = 0; -if($_REQUEST['noofrows'] != '') +if(isset($_REQUEST['noofrows']) && $_REQUEST['noofrows'] != '') $totalnoofrows = $_REQUEST['noofrows']; else $totalnoofrows = count($datarows); -$loopcount = ($totalnoofrows/$RECORDCOUNT)+1; - -if($_REQUEST['startval'] != '') +if(isset($_REQUEST['startval']) && $_REQUEST['startval'] != '') $START = $_REQUEST['startval']; else $START = $_SESSION['startval']; -if($_REQUEST['recordcount'] != '') +if(isset($_REQUEST['recordcount']) && $_REQUEST['recordcount'] != '') $RECORDCOUNT = $_REQUEST['recordcount']; else $RECORDCOUNT = $_SESSION['recordcount']; From vtiger-tickets at vtiger.fosslabs.com Tue Mar 21 13:21:06 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 21 Mar 2006 18:21:06 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.28ce533abfd8f86ba669bd99be16ada7@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by jeffk): (In [4381]) refs #62 and #17. merging changeset r4358 to vtigercrm/branches/4.2_postgresql_integration -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 02:48:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:48:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4382 - /vtigercrm/trunk/modules/Orders/ Message-ID: <20060322074808.6049D4EA265@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:48:03 2006 New Revision: 4382 Log: Not Needed Removed: vtigercrm/trunk/modules/Orders/ From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 02:50:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:50:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4383 - /vtigercrm/trunk/modules/Users/EditView.html Message-ID: <20060322075047.4CD614EA271@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:50:42 2006 New Revision: 4383 Log: file removed as user edit view smartified Removed: vtigercrm/trunk/modules/Users/EditView.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 02:51:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:51:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4384 - /vtigercrm/trunk/modules/Users/ListView.html Message-ID: <20060322075154.A2B234EA271@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:51:50 2006 New Revision: 4384 Log: file removed as UserList View smartified Removed: vtigercrm/trunk/modules/Users/ListView.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 02:56:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:56:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4385 - /vtigercrm/trunk/modules/Users/ Message-ID: <20060322075624.0EBF14EA281@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:56:16 2006 New Revision: 4385 Log: files removed as security has been smartified Removed: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.html vtigercrm/trunk/modules/Users/DetailView.html vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.html vtigercrm/trunk/modules/Users/EditFieldLevelAccess.html vtigercrm/trunk/modules/Users/GroupDetailView.html vtigercrm/trunk/modules/Users/ListFieldPermissions.html vtigercrm/trunk/modules/Users/ListFldProfiles.html vtigercrm/trunk/modules/Users/ListProfiles.html vtigercrm/trunk/modules/Users/OrgSharingDetailView.html vtigercrm/trunk/modules/Users/OrgSharingEditView.html vtigercrm/trunk/modules/Users/RoleDetailView.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 02:57:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 07:57:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4386 - /vtigercrm/trunk/modules/Dashboard/display_charts.php Message-ID: <20060322075748.4AE5E4EA282@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 00:57:44 2006 New Revision: 4386 Log: Security Added for all charts Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Mar 22 00:57:44 2006 @@ -455,12 +455,8 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } - else - { - echo $mod_strings['LBL_NO_PERMISSION_FIELD']; - } // To display the charts for Lead status - if ($type == "leadstatus") + elseif (($type == "leadstatus")&& (getFieldVisibilityPermission('Leads',$user_id,'leadstatus') == "0")) { $graph_by="leadstatus"; $graph_title="Leads By Status"; @@ -470,7 +466,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Lead Industry - if($type == "leadindustry") + elseif (($type == "leadindustry") && (getFieldVisibilityPermission('Leads',$user_id,'industry') == "0")) { $graph_by="industry"; $graph_title="Leads By Industry"; @@ -480,7 +476,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales by Lead Source - if($type == "salesbyleadsource") + elseif (($type == "salesbyleadsource")&& (getFieldVisibilityPermission('Potentials',$user_id,'leadsource') == "0")) { $graph_by="leadsource"; $graph_title="Sales by LeadSource"; @@ -490,7 +486,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales by Account - if($type == "salesbyaccount") + elseif (($type == "salesbyaccount") && (getFieldVisibilityPermission('Potentials',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Sales by Accounts"; @@ -500,7 +496,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Account by Industry - if($type == "accountindustry") + elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0")) { $graph_by="industry"; $graph_title="Account By Industry"; @@ -510,7 +506,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Charts for Products by Category - if($type == "productcategory") + elseif (($type == "productcategory") && (getFieldVisibilityPermission('Products',$user_id,'productcategory') == "0")) { $graph_by="productcategory"; $graph_title="Products by Category"; @@ -520,7 +516,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } // Sales Order by Accounts - if($type == "sobyaccounts") + elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Sales Order by Accounts"; @@ -530,7 +526,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Sales Order by Status - if($type == "sobystatus") + elseif (($type == "sobystatus") && (getFieldVisibilityPermission('SalesOrder',$user_id,'sostatus') == "0")) { $graph_by="sostatus"; $graph_title="Sales Order by Status"; @@ -540,7 +536,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Purchase Order by Status - if($type == "pobystatus") + elseif (($type == "pobystatus") && (getFieldVisibilityPermission('PurchaseOrder',$user_id,'postatus') == "0")) { $graph_by="postatus"; $graph_title="Purchase Order by Status"; @@ -550,7 +546,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Quotes by Accounts - if($type == "quotesbyaccounts") + elseif (($type == "quotesbyaccounts") && (getFieldVisibilityPermission('Quotes',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Quotes by Accounts"; @@ -560,7 +556,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Quotes by Stage - if($type == "quotesbystage") + elseif (($type == "quotesbystage") && (getFieldVisibilityPermission('Quotes',$user_id,'quotestage') == "0")) { $graph_by="quotestage"; $graph_title="Quotes by Stage"; @@ -570,7 +566,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Invoice by Accounts - if($type == "invoicebyacnts") + elseif (($type == "invoicebyacnts") && (getFieldVisibilityPermission('Invoice',$user_id,'account_id') == "0")) { $graph_by="accountid"; $graph_title="Invoices by Accounts"; @@ -580,7 +576,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Invoices by status - if($type == "invoicebystatus") + elseif (($type == "invoicebystatus") && (getFieldVisibilityPermission('Invoice',$user_id,'invoicestatus') == "0")) { $graph_by="invoicestatus"; $graph_title="Invoices by status"; @@ -590,7 +586,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Tickets by Status - if($type == "ticketsbystatus") + elseif (($type == "ticketsbystatus") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketstatus') == "0")) { $graph_by="ticketstatus"; $graph_title="Tickets by status"; @@ -600,7 +596,7 @@ echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } //Tickets by Priority - if($type == "ticketsbypriority") + elseif (($type == "ticketsbypriority") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketpriorities') == "0")) { $graph_by="priority"; $graph_title="Tickets by Priority"; @@ -609,6 +605,11 @@ $query=$helpdesk_query; echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query); } + else + { + echo $mod_strings['LBL_NO_PERMISSION_FIELD']; + } + ?>
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 04:32:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:32:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4387 - /vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Message-ID: <20060322093211.483FE4EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:32:05 2006 New Revision: 4387 Log: MaxClients and KeepAlive parameters added Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Wed Mar 22 02:32:05 2006 @@ -87,14 +87,14 @@ # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. -# +# referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 - +MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # -KeepAliveTimeout 15 +KeepAliveTimeout 10 ## ## Server-Pool Size Regulation (MPM specific) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 04:32:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:32:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4388 - /vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Message-ID: <20060322093253.8677F4EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:32:45 2006 New Revision: 4388 Log: MaxClients and KeepAlive parameters added Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Wed Mar 22 02:32:45 2006 @@ -96,14 +96,14 @@ # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. -# +# referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html MaxKeepAliveRequests 100 - +MaxClients 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # -KeepAliveTimeout 15 +KeepAliveTimeout 10 ## ## Server-Pool Size Regulation (MPM specific) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 04:33:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 09:33:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4389 - /vtigercrm/trunk/pkg/php/php.ini Message-ID: <20060322093327.49B024EA34F@vtiger.fosslabs.com> Author: richie Date: Wed Mar 22 02:33:22 2006 New Revision: 4389 Log: output_handler = ob_gzhandler entry added Modified: vtigercrm/trunk/pkg/php/php.ini Modified: vtigercrm/trunk/pkg/php/php.ini ============================================================================== --- vtigercrm/trunk/pkg/php/php.ini (original) +++ vtigercrm/trunk/pkg/php/php.ini Wed Mar 22 02:33:22 2006 @@ -115,7 +115,7 @@ ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. zlib.output_compression = Off - +output_handler = ob_gzhandler ; You cannot specify additional output handlers if zlib.output_compression ; is activated here. This setting does the same as output_handler but in ; a different order. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 07:59:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 12:59:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4390 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060322125949.CC0BC4EA500@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 05:59:44 2006 New Revision: 4390 Log: * Added NULL in fieldvalue when it is empty Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 08:19:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 22 Mar 2006 13:19:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4391 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060322131936.AE5C44EA52A@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 22 06:19:31 2006 New Revision: 4391 Log: Changed the default home view from myaccount to key metrice Ahmed Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Wed Mar 22 06:19:31 2006 @@ -158,7 +158,7 @@ // added by jeri to populate default image and tagcloud for admin $user->imagename = 'admin.jpeg'; $user->tagcloud = 'http://www.tagcloud.com/cloud/js/mycloud79/default/50'; - $user->defhomeview = 'home_myaccount'; + $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') $admin_email ="admin at administrator.com"; From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:05:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:05:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2367=3A_O?= =?utf-8?q?ld_config_file_in_Phprint?= In-Reply-To: <076.3e4d97ffe9a3e653ec381a342a555d51@vtiger.fosslabs.com> References: <076.3e4d97ffe9a3e653ec381a342a555d51@vtiger.fosslabs.com> Message-ID: <085.2380ea1967a13f320d9d6109c2c83cd5@vtiger.fosslabs.com> #67: Old config file in Phprint ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: closed Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc2 Resolution: invalid | Keywords: phprint config ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => invalid * status: new => closed Comment: The proper config file to reference is config.php. config.inc.php is where the install defaults are kept and config.php is for overriding the defaults. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:14:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:14:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= Message-ID: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables -----------------------+---------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Keywords: | -----------------------+---------------------------------------------------- r4358 is the first changeset to fix up several references to undefined variable errors. This ticket is for tracking those changes. Make sure you reference to it in your commit messages. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:14:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:14:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4392 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323021451.9F3C74EABB0@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:14:49 2006 New Revision: 4392 Log: clean up uninitialized var notice while importing leads ref #70 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 19:14:49 2006 @@ -676,6 +676,8 @@ $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")"; $adb->query($sql1); $groupname = $_REQUEST['assigned_group_name']; + if (isset($_REQUEST['assigntype'])) + { if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails') { if($table_name == 'leaddetails') @@ -691,7 +693,7 @@ { insert2TicketGroupRelation($this->id,$groupname); } - + } } } From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:16:33 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:16:33 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.55907296d4784bd6ebd8de81b957f2b4@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): And r4392 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:18:21 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:18:21 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.1baef4d2f861d1da372b7738095986bb@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4393]) fix getCustomFieldTrans call time reference. see #70 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:18:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:18:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4393 - /vtigercrm/branches/4.2/include/CustomFieldUtil.php Message-ID: <20060323021822.161DA4EABBE@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:18:19 2006 New Revision: 4393 Log: fix getCustomFieldTrans call time reference. see #70 Modified: vtigercrm/branches/4.2/include/CustomFieldUtil.php Modified: vtigercrm/branches/4.2/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/branches/4.2/include/CustomFieldUtil.php (original) +++ vtigercrm/branches/4.2/include/CustomFieldUtil.php Wed Mar 22 19:18:19 2006 @@ -294,7 +294,7 @@ } -function getCustomFieldTrans($module, $trans_array) +function getCustomFieldTrans($module, &$trans_array) { global $adb; $tab_id = getTabid($module); From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:44:05 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:44:05 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2325=3A_I?= =?utf-8?q?nstall_Directory_should_be_Removed_after_Install?= In-Reply-To: <076.c1808c0d5cd963d9a1a831dbb8bbba6d@vtiger.fosslabs.com> References: <076.c1808c0d5cd963d9a1a831dbb8bbba6d@vtiger.fosslabs.com> Message-ID: <085.db00c137e897162ee376138d3078cda1@vtiger.fosslabs.com> #25: Install Directory should be Removed after Install ------------------------+--------------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: fixed | Keywords: install risk security ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4394]) disable installer after successful install for security reasons. closes #25 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:44:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:44:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4394 - in /vtigercrm/branches/4.2: install.php install/0welcome.php install/1checkSystem.php install/2setConfig.php install/3confirmConfig.php install/4createConfigFile.php install/5createTables.php install/populateSeedData.php Message-ID: <20060323024406.237A84EABF4@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:44:02 2006 New Revision: 4394 Log: disable installer after successful install for security reasons. closes #25 Modified: vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/0welcome.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/3confirmConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.php vtigercrm/branches/4.2/install/populateSeedData.php Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,14 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install.php,v 1.2 2004/10/06 09:02:02 jack Exp $ * Description: Starts the installation process. ********************************************************************************/ + +if (is_file('config.php')) { + require_once('config.php'); + if (isset($dbconfig['db_hostname']) & is_file('install_lock')) { + header("Location: index.php"); + exit(); + } +} if (substr(phpversion(), 0, 1) == "5") { ini_set("zend.ze1_compatibility_mode", "1"); Modified: vtigercrm/branches/4.2/install/0welcome.php ============================================================================== --- vtigercrm/branches/4.2/install/0welcome.php (original) +++ vtigercrm/branches/4.2/install/0welcome.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/0welcome.php,v 1.10 2004/08/26 11:44:30 sarajkumar Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} //get php configuration settings. requires elaborate parsing of phpinfo() output ob_start(); Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/1checkSystem.php,v 1.16 2005/03/08 12:01:36 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} //get php configuration settings. requires elaborate parsing of phpinfo() output ob_start(); Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/2setConfig.php,v 1.41 2005/04/29 06:44:13 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} // TODO: deprecate connection.php file //require_once("connection.php"); Modified: vtigercrm/branches/4.2/install/3confirmConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/3confirmConfig.php (original) +++ vtigercrm/branches/4.2/install/3confirmConfig.php Wed Mar 22 19:44:02 2006 @@ -16,6 +16,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/3confirmConfig.php,v 1.14 2005/04/25 09:41:26 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} if (isset($_REQUEST['db_hostname'])) $db_hostname = $_REQUEST['db_hostname']; Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Wed Mar 22 19:44:02 2006 @@ -18,6 +18,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/4createConfigFile.php,v 1.26 2005/04/25 05:40:50 samk Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} require_once('include/utils.php'); include('vtigerversion.php'); Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Wed Mar 22 19:44:02 2006 @@ -17,6 +17,11 @@ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/5createTables.php,v 1.58 2005/04/19 16:57:08 ray Exp $ * Description: Executes a step in the installation process. ********************************************************************************/ + +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} set_time_limit(600); @@ -81,6 +86,23 @@ require_once('install/5createTables.inc.php'); +if (is_file('install_lock')) + $is_writable = is_writable('install_lock'); +else + $is_writable = is_writable('.'); + +$config_lock = "/*\n\nInstallation Lock File\n\n"; +$config_lock .= "This File is Used to Prevent\n"; +$config_lock .= "Changes to An Existing Configuration\n"; +$config_lock .= "of vtiger.\n\n"; +$config_lock .= "To re-enable the installation mode,\n"; +$config_lock .= "delete this file, and use the\n"; +$config_lock .= "install.php file to restart the configuration.\n\n*/"; + +if ($is_writable && ($install_lock_file = @ fopen("install_lock", "w"))) { + fputs($install_lock_file, $config_lock, strlen($config_lock)); + fclose($install_lock_file); +} ?>
    total time: seconds.
    Modified: vtigercrm/branches/4.2/install/populateSeedData.php ============================================================================== --- vtigercrm/branches/4.2/install/populateSeedData.php (original) +++ vtigercrm/branches/4.2/install/populateSeedData.php Wed Mar 22 19:44:02 2006 @@ -17,6 +17,11 @@ * Description: Executes a step in the installation process. ********************************************************************************/ +if (is_file('../install_lock')) { + header("Location: ../index.php"); + exit(); +} + require_once('config.php'); require_once('modules/Leads/Lead.php'); From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 21:59:41 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 02:59:41 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2363=3A_R?= =?utf-8?q?estricted_user_modifying_record_erases_hidden_fields?= In-Reply-To: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> References: <076.a87db8a72dfb88d9b3f12c6bcfde1dbf@vtiger.fosslabs.com> Message-ID: <085.1238e948cd12f4bb6c10c4fe9caab830@vtiger.fosslabs.com> #63: Restricted user modifying record erases hidden fields ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: critical | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4395]) Fix restricted user modifying record erases hidden fields, by mcrowe. closes #63 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 21:59:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 02:59:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4395 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323025942.38F784EAC15@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 19:59:39 2006 New Revision: 4395 Log: Fix restricted user modifying record erases hidden fields, by mcrowe. closes #63 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 19:59:39 2006 @@ -439,7 +439,18 @@ } $tabid= getTabid($module); - $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; + // MWC -- Fix hidden field saving issue + // $sql = "select * from field where tabid=" . $tabid . " and tablename='" . $table_name . "' and displaytype in (1,3)"; + $sql = "select * from field + inner join profile2field on profile2field.fieldid=field.fieldid + inner join def_org_field on def_org_field.fieldid=field.fieldid + where field.tabid=" . $tabid . " + and field.tablename='" . $table_name . "' + and field.displaytype in (1,3) + and profile2field.visible=0 + and def_org_field.visible=0 + and profile2field.profileid=" . $profile_id . " + order by sequence"; $result = $adb->query($sql); $noofrows = $adb->num_rows($result); for($i=0; $i<$noofrows; $i++) @@ -918,7 +929,16 @@ } $tabid = getTabid($module); - $sql1 = "select * from field where tabid=".$tabid; + // MWC -- Fix hidden field saving issue + // $sql1 = "select * from field where tabid=" . $tabid; + $sql1 = "select * from field + inner join profile2field on profile2field.fieldid=field.fieldid + inner join def_org_field on def_org_field.fieldid=field.fieldid + where field.tabid=" . $tabid . " + and profile2field.visible=0 + and def_org_field.visible=0 + and profile2field.profileid=" . $profile_id . " + order by sequence"; $result1 = $adb->query($sql1); $noofrows = $adb->num_rows($result1); for($i=0; $i<$noofrows; $i++) From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 22:06:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 03:06:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4396 - /vtigercrm/branches/4.2/data/CRMEntity.php Message-ID: <20060323030621.6CAF24EAC2C@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 20:06:18 2006 New Revision: 4396 Log: add comment to aide future debugging. refs #70 Modified: vtigercrm/branches/4.2/data/CRMEntity.php Modified: vtigercrm/branches/4.2/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2/data/CRMEntity.php Wed Mar 22 20:06:18 2006 @@ -687,6 +687,7 @@ $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")"; $adb->query($sql1); $groupname = $_REQUEST['assigned_group_name']; + //Fix ref to undefined variable during lead import -mikefedyk if (isset($_REQUEST['assigntype'])) { if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails') From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 22:06:20 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 03:06:20 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2370=3A_R?= =?utf-8?q?emove_notice_warnings_=26_unused_variables?= In-Reply-To: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> References: <076.e80e1eebbf592f70792770d9d7e7cc3d@vtiger.fosslabs.com> Message-ID: <085.2aaf09a6701740c4d2b6acfffb22731d@vtiger.fosslabs.com> #70: Remove notice warnings & unused variables ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [4396]) add comment to aide future debugging. refs #70 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 22:22:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 03:22:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4397 - in /vtigercrm/branches/4.2/include: language/en_us.lang.php utils.php Message-ID: <20060323032213.7E3F14EAC41@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 20:22:10 2006 New Revision: 4397 Log: Patch forUnicode-readyAlphabeticalSearch(), by justoff. Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php vtigercrm/branches/4.2/include/utils.php Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/4.2/include/language/en_us.lang.php (original) +++ vtigercrm/branches/4.2/include/language/en_us.lang.php Wed Mar 22 20:22:10 2006 @@ -924,8 +924,35 @@ 'Opportunities' => 'Opportunity'), +// AlphabeticalSearch values for UTF-8-aware procedure +// Allows multicharacter elements + +'alphabetical_search_values' => Array('A' + , 'B' + , 'C' + , 'D' + , 'E' + , 'F' + , 'G' + , 'H' + , 'I' + , 'J' + , 'K' + , 'L' + , 'M' + , 'N' + , 'O' + , 'P' + , 'Q' + , 'R' + , 'S' + , 'U' + , 'V' + , 'W' + , 'X' + , 'Y' + , 'Z' + ), ); - - ?> Modified: vtigercrm/branches/4.2/include/utils.php ============================================================================== --- vtigercrm/branches/4.2/include/utils.php (original) +++ vtigercrm/branches/4.2/include/utils.php Wed Mar 22 20:22:10 2006 @@ -4087,6 +4087,9 @@ //parameter $viewid added for customview 27/5 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='') { + /* for access to alphabetical_search values stored in /include/$lang.language.php */ + global $app_list_strings; + if($type=='advanced') $flag='&advanced=true'; @@ -4097,9 +4100,14 @@ $returnvalue = '&recordid='.$recordid; if($return_module != '') $returnvalue .= '&return_module='.$return_module; - - for($var='A',$i =1;$i<=26;$i++,$var++) - $list .= '    		'.$var.''.$alphabetical_search_values[$i].'
    + @@ -5070,10 +5072,10 @@ - + - + datefilterid From vtiger-tickets at vtiger.fosslabs.com Wed Mar 22 23:58:08 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 04:58:08 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2337=3A_J?= =?utf-8?q?pgraph_fixes_for_Traditional_Chinese?= In-Reply-To: <076.f161b40809c2565abef624af37d6d80f@vtiger.fosslabs.com> References: <076.f161b40809c2565abef624af37d6d80f@vtiger.fosslabs.com> Message-ID: <085.3ec064ffd6439dc7df236c9d8ce7a493@vtiger.fosslabs.com> #37: Jpgraph fixes for Traditional Chinese -------------------------------+-------------------------------------------- Reporter: kiange at gmail.com | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc1 Resolution: fixed | Keywords: chinese,jpgraph -------------------------------+-------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4399]) Jpgraph fixes for Traditional Chinese, by kiange. closes #37 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 22 23:58:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 04:58:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4399 - in /vtigercrm/branches/4.2: jpgraph/jpg-config.inc jpgraph/jpgraph.php modules/Potentials/Charts.php Message-ID: <20060323045809.F02DE4EAD1F@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 21:58:05 2006 New Revision: 4399 Log: Jpgraph fixes for Traditional Chinese, by kiange. closes #37 Modified: vtigercrm/branches/4.2/jpgraph/jpg-config.inc vtigercrm/branches/4.2/jpgraph/jpgraph.php vtigercrm/branches/4.2/modules/Potentials/Charts.php Modified: vtigercrm/branches/4.2/jpgraph/jpg-config.inc ============================================================================== --- vtigercrm/branches/4.2/jpgraph/jpg-config.inc (original) +++ vtigercrm/branches/4.2/jpgraph/jpg-config.inc Wed Mar 22 21:58:05 2006 @@ -64,6 +64,10 @@ // either FF_CHINESE or FF_BIG5 DEFINE('CHINESE_TTF_FONT','bkai00mp.ttf'); +// For Traditional Chinese with UTF-8 encode +// Download from http://twpug.net/modules/wfdownloads/visit.php?cid=33&lid=566 +DEFINE('TCHINESE_UTF8_FONT','fireflysung.ttf'); + // Special unicode cyrillic language support DEFINE("LANGUAGE_CYRILLIC",false); Modified: vtigercrm/branches/4.2/jpgraph/jpgraph.php ============================================================================== --- vtigercrm/branches/4.2/jpgraph/jpgraph.php (original) +++ vtigercrm/branches/4.2/jpgraph/jpgraph.php Wed Mar 22 21:58:05 2006 @@ -83,6 +83,7 @@ DEFINE("FF_SIMSUN",30); DEFINE("FF_CHINESE",31); DEFINE("FF_BIG5",31); +DEFINE("FF_TCHINESE_UTF8",32); // Japanese font DEFINE("FF_MINCHO",40); @@ -3087,6 +3088,7 @@ FF_VERASERIF => array(FS_NORMAL=>'VeraSe.ttf', FS_BOLD=>'VeraSeBd.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ) , FF_SIMSUN => array(FS_NORMAL=>'simsun.ttc', FS_BOLD=>'simhei.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_CHINESE => array(FS_NORMAL=>CHINESE_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), + FF_TCHINESE_UTF8 => array(FS_NORMAL=>TCHINESE_UTF8_FONT, FS_BOLD=>TCHINESE_UTF8_FONT, FS_ITALIC=>TCHINESE_UTF8_FONT, FS_BOLDITALIC=>TCHINESE_UTF8_FONT ), FF_MINCHO => array(FS_NORMAL=>MINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_PMINCHO => array(FS_NORMAL=>PMINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), FF_GOTHIC => array(FS_NORMAL=>GOTHIC_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ), Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Wed Mar 22 21:58:05 2006 @@ -40,6 +40,7 @@ DEFINE("FF_SIMSUN",30); DEFINE("FF_CHINESE",31); DEFINE("FF_BIG5",31); +DEFINE("FF_TCHINESE_UTF8",32); function calculate_font_family($locale) @@ -50,6 +51,8 @@ { case 'cn_zh': return FF_SIMSUN; + case 'zh-tw': + return FF_TCHINESE_UTF8; case 'tw_zh': if(!function_exists('iconv')){ echo " Unable to display traditional Chinese on the graphs.
    The function iconv does not exists please read more about iconv here
    "; From vtiger-tickets at vtiger.fosslabs.com Thu Mar 23 00:33:54 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:33:54 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.e656980897d46134526e49d7e02895dd@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: -----------------------------------------------+---------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4400]) Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 00:33:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:33:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4400 - in /vtigercrm/branches/4.2/modules: Potentials/RenderRelatedListUI.php Quotes/Save.php Message-ID: <20060323053355.4CE584EAD67@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:33:52 2006 New Revision: 4400 Log: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51 Modified: vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php vtigercrm/branches/4.2/modules/Quotes/Save.php Modified: vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php Wed Mar 22 22:33:52 2006 @@ -18,7 +18,8 @@ $hidden .= ''; $hidden .= ''; $hidden .= ''; - $hidden .= ''; + //2-21-06 arodes - removed contact_id value = $id since the id passed in is not a contact id value + $hidden .= ''; $hidden .= ''; $hidden .= ''; $hidden .= ''; Modified: vtigercrm/branches/4.2/modules/Quotes/Save.php ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/Save.php (original) +++ vtigercrm/branches/4.2/modules/Quotes/Save.php Wed Mar 22 22:33:52 2006 @@ -53,6 +53,12 @@ if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; + $match = stristr($fieldname,'id'); // adding this to try and set only foreign keys. + if(empty($value) && $match != '0') // we dont want ALL blank values set to null + { + $value = 'null'; + } + //echo '
    '; //echo $fieldname." ".$value; //echo '
    '; From vtiger-tickets at vtiger.fosslabs.com Thu Mar 23 00:34:58 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:34:58 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2366=3A_W?= =?utf-8?q?ebmail=3A_HTML-Part_not_displayable=2C_Attachments_not_transfer?= =?utf-8?q?able_to_CRM?= In-Reply-To: <076.24462a01d102c82cc33c01d47bb674f8@vtiger.fosslabs.com> References: <076.24462a01d102c82cc33c01d47bb674f8@vtiger.fosslabs.com> Message-ID: <085.5f21c4756074c6af74c0c67816d778e9@vtiger.fosslabs.com> #66: Webmail: HTML-Part not displayable, Attachments not transferable to CRM ------------------------+--------------------------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: mail email webmail attachment ------------------------+--------------------------------------------------- Changes (by mfedyk): * milestone: 4.2.4 => 4.2.5 * version: 4.2.4rc3 => 4.2.4rc2 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Thu Mar 23 00:39:52 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:39:52 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2354=3A_T?= =?utf-8?q?ranslate_of_hard_code_by_Summing_columns_in_reports?= In-Reply-To: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> References: <076.7c0f9385a27e686b4eaacde59dfa300c@vtiger.fosslabs.com> Message-ID: <085.04535e21af04a39b90ad7dfbad7ff1c6@vtiger.fosslabs.com> #54: Translate of hard code by Summing columns in reports --------------------------+------------------------------------------------- Reporter: Kleo | Owner: developer Type: enhancement | Status: closed Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Resolution: fixed | Keywords: --------------------------+------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4401]) Translate of hard code by Summing columns in reports, by kleo. closes #54 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 00:39:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:39:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4401 - /vtigercrm/branches/4.2/modules/Reports/ReportRun.php Message-ID: <20060323053953.954EC4EAD74@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:39:51 2006 New Revision: 4401 Log: Translate of hard code by Summing columns in reports, by kleo. closes #54 Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Wed Mar 22 22:39:51 2006 @@ -1383,7 +1383,7 @@ $y=$adb->num_fields($result); $custom_field_values = $adb->fetch_array($result); - $coltotalhtml .= "
    "; + $coltotalhtml .= "
    TotalsSUMAVGMINMAX
    "; foreach($this->totallist as $key=>$value) { From vtiger-tickets at vtiger.fosslabs.com Thu Mar 23 00:50:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:50:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2364=3A_A?= =?utf-8?q?ttachment_filenames_with_special_characters_won=27t_download?= In-Reply-To: <076.c7fcbf29ad36f8e9090608937c022092@vtiger.fosslabs.com> References: <076.c7fcbf29ad36f8e9090608937c022092@vtiger.fosslabs.com> Message-ID: <085.7718c02238eaa674c41008c8a91fbc0b@vtiger.fosslabs.com> #64: Attachment filenames with special characters won't download ------------------------+--------------------------------------------------- Reporter: mikecrowe | Owner: developer Type: defect | Status: closed Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by mfedyk): * resolution: => fixed * status: new => closed Comment: (In [4402]) urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 23 00:50:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Mar 2006 05:50:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4402 - /vtigercrm/branches/4.2/include/RelatedListView.php Message-ID: <20060323055023.C51C04EAD84@vtiger.fosslabs.com> Author: mfedyk Date: Wed Mar 22 22:50:20 2006 New Revision: 4402 Log: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64 Modified: vtigercrm/branches/4.2/include/RelatedListView.php Modified: vtigercrm/branches/4.2/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/4.2/include/RelatedListView.php (original) +++ vtigercrm/branches/4.2/include/RelatedListView.php Wed Mar 22 22:50:20 2006 @@ -299,7 +299,7 @@ $list .= ''; $list .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } if(isset($cust_fld)) From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:35:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:35:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4405 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060324073547.7A20C4EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:35:31 2006 New Revision: 4405 Log: * Removed the unwanted codes which are related to Product details Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Fri Mar 24 00:35:31 2006 @@ -150,24 +150,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:37:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:37:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4406 - /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Message-ID: <20060324073717.B34BB4EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:37:07 2006 New Revision: 4406 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Fri Mar 24 00:37:07 2006 @@ -82,6 +82,10 @@ global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus)); + $smarty->display("DetailView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:38:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:38:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4407 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060324073847.DA9914EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:38:39 2006 New Revision: 4407 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Fri Mar 24 00:38:39 2006 @@ -98,6 +98,10 @@ $permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); $smarty->assign("MODULE", $currentModule); + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Quotes',$focus)); + $smarty->display("DetailView.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:39:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:39:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4408 - /vtigercrm/trunk/modules/Quotes/Save.php Message-ID: <20060324073927.EF5194EBBFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:39:12 2006 New Revision: 4408 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/Quotes/Save.php Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Fri Mar 24 00:39:12 2006 @@ -25,6 +25,7 @@ require_once('include/logging.php'); //require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -213,7 +214,6 @@ $body = str_replace('{QUOTEQUANTITY}',$qty,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("Quotes",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:41:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:41:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4409 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060324074128.CEBE84EBC0C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:41:13 2006 New Revision: 4409 Log: * Changed the function call to get the products from getAssociatedProducts to getProductDetailsBlockInfo Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Fri Mar 24 00:41:13 2006 @@ -135,7 +135,8 @@ $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $num_of_products = getNoOfAssocProducts($module,$focus); $smarty->assign("ROWCOUNT", $num_of_products); - $associated_prod = getAssociatedProducts("Quotes",$focus); + //$associated_prod = getAssociatedProducts("Quotes",$focus); + $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); //getAssociatedProducts("Quotes",$focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:42:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:42:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4410 - /vtigercrm/trunk/modules/Invoice/Save.php Message-ID: <20060324074234.7374D4EBC0B@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:42:19 2006 New Revision: 4410 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/Invoice/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Fri Mar 24 00:42:19 2006 @@ -23,8 +23,8 @@ require_once('modules/Invoice/Invoice.php'); require_once('include/logging.php'); -//require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -195,7 +195,6 @@ $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("Invoice",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:46:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:46:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4411 - /vtigercrm/trunk/modules/Invoice/DetailView.php Message-ID: <20060324074637.98A634EBC1A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:46:23 2006 New Revision: 4411 Log: * Get the associated products and display Modified: vtigercrm/trunk/modules/Invoice/DetailView.php Modified: vtigercrm/trunk/modules/Invoice/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/DetailView.php (original) +++ vtigercrm/trunk/modules/Invoice/DetailView.php Fri Mar 24 00:46:23 2006 @@ -83,6 +83,10 @@ global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; + +//Get the associated Products and then display above Terms and Conditions +$smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('Invoice',$focus)); + $smarty->display("DetailView.tpl"); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:48:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:48:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4412 - /vtigercrm/trunk/modules/Products/EditView.php Message-ID: <20060324074816.802384EBC1A@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:48:08 2006 New Revision: 4412 Log: * Added check whether the focus object has id or not to avoid the error Modified: vtigercrm/trunk/modules/Products/EditView.php Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Fri Mar 24 00:48:08 2006 @@ -94,7 +94,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); -$smarty->assign("ROWCOUNT", getImageCount($focus->id)); +if($focus->id != '') + $smarty->assign("ROWCOUNT", getImageCount($focus->id)); if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:50:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:50:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4413 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060324075045.301844EBC29@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:50:31 2006 New Revision: 4413 Log: * Added script function call settotalnoofrows in onBlur of Qty and ListPrice textboxes Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Fri Mar 24 00:50:31 2006 @@ -1379,9 +1379,9 @@ var colseven = row.insertCell(6); colone.innerHTML=" "; coltwo.innerHTML="
    "; - colthree.innerHTML=" "; + colthree.innerHTML=" "; colfour.innerHTML=" 
    "; - colfive.innerHTML="  "; + colfive.innerHTML="  "; colsix.innerHTML=" 
    "; colseven.innerHTML="Del"; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:52:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:52:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4414 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060324075256.B86D94EBC28@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:52:47 2006 New Revision: 4414 Log: * Added condition to avoid the error when potentialid is empty in function getPotentialName Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Mar 24 00:52:47 2006 @@ -331,12 +331,16 @@ function getPotentialName($potential_id) { global $log; -$log->info("in getPotentialName ".$potential_id); + $log->info("in getPotentialName ".$potential_id); global $adb; - $sql = "select potentialname from potential where potentialid=".$potential_id; - $result = $adb->query($sql); - $potentialname = $adb->query_result($result,0,"potentialname"); + $potentialname = ''; + if($potential_id != '') + { + $sql = "select potentialname from potential where potentialid=".$potential_id; + $result = $adb->query($sql); + $potentialname = $adb->query_result($result,0,"potentialname"); + } return $potentialname; } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:55:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:55:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4415 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060324075507.C6A144EBC28@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:54:55 2006 New Revision: 4415 Log: * Removed the extra div and table close tags in function getDetailAssociatedProducts Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Fri Mar 24 00:54:55 2006 @@ -760,7 +760,6 @@ $output .= ''; $output .= ''; $output .= ''; - //$output .= ''; $output .= ''; if($module == 'Quotes') @@ -817,7 +816,6 @@ $output .= ''; $output .= ''; $output .= '
    {$mod_strings['LBL_COLUMNS']}{$mod_strings['LBL_COLUMNS_SUM']}{$mod_strings['LBL_COLUMNS_AVERAGE']}{$mod_strings['LBL_COLUMNS_LOW_VALUE']}{$mod_strings['LBL_COLUMNS_LARGE_VALUE']}
    '; $list .= ''; - $list .= ''.$row[2].''; + $list .= '' . $row[2] . ''; $list .= ''; From vtiger-tickets at vtiger.fosslabs.com Thu Mar 23 00:53:47 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Thu, 23 Mar 2006 05:53:47 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?= =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?= =?utf-8?q?associations?= In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com> Message-ID: <085.2c67ad33db43d77037fd211a5b7889af@vtiger.fosslabs.com> #48: Sales Orders Created from Quote are not saved and do not retain associations -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.3 Resolution: | Keywords: order -----------------------------------------------+---------------------------- Comment (by mfedyk): Leaving open to see if r4400 for #51 fixes this problem. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 00:55:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 05:55:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4403 - /vtigercrm/trunk/modules/SalesOrder/Save.php Message-ID: <20060324055528.6A84E4EBB22@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 23 22:55:21 2006 New Revision: 4403 Log: moved the include of mail.php to first Modified: vtigercrm/trunk/modules/SalesOrder/Save.php Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Mar 23 22:55:21 2006 @@ -24,6 +24,7 @@ require_once('modules/SalesOrder/SalesOrder.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); +include("modules/Emails/mail.php"); $local_log =& LoggerManager::getLogger('index'); @@ -180,7 +181,6 @@ $body = str_replace('{SOQUANTITY}',$qty,$body); $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - include("modules/Emails/mail.php"); $mail_status = send_mail("SalesOrder",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); } } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 00:56:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 05:56:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4404 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060324055625.967354EBB22@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 23 22:56:20 2006 New Revision: 4404 Log: Removed the unwanted codes which are related to Product details Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Mar 23 22:56:20 2006 @@ -246,26 +246,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= '
     
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
    Unit Price List PriceTotal 
    '; - $output .= ''; $output .= ''; $output .= ''; $output .= ''; @@ -840,7 +838,6 @@ $output .= ''; $output .= ''; $output .= '
     '.$focus->column_fields['hdnGrandTotal'].'
    '; - $output .= '
    '; return $output; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 02:57:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 07:57:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4416 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060324075757.C47174EBC34@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 00:57:41 2006 New Revision: 4416 Log: * Removed the unwanted codes and correct assign the hidden values in function getAssociatedProducts Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Mar 24 00:57:41 2006 @@ -1115,56 +1115,28 @@ $list_price_var = 'txtListPrice'.$i; $total_var = 'total'.$i; - if($i%2 == 0) - { - $row_class = "evenListRow"; - } - else - { - $row_class = "oddListRow"; - } - - $product_Detail[$i]['txtProduct']= $productname; - - /*$output .= '
    '.$qtyinstock.'
     
    '.$unitprice.'
     
    '.$total.'
    		Del'; $product_Detail[$i]['delRow'.$i]="Del"; } - else - { - #$output .= ''; - } - $product_Detail[$i]['hdnProductId'.$i]=$total; - #$output .= ''; - $product_Detail[$i]['hdnRowStatus'.$i]=''; - #$output .= ''; - $product_Detail[$i]['hdnTotal'.$i]=''; - #$output .= ''; - #$output .= '
    + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} {/if} + @@ -195,12 +197,14 @@ + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} - + {/if} - + + - + @@ -209,11 +213,13 @@
    '; echo ''; @@ -37,7 +39,6 @@ function fetchTabIDVal($fldmodule) { - global $adb; $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; $tabidresult = $adb->query($query); @@ -45,7 +46,6 @@ } $tabid = fetchTabIDVal($_REQUEST['fld_module']); - $fld_module = $_REQUEST['fld_module']; echo getCustomFieldList($tabid,$mod_strings,$fld_module); @@ -100,6 +100,8 @@ $list .= ''; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:52:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:52:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4431 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060324135250.165014EBF4C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:52:45 2006 New Revision: 4431 Log: changes made to integrate customfield edit Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Fri Mar 24 06:52:45 2006 @@ -10,8 +10,8 @@ ********************************************************************************/ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - +require_once('include/CustomFieldUtil.php'); +global $mod_strings,$adb; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings['NEW']." ".$mod_strings[$_REQUEST['fld_module']]." ".$mod_strings['CUSTOMFIELD'], true); require_once('XTemplate/xtpl.php'); global $mod_strings; @@ -22,8 +22,37 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); - +$tabid=$_REQUEST['tabid']; +$fieldid=$_REQUEST['fieldid']; $xtpl=new XTemplate ('modules/Settings/customfield.html'); +if(isset($fieldid) && $fieldid!='') +{ + $mode='edit'; + $customfield_columnname=getCustomFieldData($tabid,$fieldid,'columnname'); + $customfield_typeofdata=getCustomFieldData($tabid,$fieldid,'typeofdata'); + $customfield_fieldlabel=getCustomFieldData($tabid,$fieldid,'fieldlabel'); + $customfield_typename=getCustomFieldTypeName($_REQUEST['uitype']); + $fieldtype_lengthvalue=getFldTypeandLengthValue($customfield_typename,$customfield_typeofdata); + list($fieldtype,$fieldlength,$decimalvalue)= explode(";",$fieldtype_lengthvalue); + $xtpl->assign("LABELVALUE",$customfield_fieldlabel); + $xtpl->assign("LENGTHVALUE",$fieldlength); + $xtpl->assign("DECIMALVALUE",$decimalvalue); + if($fieldtype == '7') + { + $query = "select * from ".$customfield_columnname; + $result = $adb->query($query); + $fldVal=''; + while($row = $adb->fetch_array($result)) + { + $fldVal .= $row[$customfield_columnname]; + $fldVal .= "\n"; + } + $xtpl->assign("PICKLISTVALUE",$fldVal); + } + $xtpl->assign("FLDTYPEVALUE", $fieldtype); + $xtpl->assign("FLDID", $fieldid); + $xtpl->assign("COLUMN",$customfield_columnname); +} $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); $xtpl->assign("FLD_MODULE", $_REQUEST['fld_module']); @@ -35,7 +64,6 @@ $xtpl->assign("LENGTHVALUE", $_REQUEST["fldlength"]); $xtpl->assign("DECIMALVALUE", $_REQUEST["flddecimal"]); $xtpl->assign("PICKLISTVALUE", $_REQUEST["fldPickList"]); - //$xtpl->assign("FLDTYPEVALUE", $_REQUEST["fldType"]); $typeVal = Array( 'Text'=>'0', 'Number'=>'1', From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 09:04:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 14:04:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4432 - /vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Message-ID: <20060324140453.2F3254EBF57@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 07:04:48 2006 New Revision: 4432 Log: parenttab has been included for customfield Modified: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Modified: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl Fri Mar 24 07:04:48 2006 @@ -1,3 +1,17 @@ +{**} +
    *ProductQty In Stock*Qty Unit Price *List Price
     
     
     
         		  
         		  
    + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} {else} {/if} + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 03:04:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 08:04:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4418 - /vtigercrm/trunk/Smarty/templates/salesEditView.tpl Message-ID: <20060324080418.865AE4EBC45@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 01:04:06 2006 New Revision: 4418 Log: * Added to display the Product Details Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Mar 24 01:04:06 2006 @@ -171,6 +171,110 @@ {assign var="fldname" value="$maindata[2][0]"} {assign var="fldvalue" value="$maindata[3][0]"} {assign var="secondvalue" value="$maindata[3][1]"} + + + + + {if $header eq 'Product Details'} + + + + + + + {/if} + + + {if $uitype eq 2} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 04:15:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 09:15:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4419 - in /vtigercrm/trunk/install: 2setConfig.php 3confirmConfig.php Message-ID: <20060324091501.6E5144EBCD8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 02:14:38 2006 New Revision: 4419 Log: dbtype select option is given and database version check is added Modified: vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 06:11:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 11:11:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4420 - /vtigercrm/trunk/install/5createTables.inc.php Message-ID: <20060324111123.3F7104EBDE5@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 04:11:17 2006 New Revision: 4420 Log: tab cloud population removed Modified: vtigercrm/trunk/install/5createTables.inc.php Modified: vtigercrm/trunk/install/5createTables.inc.php ============================================================================== --- vtigercrm/trunk/install/5createTables.inc.php (original) +++ vtigercrm/trunk/install/5createTables.inc.php Fri Mar 24 04:11:17 2006 @@ -157,7 +157,7 @@ $user->date_format = 'yyyy-mm-dd'; // added by jeri to populate default image and tagcloud for admin $user->imagename = 'admin.jpeg'; - $user->tagcloud = 'http://www.tagcloud.com/cloud/js/mycloud79/default/50'; + $user->tagcloud = ''; $user->defhomeview = 'home_metrics'; //added by philip for default default admin emailid if($admin_email == '') From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 07:13:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:13:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4421 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060324121323.52E1E4EBE68@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:13:13 2006 New Revision: 4421 Log: vtiger log has been removed Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Fri Mar 24 05:13:13 2006 @@ -17,9 +17,7 @@ include('adodb/adodb.inc.php'); require_once("adodb/adodb-xmlschema.inc.php"); -require_once('vtigerlogger.php'); -global $vtlog; -$vtlog = new vtigerLogger(); +$log =& LoggerManager::getLogger('VT'); class PearDatabase{ var $database = null; @@ -185,7 +183,7 @@ * Contributor(s): ______________________________________.. */ function checkConnection(){ -global $vtlog; +global $log; if(!isset($this->database)) { $this->println("TRANS creating new connection"); @@ -202,7 +200,7 @@ else { // $this->println("checkconnect using old connection"); - $vtlog->logthis('checkconnect using old connection','info'); + $log->info('checkconnect using old connection'); } } @@ -227,9 +225,9 @@ function query($sql, $dieOnError=false, $msg='') { - global $vtlog; + global $log; //$this->println("ADODB query ".$sql); - $vtlog->logthis('query being executed : '.$sql,'debug'); + $log->debug('query being executed : '.$sql); $this->checkConnection(); $result = & $this->database->Execute($sql); $this->lastmysqlrow = -1; @@ -282,9 +280,9 @@ function limitQuery($sql,$start,$count, $dieOnError=false, $msg='') { - global $vtlog; + global $log; //$this->println("ADODB limitQuery sql=".$sql." st=".$start." co=".$count); - $vtlog->logthis(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count,'debug'); + $log->debug(' limitQuery sql = '.$sql .' st = '.$start .' co = '.$count); $this->checkConnection(); $result =& $this->database->SelectLimit($sql,$count,$start); if(!$result) $this->checkError($msg.' Limit Query Failed:' . $sql . '::', $dieOnError); @@ -397,12 +395,12 @@ */ function getRowCount(&$result){ - global $vtlog; + global $log; //$this->println("ADODB getRowCount"); if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $vtlog->logthis('getRowCount rows= '.$rows,'debug'); + $log->debug('getRowCount rows= '.$rows); return $rows; } @@ -459,12 +457,12 @@ }*/ function getAffectedRowCount(&$result){ - global $vtlog; + global $log; // $this->println("ADODB getAffectedRowCount"); - $vtlog->logthis('getAffectedRowCount','debug'); + $log->debug('getAffectedRowCount'); $rows =$this->database->Affected_Rows(); // $this->println("ADODB getAffectedRowCount rows=".rows); - $vtlog->logthis('getAffectedRowCount rows = '.$rows,'debug'); + $log->debug('getAffectedRowCount rows = '.$rows); return $rows; } @@ -574,10 +572,10 @@ */ function getNextRow(&$result, $encode=true){ - global $vtlog; + global $log; //$this->println("ADODB getNextRow"); - $vtlog->logthis('getNextRow','info'); + $log->info('getNextRow'); if(isset($result)){ $row = $this->change_key_case($result->FetchRow()); if($row && $encode&& is_array($row))return array_map('to_html', $row); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 07:13:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:13:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4422 - /vtigercrm/trunk/vtigerversion.php Message-ID: <20060324121333.CA6174EBE69@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:13:29 2006 New Revision: 4422 Log: Space removed Modified: vtigercrm/trunk/vtigerversion.php Modified: vtigercrm/trunk/vtigerversion.php ============================================================================== --- vtigercrm/trunk/vtigerversion.php (original) +++ vtigercrm/trunk/vtigerversion.php Fri Mar 24 05:13:29 2006 @@ -8,7 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - $patch_version = ''; $modified_database = ''; $vtiger_current_version = '4.2 GA'; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 07:19:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:19:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4423 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060324121932.08CA84EBE76@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:19:26 2006 New Revision: 4423 Log: code for multiselectcombobox has been included Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Fri Mar 24 05:19:26 2006 @@ -296,6 +296,19 @@ {/foreach} + {elseif $uitype eq 33} + + {elseif $uitype eq 53} + {elseif $uitype eq 33} + + {elseif $uitype eq 53} + + + +
      Sub Total
    + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + + {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS.1} + {assign var="txtProduct" value="txtProduct"|cat:$row_no} + {assign var="qtyInStock" value="qtyInStock"|cat:$row_no} + {assign var="txtQty" value="txtQty"|cat:$row_no} + {assign var="unitPrice" value="unitPrice"|cat:$row_no} + {assign var="txtListPrice" value="txtListPrice"|cat:$row_no} + {assign var="total" value="total"|cat:$row_no} + {assign var="hdnProductId" value="hdnProductId"|cat:$row_no} + {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no} + {assign var="hdnTotal" value="hdnTotal"|cat:$row_no} + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + {/foreach} +
    *ProductQty In Stock*QtyUnit Price *List PriceTotal 
     
    {$data.$qtyInStock}
     
    {$data.$unitPrice}
         		 
    {$data.$total}
         		 + + +   +
    +
    + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {else} + + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     Sub Total 
      Tax 
      Adjusment 
      Grand Total 
    + + + +
    + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 07:22:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:22:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4424 - /vtigercrm/trunk/Smarty/templates/salesEditView.tpl Message-ID: <20060324122234.A6DC84EBE83@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:22:29 2006 New Revision: 4424 Log: changes made to integrate multiselect combo box Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Fri Mar 24 05:22:29 2006 @@ -318,6 +318,19 @@ {/foreach} + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 07:25:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 12:25:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4425 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060324122556.339744EBE90@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 05:25:51 2006 New Revision: 4425 Log: check for uitype=33 has been made Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Mar 24 05:25:51 2006 @@ -105,7 +105,7 @@ $fieldvalue[] = array($date_format=>$current_user->date_format.' '.$app_strings['YEAR_MONTH_DATE']); } } - elseif($uitype == 15 || $uitype == 16) + elseif($uitype == 15 || $uitype == 16 || $uitype == 33) { $editview_label[]=$mod_strings[$fieldlabel]; $pick_query="select * from ".$fieldname; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:05:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:05:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4426 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060324130539.BF0C54EBEE5@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:05:35 2006 New Revision: 4426 Log: changes made for customfield edit Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Fri Mar 24 06:05:35 2006 @@ -9,20 +9,11 @@ * ********************************************************************************/ require_once('include/database/PearDatabase.php'); -//require_once('adodb/adodb.php'); $fldmodule=$_REQUEST['fld_module']; $fldlabel=$_REQUEST['fldLabel']; $fldType= $_REQUEST['fieldType']; - -/* - -echo 'module is ' .$fldmodule; -echo 'label is '. $fldlabel; -echo 'field type is ' .$fldType; - -*/ - + $parenttab=$_REQUEST['parenttab']; function fetchTabIDVal($fldmodule) { @@ -74,30 +65,22 @@ $fldPickList=''; } - header("Location:index.php?module=Settings&action=CreateCustomField&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&duplicate=yes"); + header("Location:index.php?module=Settings&action=CreateCustomField&fld_module=".$fldmodule."&fldType=".$fldType."&fldlabel=".$fldlabel."&fldlength=".$fldlength."&flddecimal=".$flddecimal."&fldPickList=".$fldPickList."&parenttab=".$parenttab."&duplicate=yes"); } else { - /* - //Creating the ColumnName - $sql = "select max(fieldid) fieldid from customfields"; - $result = $adb->query($sql); - if($adb->num_rows($result) != 0) - { - $row = $adb->fetch_array($result); - $max_fieldid = $row["fieldid"]; - $max_fieldid++; - } - else - { - $max_fieldid = "1"; - } - */ + if($_REQUEST['fieldid'] == '') + { + $max_fieldid = $adb->getUniqueID("field"); + $columnName = 'cf_'.$max_fieldid; + } + else + { + $max_fieldid = $_REQUEST['column']; + $columnName = $max_fieldid; + } - $max_fieldid = $adb->getUniqueID("field"); - - $columnName = 'cf_'.$max_fieldid; //Assigning the table Name $tableName =''; if($fldmodule == 'Leads') @@ -168,14 +151,12 @@ { $uichekdata='V~O~LE~'.$fldlength; $uitype = 1; - //$type = "varchar(".$fldlength.")"; $type = "C(".$fldlength.")"; // adodb type } elseif($fldType == 'Number') { $uitype = 7; - //$type="double(".$fldlength.",".$decimal.")"; //this may sound ridiculous passing decimal but that is the way adodb wants $dbfldlength = $fldlength + $decimal + 1; @@ -185,14 +166,12 @@ elseif($fldType == 'Percent') { $uitype = 9; - //$type="double(".$fldlength.",".$decimal.")"; $type="N(5.2)"; //adodb type $uichekdata='N~O~2~2'; } elseif($fldType == 'Currency') { $uitype = 71; - //$type="double(".$fldlength.",".$decimal.")"; $dbfldlength = $fldlength + $decimal + 1; $type="N(".$dbfldlength.".".$decimal.")"; //adodb type $uichekdata='N~O~'.$fldlength .','.$decimal; @@ -201,21 +180,18 @@ { $uichekdata='D~O'; $uitype = 5; - //$type = "date"; $type = "D"; // adodb type } elseif($fldType == 'Email') { $uitype = 13; - //$type = "varchar(50)"; $type = "C(50)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'Phone') { $uitype = 11; - //$type = "varchar(30)"; $type = "C(30)"; //adodb type $uichekdata='V~O'; @@ -223,21 +199,18 @@ elseif($fldType == 'Picklist') { $uitype = 15; - //$type = "varchar(255)"; $type = "C(255)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'URL') { $uitype = 17; - //$type = "varchar(255)"; $type = "C(255)"; //adodb type $uichekdata='V~O'; } elseif($fldType == 'Checkbox') { $uitype = 56; - //$type = "varchar(255)"; $type = "C(3) default 0"; //adodb type $uichekdata='C~0'; } @@ -247,6 +220,12 @@ $type = "X"; //adodb type $uichekdata='V~0'; } + elseif($fldType == 'MultiSelectCombo') + { + $uitype = 33; + $type = "X"; //adodb type + $uichekdata='V~0'; + } // No Decimal Pleaces Handling @@ -257,9 +236,11 @@ //1. add the customfield table to the field table as Block4 //2. fetch the contents of the custom field and show in the UI - //$query = "insert into customfields values('','".$columnName."','".$tableName."',2,".$uitype.",'".$fldlabel."','0','".$fldmodule."')"; //retreiving the sequence - $custfld_fieldid=$adb->getUniqueID("field"); + if($_REQUEST['fieldid'] == '') + { + $custfld_fieldid=$adb->getUniqueID("field"); + } $custfld_sequece=$adb->getUniqueId("customfield_sequence"); $blockid =''; @@ -268,13 +249,19 @@ if(is_numeric($blockid)) { - - $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; - - $adb->query($query); - - $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); - + if($_REQUEST['fieldid'] == '') + { + $query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'ADV')"; + $adb->query($query); + $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); + } + else + { + $query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid']; + $adb->query($query); + $adb->alterTable($tableName, $columnName, "Delete_Column"); + $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); + } //Inserting values into profile2field tables $sql1 = "select * from profile"; $sql1_result = $adb->query($sql1); @@ -291,11 +278,9 @@ $adb->query($sql_def); - if($fldType == 'Picklist') + if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo') { // Creating the PickList Table and Populating Values - /*$query = "create table ".$fldmodule."_".$columnName." (".$columnName." varchar(255) NOT NULL)"; - mysql_query($query);*/ $adb->createTable($columnName, $columnName." C(255)"); //Adding Primary Key $qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")"; @@ -322,6 +307,6 @@ $adb->query($sql_def); } } - header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fldmodule); + header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fldmodule."&parenttab=".$parenttab); } ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:18:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:18:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4427 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060324131834.581CC4EBEFA@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:18:30 2006 New Revision: 4427 Log: label for multiselect combo box has been included Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Fri Mar 24 06:18:30 2006 @@ -233,6 +233,8 @@ 'Phone'=>'Phone', 'PickList'=>'Pick List', + +'LBL_MULTISELECT_COMBO'=>'Multi-Select Combo Box', From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:27:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:27:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4428 - /vtigercrm/trunk/modules/Settings/fieldtypes.php Message-ID: <20060324132738.5D4304EBF13@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:27:18 2006 New Revision: 4428 Log: changes made to create multiselect combobox custom field Modified: vtigercrm/trunk/modules/Settings/fieldtypes.php Modified: vtigercrm/trunk/modules/Settings/fieldtypes.php ============================================================================== --- vtigercrm/trunk/modules/Settings/fieldtypes.php (original) +++ vtigercrm/trunk/modules/Settings/fieldtypes.php Fri Mar 24 06:27:18 2006 @@ -82,6 +82,10 @@
    " width="20" height="20">
    " width="20" height="20">
    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:37:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:37:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4429 - /vtigercrm/trunk/modules/Settings/customfield.html Message-ID: <20060324133716.383474EBF29@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:37:11 2006 New Revision: 4429 Log: changes made for customfield edit and multiselect combo box Modified: vtigercrm/trunk/modules/Settings/customfield.html Modified: vtigercrm/trunk/modules/Settings/customfield.html ============================================================================== --- vtigercrm/trunk/modules/Settings/customfield.html (original) +++ vtigercrm/trunk/modules/Settings/customfield.html Fri Mar 24 06:37:11 2006 @@ -31,14 +31,6 @@ break; } } -/* while(pickListContent.indexOf("\n")!=-1) { - if (pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) { - pickListAry[i]=pickListContent.substr(0,pickListContent.indexOf("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '') - pickListContent=pickListContent.substr(pickListContent.indexOf("\n")+1,pickListContent.length) - i++ - } else break; - } -*/ } else if (pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) { pickListAry[0]=pickListContent.replace(/^\s+/g, '').replace(/\s+$/g, '') } @@ -115,8 +107,8 @@ } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 24 08:46:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Mar 2006 13:46:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4430 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060324134659.DCB884EBF40@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 24 06:46:54 2006 New Revision: 4430 Log: edit link has been included Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Fri Mar 24 06:46:54 2006 @@ -21,6 +21,8 @@ echo '
    '; echo ''; echo ''; +echo ''; +echo ''; echo ''; echo '
    '; $list .= ''.$mod_strings['Delete'].''; + $list .=' | '.$mod_strings['Edit'].''; + $list .= '
    {include file='SettingsMenu.tpl'} @@ -8,18 +22,18 @@ +{$MOD.LEADCUSTOMFIELDS}
    {$MOD.LBL_SETTINGS} > {$MOD.LBL_STUDIO} > {$MOD.LBL_CUSTOM_FIELD_SETTINGS}
    -{$MOD.LEADCUSTOMFIELDS} -{$MOD.ACCOUNTCUSTOMFIELDS}
    -{$MOD.CONTACTCUSTOMFIELDS} -{$MOD.OPPORTUNITYCUSTOMFIELDS}
    -{$MOD.HELPDESKCUSTOMFIELDS} -{$MOD.PRODUCTCUSTOMFIELDS}
    -{$MOD.VENDORCUSTOMFIELDS} -{$MOD.PRICEBOOKCUSTOMFIELDS}
    -{$MOD.POCUSTOMFIELDS} -{$MOD.SOCUSTOMFIELDS}
    -{$MOD.QUOTESCUSTOMFIELDS} -{$MOD.INVOICECUSTOMFIELDS}
    +{$MOD.ACCOUNTCUSTOMFIELDS}
    +{$MOD.CONTACTCUSTOMFIELDS} +{$MOD.OPPORTUNITYCUSTOMFIELDS}
    +{$MOD.HELPDESKCUSTOMFIELDS} +{$MOD.PRODUCTCUSTOMFIELDS}
    +{$MOD.VENDORCUSTOMFIELDS} +{$MOD.PRICEBOOKCUSTOMFIELDS}
    +{$MOD.POCUSTOMFIELDS} +{$MOD.SOCUSTOMFIELDS}
    +{$MOD.QUOTESCUSTOMFIELDS} +{$MOD.INVOICECUSTOMFIELDS}
    + {$fldlabel} + + + From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:01:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:01:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4504 - in /vtigercrm/trunk/modules/Home: Forms.php home_rss.php index.php Message-ID: <20060328050112.04BE14FF57F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:01:05 2006 New Revision: 4504 Log: junk code removed in homepage Modified: vtigercrm/trunk/modules/Home/Forms.php vtigercrm/trunk/modules/Home/home_rss.php vtigercrm/trunk/modules/Home/index.php Modified: vtigercrm/trunk/modules/Home/Forms.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Home/home_rss.php ============================================================================== --- vtigercrm/trunk/modules/Home/home_rss.php (original) +++ vtigercrm/trunk/modules/Home/home_rss.php Mon Mar 27 22:01:05 2006 @@ -32,10 +32,7 @@ //retrieving notifications****************************** //<<<<<<<<<<<<<<<< start of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> $query = "select crmentity.setype,crmentity.crmid,crmentity.smcreatorid,crmentity.modifiedtime from crmentity inner join ownernotify on crmentity.crmid=ownernotify.crmid"; -//where ownernotify.smownerid=".$current_user->id; -//echo $query; -//$notify=array ('Accounts' =>0,'Potentials'=>0,'Contacts'=>0,'Leads'=>0,'Vendor'=>0,'Products'=>0,'Faq'=>0,'HelpDesk'=>0,'Activities'=>0); $result = $adb->query($query); for($i=0;$i<$adb->num_rows($result);$i++) { @@ -120,24 +117,6 @@ -/* if($notify['Accounts']>0) - $notify_values='Accounts '.$notify['Accounts'].'
    '; - if($notify['Potentials']>0) - $notify_values.='Potentials '.$notify['Potentials'].'
    '; - if($notify['Contacts']>0) - $notify_values.='Contacts '.$notify['Contacts'].'
    '; - if($notify['Leads']>0) - $notify_values.='Leads '.$notify['Leads'].'
    '; - if($notify['Vendor']>0) - $notify_values.='Vendor '.$notify['Vendor'].'
    '; - if($notify['Products']>0) - $notify_values.='Products '.$notify['Products'].'
    '; - if($notify['Faq']>0) - $notify_values.='Faq '.$notify['Faq'].'
    '; - if($notify['HelpDesk']>0) - $notify_values.='Ticket '.$notify['HelpDesk'].'
    '; - if($notify['Activities']>0) - $notify_values.='Activity '.$notify['Activities'];*/ //<<<<<<<<<<<<<<<< end of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> // Variable reassignment and reformatting for author @@ -145,9 +124,6 @@ $entry_author = getUserName($author_id); $entry_author = htmlspecialchars ($entry_author); - //$entry_text = strip_tags($db->query_result($tktresult,$i,'description')); - //$entry_id = $db->query_result($tktresult,$i,'ticketid'); - //$entry_title = htmlspecialchars($db->query_result($tktresult,$i,'title')); $entry_link = $site_URL."/index.php?modules=".$mod_notify[$i]['setype']."&action=DetailView&record=".$mod_notify[$i]['crmid']; $entry_link = htmlspecialchars($entry_link); $entry_time = $db->query_result($result,$i,'modifiedtime'); Modified: vtigercrm/trunk/modules/Home/index.php ============================================================================== --- vtigercrm/trunk/modules/Home/index.php (original) +++ vtigercrm/trunk/modules/Home/index.php Mon Mar 27 22:01:05 2006 @@ -39,12 +39,6 @@ $task_title = $mod_strings['LBL_OPEN_TASKS']; -?> - - -'; - $custfld .= ''; - if($uitype == 13) - { - $custfld .= ''; - } - else - { - $custfld .= ''; - } - $i++; - if($i<$noofrows) - { - $fldName=$adb->query_result($result,$i,"fieldlabel"); - $colName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if($adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($colName)); - } - else - { - $value=''; - } - $custfld .= ''; - if($uitype == 13) - { - - $custfld .= ''; - } - else - { - $custfld .= ''; - } - } - - - $custfld .= ''; - - } - } - return $custfld; -} - +/** + * Function to get custom fields + * @param $module :: table name -- Type string + * returns customfields in key-value pair array format + */ function getCustomFieldArray($module) { global $adb; @@ -298,6 +99,12 @@ } +/** + * Function to get columnname and fieldlabel from field table + * @param $module :: module name -- Type string + * @param $trans_array :: translated column fields -- Type array + * returns trans_array in key-value pair array format + */ function getCustomFieldTrans($module, $trans_array) { global $adb; @@ -315,89 +122,13 @@ } -function CustomFieldSearch($customfieldarray, $fldModule, $tableName,$colidName,$app_strings,$theme,$fieldlabel,$column) -{ - global $adb; - $adb->println("function CustomFieldSearch to display the customfields in search -- include/CustomFieldUtil.php"); - //for($i=0;$i Custom Field : '.$i.'...'.$customfieldarray[$i];} - - //Custom Field Addition - $dbquery = "select * from field where tablename='".$fldModule."' order by fieldlabel"; - $result = $adb->query($dbquery); - if($adb->num_rows($result) != 0) - { - $noofrows = $adb->num_rows($result); - - $custfld = '
    - Author: saraj Date: Mon Mar 27 22:08:32 2006 New Revision: 4505 Log: junk code has been removed and changes made for multiselectcombo box Modified: vtigercrm/trunk/include/CustomFieldUtil.php Modified: vtigercrm/trunk/include/CustomFieldUtil.php ============================================================================== --- vtigercrm/trunk/include/CustomFieldUtil.php (original) +++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Mar 27 22:08:32 2006 @@ -12,6 +12,11 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); +/** + * Function to get field typename + * @param $uitype :: uitype -- Type integer + * returns the field type name -- Type string + */ function getCustomFieldTypeName($uitype) { global $log; @@ -73,215 +78,11 @@ return $fldname; } - -function CustomFieldEditView($id, $fldModule, $tableName, $colidName, $app_strings, $theme) -{ - - global $adb; - //Custom Field Addition - $dbquery = "select * from field where tablename='".$fldModule."'"; - $result = $adb->query($dbquery); - if($adb->num_rows($result) != 0) - { - if(isset($id)) - { - $custquery = 'select * from '.$tableName.' where '.$colidName."='".$id."'"; - $cust_result = $adb->query($custquery); - } - $noofrows = $adb->num_rows($result); - - $custfld = ''; - $custfld .= ''; - for($i=0; $i<$noofrows; $i++) - { - $colName=$adb->query_result($result,$i,"fieldlabel"); - $setName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if(isset($id) && $adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($setName)); - } - else - { - $value=''; - } - $custfld .= ' - '; - if($uitype == 5) - { - $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']); - $custfld .= ''; - $custfld .= ''; - } - elseif($uitype == 15) - { - $pick_query="select * from ".$fldModule."_".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - $custfld .= ''; - } - else - { - - $custfld .= ''; - } - $i++; - if($i<$noofrows) - { - $colName=$adb->query_result($result,$i,"fieldlabel"); - $setName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if(isset($id) && $adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,$setName); - } - else - { - $value=''; - } - $custfld .= ''; - if($uitype == 5) - { - $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']); - $custfld .= ''; - $custfld .= ''; - - } - elseif($uitype == 15) - { - $pick_query="select * from ".$fldModule."_".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - $custfld .= ''; - } - else - { - $custfld .= ''; - } - } - - $custfld .= ''; - - } - $custfld .= '
    Custom Information
    '.$colName.': (yyyy-mm-dd)'.$colName.': (yyyy-mm-dd)
    '; - return $custfld; - - } -} - -function CustomFieldDetailView($id, $fldModule, $tableName, $colidName) -{ - global $adb; - //Assigning custom field values - $dbquery = "select * from field where tablename='".$fldModule."'"; - $result = $adb->query($dbquery); - $adb->println($result); - if($adb->num_rows($result) != 0) - { - $custquery = 'select * from '.$tableName.' where '.$colidName."='".$id."'"; - $cust_result = $adb->query($custquery); - $adb->println($cust_result); - - $noofrows=$adb->num_rows($result); - $custfld = ''; - for($i=0; $i<$noofrows; $i++) - { - $fldName=$adb->query_result($result,$i,"fieldlabel"); - $colName=$adb->query_result($result,$i,"column_name"); - $uitype=$adb->query_result($result,$i,"uitype"); - if($adb->num_rows($cust_result) != 0) - { - $value=$adb->query_result($cust_result,0,strtolower($colName)); - } - else - { - $value=''; - $adb->println("emply value "); - } - $custfld .= '
    '.$fldName.':'.$value.''.$value.''.$fldName.':'.$value.''.$value.'
    '; - $custfld .= ''; - for($i=0; $i<$noofrows; $i++) - { - $id=$customfieldarray[$i]; - $colName=$column[$i]; - $setName=$fieldlabel[$i]; - $uitype[$i] = $adb->query_result($result,$i,'uitype'); - - if($uitype[$i] == 56) - { - $custfld .= ''; - if($customfieldarray[$i] == 'on') - { - $custfld .=''; - } - else - { - $custfld .=''; - } - } - elseif($uitype[$i] == 15) - { - //This elseif part is added to handle the picklist values in search -- after 4.2 patch2 - $pick_query="select * from ".$setName; - $pickListResult = $adb->query($pick_query); - $noofpickrows = $adb->num_rows($pickListResult); - - $custfld .= ''; - $custfld .= ''; - } - else - { - $custfld .= ''; - - $custfld .= ''; - if($i%2==1) - { - $custfld .= ''; - } - } - } - - $custfld .= '
    '.$app_strings['LBL_CUSTOM_INFORMATION'].'
    '.$colName.':'.$colName.':'.$colName.':
    '; - return $custfld; - - } -} - +/** + * Function to get customfield record from field table + * @param $tab :: Tab ID -- Type integer + * @param $datatype :: field name -- Type string + * @param $id :: field Id -- Type integer + * returns the data result in string format + */ function getCustomFieldData($tab,$id,$datatype) { global $adb; @@ -407,6 +138,14 @@ return $return_data[$datatype]; } + +/** + * Function to get customfield type,length value,decimal value and picklist value + * @param $label :: field typename -- Type string + * @param $typeofdata :: datatype -- Type string + * returns the field type,length,decimal + * and picklist value in ';' separated array format + */ function getFldTypeandLengthValue($label,$typeofdata) { if($label == 'Text') @@ -463,6 +202,10 @@ { $fieldtype = '10'; } + elseif($label == 'Multi-Select Combo Box') + { + $fieldtype = '11'; + } return $fieldtype; } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:13:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:13:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4506 - /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Message-ID: <20060328051303.9D2F34F288B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:12:59 2006 New Revision: 4506 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php ============================================================================== --- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original) +++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Mon Mar 27 22:12:59 2006 @@ -15,16 +15,7 @@ $fldType= $_REQUEST['fieldType']; $parenttab=$_REQUEST['parenttab']; -function fetchTabIDVal($fldmodule) -{ - - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($fldmodule); +$tabid = getTabid($fldmodule); if(get_magic_quotes_gpc() == 1) { @@ -259,8 +250,6 @@ { $query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid']; $adb->query($query); - $adb->alterTable($tableName, $columnName, "Delete_Column"); - $adb->alterTable($tableName, $columnName." ".$type, "Add_Column"); } //Inserting values into profile2field tables $sql1 = "select * from profile"; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:16:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:16:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4507 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060328051600.71E6D4FFC73@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:15:56 2006 New Revision: 4507 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Mon Mar 27 22:15:56 2006 @@ -15,7 +15,6 @@ global $mod_strings; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings[$_REQUEST['fld_module']].$mod_strings['CustomFields'] , true); -//or die("Couldn't connect to database $dbDatabase"); echo ''; echo ''; @@ -34,18 +33,8 @@ echo '
    '; echo '
    '; -//onclick="this.form.return_module.value="Settings"; this.form.action.value="index" - -function fetchTabIDVal($fldmodule) -{ - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($_REQUEST['fld_module']); +$tabid = getTabid($_REQUEST['fld_module']); $fld_module = $_REQUEST['fld_module']; echo getCustomFieldList($tabid,$mod_strings,$fld_module); @@ -54,11 +43,8 @@ function getCustomFieldList($tabid, $mod_strings, $fld_module) { global $adb; - //fieldid,fieldlabel,column_name,typdesc - - $dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence"; - - $result = $adb->query($dbQuery) or die("Couldn't get file list"); + $dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence"; + $result = $adb->query($dbQuery) or die("Couldn't get file list"); $list = ''; @@ -77,14 +63,11 @@ $list .= $mod_strings['FieldName'].''; -//$list .= ''; $list .= ''; - -//$list .= ''; $i=1; while($row = $adb->fetch_array($result)) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:20:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:20:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4508 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060328052058.8A200505EFA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:20:54 2006 New Revision: 4508 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:21:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:21:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4509 - /vtigercrm/trunk/modules/Settings/ComboFieldList.php Message-ID: <20060328052125.09C63505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:21:20 2006 New Revision: 4509 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/ComboFieldList.php Modified: vtigercrm/trunk/modules/Settings/ComboFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/ComboFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/ComboFieldList.php Mon Mar 27 22:21:20 2006 @@ -9,7 +9,6 @@ * All Rights Reserved. * ********************************************************************************/ - require_once('include/database/PearDatabase.php'); require_once('database/DatabaseConnection.php'); require_once('XTemplate/xtpl.php'); @@ -20,8 +19,6 @@ echo get_module_title("Settings",$mod_strings['LBL_MODULE_NAME'].": ".$mod_strings[$_REQUEST['fld_module']].$mod_strings['PicklistFields'], true); echo '
    '; -//echo get_form_header("Standard Fields", "", false ); - global $theme; $theme_path="themes/".$theme."/"; @@ -127,21 +124,7 @@ } - -function fetchTabIDVal($fldmodule) -{ - - global $adb; - $query = "select tabid from tab where tablabel='" .$fldmodule ."'"; - $tabidresult = $adb->query($query); - return $adb->query_result($tabidresult,0,"tabid"); -} - -$tabid = fetchTabIDVal($fldmodule); - - - - +$tabid = getTabid($fldmodule); //Standard PickList Fields function getStdOutput($custFldArray, $mod_strings) @@ -217,8 +200,7 @@ function getUserFldArray($fld_module) { $user_fld = Array(); - $query = "select * from field where generatedtype=2 and tabid=".fetchTabIDVal($fld_module)." and uitype IN (15,16)"; -// echo $query; + $query = "select * from field where generatedtype=2 and tabid=".getTabid($fld_module)." and uitype IN (15,16)"; $result = mysql_query($query); $noofrows = mysql_num_rows($result); if($noofrows > 0) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:21:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:21:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4510 - /vtigercrm/trunk/modules/CustomView/EditView.html Message-ID: <20060328052146.947E9505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:21:42 2006 New Revision: 4510 Log: file removed as customview has been smartified Removed: vtigercrm/trunk/modules/CustomView/EditView.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:22:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:22:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4511 - in /vtigercrm/trunk/modules/CustomView: CustomView.php EditView.php Forms.php ListViewTop.php PopulateCustomView.php Save.php SaveAction.php SendMailAction.php Message-ID: <20060328052245.25530505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:22:35 2006 New Revision: 4511 Log: junk code removed in customview Modified: vtigercrm/trunk/modules/CustomView/CustomView.php vtigercrm/trunk/modules/CustomView/EditView.php vtigercrm/trunk/modules/CustomView/Forms.php vtigercrm/trunk/modules/CustomView/ListViewTop.php vtigercrm/trunk/modules/CustomView/PopulateCustomView.php vtigercrm/trunk/modules/CustomView/Save.php vtigercrm/trunk/modules/CustomView/SaveAction.php vtigercrm/trunk/modules/CustomView/SendMailAction.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Mon Mar 27 22:22:35 2006 @@ -154,14 +154,13 @@ function getCustomViewCombo($viewid='') { global $adb; - $tabid = getTabid($this->customviewmodule); - $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; - $ssql .= " where tab.tabid=".$tabid; - //echo $ssql; - $result = $adb->query($ssql); - while($cvrow=$adb->fetch_array($result)) - { - if($cvrow['cvid'] == $viewid) + $tabid = getTabid($this->customviewmodule); + $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; + $ssql .= " where tab.tabid=".$tabid; + $result = $adb->query($ssql); + while($cvrow=$adb->fetch_array($result)) + { + if($cvrow['cvid'] == $viewid) { $shtml .= ""; $this->setdefaultviewid = $cvrow['cvid']; @@ -170,84 +169,78 @@ { $shtml .= ""; } - } - //echo $shtml; - return $shtml; + } + return $shtml; } function getColumnsListbyBlock($module,$block) - { - global $adb; - $tabid = getTabid($module); - global $profile_id; - - $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + + $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; $sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and"; $sql.= " field.displaytype in (1,2) and profile2field.visible=0"; $sql.= " and profile2field.profileid=".$profile_id." order by sequence"; $result = $adb->query($sql); - $noofrows = $adb->num_rows($result); + $noofrows = $adb->num_rows($result); //Added on 14-10-2005 -- added ticket id in list - if($module == 'HelpDesk' && $block == 25) - { - $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; - } + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; + } //Added to include activity type in activity customview list - if($module == 'Activities' && $block == 19) - { - $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; - } - - for($i=0; $i<$noofrows; $i++) - { - $fieldtablename = $adb->query_result($result,$i,"tablename"); - $fieldcolname = $adb->query_result($result,$i,"columnname"); + if($module == 'Activities' && $block == 19) + { + $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; + } + + for($i=0; $i<$noofrows; $i++) + { + $fieldtablename = $adb->query_result($result,$i,"tablename"); + $fieldcolname = $adb->query_result($result,$i,"columnname"); $fieldname = $adb->query_result($result,$i,"fieldname"); $fieldtype = $adb->query_result($result,$i,"typeofdata"); $fieldtype = explode("~",$fieldtype); $fieldtypeofdata = $fieldtype[0]; - /*if($fieldcolname == "crmid" || $fieldcolname == "parent_id") - { - $fieldtablename = "crmentity"; - $fieldcolname = "setype"; - }*/ - $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); - if($fieldlabel == "Related To") - { - $fieldlabel = "Related to"; - } - if($fieldlabel == "Start Date & Time") - { - $fieldlabel = "Start Date"; - if($module == 'Activities' && $block == 19) - $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; - - } - $fieldlabel1 = str_replace(" ","_",$fieldlabel); - $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1.":".$fieldtypeofdata; - $module_columnlist[$optionvalue] = $fieldlabel; + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + if($fieldlabel == "Related To") + { + $fieldlabel = "Related to"; + } + if($fieldlabel == "Start Date & Time") + { + $fieldlabel = "Start Date"; + if($module == 'Activities' && $block == 19) + $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; + + } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1.":".$fieldtypeofdata; + $module_columnlist[$optionvalue] = $fieldlabel; if($fieldtype[1] == "M") { $this->mandatoryvalues[] = "'".$optionvalue."'"; $this->showvalues[] = $fieldlabel; } - } - return $module_columnlist; - } + } + return $module_columnlist; + } function getModuleColumnsList($module) - { - foreach($this->module_list[$module] as $key=>$value) - { - $columnlist = $this->getColumnsListbyBlock($module,$value); + { + foreach($this->module_list[$module] as $key=>$value) + { + $columnlist = $this->getColumnsListbyBlock($module,$value); if(isset($columnlist)) { $ret_module_list[$module][$key] = $columnlist; } - } - return $ret_module_list; - } - + } + return $ret_module_list; + } + function getColumnsListByCvid($cvid) { global $adb; @@ -255,7 +248,6 @@ $sSQL = "select cvcolumnlist.* from cvcolumnlist"; $sSQL .= " inner join customview on customview.cvid = cvcolumnlist.cvid"; $sSQL .= " where customview.cvid =".$cvid." order by cvcolumnlist.columnindex"; - //echo $sSQL; $result = $adb->query($sSQL); while($columnrow = $adb->fetch_array($result)) @@ -267,345 +259,339 @@ } function getStdCriteriaByModule($module) - { - global $adb; - $tabid = getTabid($module); - global $profile_id; - + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + foreach($this->module_list[$module] as $key=>$blockid) - { - $blockids[] = $blockid; - } - $blockids = implode(",",$blockids); - - $sql = "select * from field inner join tab on tab.tabid = field.tabid - inner join profile2field on profile2field.fieldid=field.fieldid - where field.tabid=".$tabid." and field.block in (".$blockids.") + { + $blockids[] = $blockid; + } + $blockids = implode(",",$blockids); + + $sql = "select * from field inner join tab on tab.tabid = field.tabid + inner join profile2field on profile2field.fieldid=field.fieldid + where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2) and profile2field.visible=0 and profile2field.profileid=".$profile_id." order by field.sequence"; - $result = $adb->query($sql); - - while($criteriatyperow = $adb->fetch_array($result)) - { - $fieldtablename = $criteriatyperow["tablename"]; - $fieldcolname = $criteriatyperow["columnname"]; - $fieldlabel = $criteriatyperow["fieldlabel"]; + $result = $adb->query($sql); + + while($criteriatyperow = $adb->fetch_array($result)) + { + $fieldtablename = $criteriatyperow["tablename"]; + $fieldcolname = $criteriatyperow["columnname"]; + $fieldlabel = $criteriatyperow["fieldlabel"]; $fieldname = $criteriatyperow["fieldname"]; - /*if($fieldtablename == "crmentity") - { - $fieldtablename = $fieldtablename.$module; - }*/ - $fieldlabel1 = str_replace(" ","_",$fieldlabel); - $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1; - $stdcriteria_list[$optionvalue] = $fieldlabel; - } - - return $stdcriteria_list; - - } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + $optionvalue = $fieldtablename.":".$fieldcolname.":".$fieldname.":".$module."_".$fieldlabel1; + $stdcriteria_list[$optionvalue] = $fieldlabel; + } + + return $stdcriteria_list; + + } function getStdFilterCriteria($selcriteria = "") - { + { $filter = array(); - $stdfilter = Array("custom"=>"Custom", - "prevfy"=>"Previous FY", - "thisfy"=>"Current FY", - "nextfy"=>"Next FY", - "prevfq"=>"Previous FQ", - "thisfq"=>"Current FQ", - "nextfq"=>"Next FQ", - "yesterday"=>"Yesterday", - "today"=>"Today", - "tomorrow"=>"Tomorrow", - "lastweek"=>"Last Week", - "thisweek"=>"Current Week", - "nextweek"=>"Next Week", - "lastmonth"=>"Last Month", - "thismonth"=>"Current Month", - "nextmonth"=>"Next Month", - "last7days"=>"Last 7 Days", - "last30days"=>"Last 30 Days", - "last60days"=>"Last 60 Days", - "last90days"=>"Last 90 Days", - "last120days"=>"Last 120 Days", - "next30days"=>"Next 30 Days", - "next60days"=>"Next 60 Days", - "next90days"=>"Next 90 Days", - "next120days"=>"Next 120 Days" - ); - - foreach($stdfilter as $FilterKey=>$FilterValue) - { - if($FilterKey == $selcriteria) - { - $shtml['value'] = $FilterKey; - $shtml['text'] = $FilterValue; - $shtml['selected'] = "selected"; - }else - { - $shtml['value'] = $FilterKey; - $shtml['text'] = $FilterValue; - $shtml['selected'] = ""; - } - $filter[] = $shtml; - } - return $filter; - - } + $stdfilter = Array("custom"=>"Custom", + "prevfy"=>"Previous FY", + "thisfy"=>"Current FY", + "nextfy"=>"Next FY", + "prevfq"=>"Previous FQ", + "thisfq"=>"Current FQ", + "nextfq"=>"Next FQ", + "yesterday"=>"Yesterday", + "today"=>"Today", + "tomorrow"=>"Tomorrow", + "lastweek"=>"Last Week", + "thisweek"=>"Current Week", + "nextweek"=>"Next Week", + "lastmonth"=>"Last Month", + "thismonth"=>"Current Month", + "nextmonth"=>"Next Month", + "last7days"=>"Last 7 Days", + "last30days"=>"Last 30 Days", + "last60days"=>"Last 60 Days", + "last90days"=>"Last 90 Days", + "last120days"=>"Last 120 Days", + "next30days"=>"Next 30 Days", + "next60days"=>"Next 60 Days", + "next90days"=>"Next 90 Days", + "next120days"=>"Next 120 Days" + ); + + foreach($stdfilter as $FilterKey=>$FilterValue) + { + if($FilterKey == $selcriteria) + { + $shtml['value'] = $FilterKey; + $shtml['text'] = $FilterValue; + $shtml['selected'] = "selected"; + }else + { + $shtml['value'] = $FilterKey; + $shtml['text'] = $FilterValue; + $shtml['selected'] = ""; + } + $filter[] = $shtml; + } + return $filter; + + } function getCriteriaJS() - { - $today = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d"), date("Y"))); - $tomorrow = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); - $yesterday = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-1, date("Y"))); - - $currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); - $currentmonth1 = date("Y-m-t"); - $lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01", date("Y"))); - $lastmonth1 = date("Y-m-t", strtotime("-1 Month")); - $nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01", date("Y"))); - $nextmonth1 = date("Y-m-t", strtotime("+1 Month")); - - $lastweek0 = date("Y-m-d",strtotime("-2 week Sunday")); - $lastweek1 = date("Y-m-d",strtotime("-1 week Saturday")); - - $thisweek0 = date("Y-m-d",strtotime("-1 week Sunday")); - $thisweek1 = date("Y-m-d",strtotime("this Saturday")); - - $nextweek0 = date("Y-m-d",strtotime("this Sunday")); - $nextweek1 = date("Y-m-d",strtotime("+1 week Saturday")); - - $next7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+6, date("Y"))); - $next30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+29, date("Y"))); - $next60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+59, date("Y"))); - $next90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+89, date("Y"))); - $next120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+119, date("Y"))); - - $last7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-6, date("Y"))); - $last30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-29, date("Y"))); - $last60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-59, date("Y"))); - $last90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-89, date("Y"))); - $last120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-119, date("Y"))); - - $currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y"))); - $currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"), date("Y"))); - $lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")-1)); - $lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1)); + { + $today = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d"), date("Y"))); + $tomorrow = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); + $yesterday = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-1, date("Y"))); + + $currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01", date("Y"))); + $currentmonth1 = date("Y-m-t"); + $lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01", date("Y"))); + $lastmonth1 = date("Y-m-t", strtotime("-1 Month")); + $nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01", date("Y"))); + $nextmonth1 = date("Y-m-t", strtotime("+1 Month")); + + $lastweek0 = date("Y-m-d",strtotime("-2 week Sunday")); + $lastweek1 = date("Y-m-d",strtotime("-1 week Saturday")); + + $thisweek0 = date("Y-m-d",strtotime("-1 week Sunday")); + $thisweek1 = date("Y-m-d",strtotime("this Saturday")); + + $nextweek0 = date("Y-m-d",strtotime("this Sunday")); + $nextweek1 = date("Y-m-d",strtotime("+1 week Saturday")); + + $next7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+6, date("Y"))); + $next30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+29, date("Y"))); + $next60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+59, date("Y"))); + $next90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+89, date("Y"))); + $next120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")+119, date("Y"))); + + $last7days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-6, date("Y"))); + $last30days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-29, date("Y"))); + $last60days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-59, date("Y"))); + $last90days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-89, date("Y"))); + $last120days = date("Y-m-d",mktime(0, 0, 0, date("m") , date("d")-119, date("Y"))); + + $currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y"))); + $currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"), date("Y"))); + $lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")-1)); + $lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1)); $nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01", date("Y")+1)); - $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); - - $sjsStr = ''; - - return $sjsStr; - } + $nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1)); + + $sjsStr = ''; + + return $sjsStr; + } function getStdFilterByCvid($cvid) - { - global $adb; - + { + global $adb; + $sSQL = "select cvstdfilter.* from cvstdfilter inner join customview on customview.cvid = cvstdfilter.cvid"; $sSQL .= " where cvstdfilter.cvid=".$cvid; - $result = $adb->query($sSQL); - $stdfilterrow = $adb->fetch_array($result); - - $stdfilterlist["columnname"] = $stdfilterrow["columnname"]; - $stdfilterlist["stdfilter"] = $stdfilterrow["stdfilter"]; - - if($stdfilterrow["stdfilter"] == "custom") - { - if($stdfilterrow["startdate"] != "0000-00-00") - { - $stdfilterlist["startdate"] = $stdfilterrow["startdate"]; - } - if($stdfilterrow["enddate"] != "0000-00-00") - { - $stdfilterlist["enddate"] = $stdfilterrow["enddate"]; - } - } - + $result = $adb->query($sSQL); + $stdfilterrow = $adb->fetch_array($result); + + $stdfilterlist["columnname"] = $stdfilterrow["columnname"]; + $stdfilterlist["stdfilter"] = $stdfilterrow["stdfilter"]; + + if($stdfilterrow["stdfilter"] == "custom") + { + if($stdfilterrow["startdate"] != "0000-00-00") + { + $stdfilterlist["startdate"] = $stdfilterrow["startdate"]; + } + if($stdfilterrow["enddate"] != "0000-00-00") + { + $stdfilterlist["enddate"] = $stdfilterrow["enddate"]; + } + } + return $stdfilterlist; - } + } //<<<<<<<>>>>>>>>>>>>> - function getAdvFilterByCvid($cvid) - { - global $adb; - global $modules; - + function getAdvFilterByCvid($cvid) + { + global $adb; + global $modules; + $sSQL = "select cvadvfilter.* from cvadvfilter inner join customview on cvadvfilter.cvid = customview.cvid"; $sSQL .= " where cvadvfilter.cvid=".$cvid; - //echo $sSQL; - $result = $adb->query($sSQL); - - while($advfilterrow = $adb->fetch_array($result)) - { - $advft["columnname"] = $advfilterrow["columnname"]; - $advft["comparator"] = $advfilterrow["comparator"]; - $advft["value"] = $advfilterrow["value"]; + $result = $adb->query($sSQL); + + while($advfilterrow = $adb->fetch_array($result)) + { + $advft["columnname"] = $advfilterrow["columnname"]; + $advft["comparator"] = $advfilterrow["comparator"]; + $advft["value"] = $advfilterrow["value"]; $advfilterlist[] = $advft; - } - - return $advfilterlist; - } - //<<<<<<<>>>>>>>>>>>>> + } + + return $advfilterlist; + } + //<<<<<<<>>>>>>>>>>>>> function getCvColumnListSQL($cvid) { $columnslist = $this->getColumnsListByCvid($cvid); - //print_r($columnslist); if(isset($columnslist)) { foreach($columnslist as $columnname=>$value) @@ -614,19 +600,19 @@ if($value != "") { $list = explode(":",$value); - //$sqllist[] = $list[0].".".$list[1]; + //Added For getting status for Activities -Jaguar $sqllist_column = $list[0].".".$list[1]; - if($this->customviewmodule == "Activities") - { - if($list[1] == "status") - { - $sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus"; - } - } - $sqllist[] = $sqllist_column; - + if($this->customviewmodule == "Activities") + { + if($list[1] == "status") + { + $sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus"; + } + } + $sqllist[] = $sqllist_column; //Ends + $tablefield[$list[0]] = $list[1]; $fieldlabel = trim(str_replace($this->escapemodule," ",$list[3])); $this->list_fields[$fieldlabel] = $tablefield; @@ -641,9 +627,7 @@ function getCVStdFilterSQL($cvid) { global $adb; - $stdfilterlist = $this->getStdFilterByCvid($cvid); - //print_r($stdfilterlist); if(isset($stdfilterlist)) { foreach($stdfilterlist as $columnname=>$value) @@ -668,14 +652,12 @@ $startdate = $datearray[0]; $enddate = $datearray[1]; } - if($startdate != "" && $enddate != "") { $columns = explode(":",$filtercolumn); $stdfiltersql = $columns[0].".".$columns[1]." between '".$startdate." 00:00:00' and '".$enddate." 23:59:00'"; } } - //echo $stdfiltersql; return $stdfiltersql; } function getCVAdvFilterSQL($cvid) @@ -687,11 +669,10 @@ { if(isset($advfltrow)) { - //echo $advfltrow["columnname"]; $columns = explode(":",$advfltrow["columnname"]); if($advfltrow["columnname"] != "" && $advfltrow["comparator"] != "" && $advfltrow["value"] != "") { - + $valuearray = explode(",",trim($advfltrow["value"])); if(isset($valuearray) && count($valuearray) > 1) { @@ -705,11 +686,11 @@ }else { //Added for getting activity Status -Jaguar - if($this->customviewmodule == "Activities" && $columns[1] == "status") - { - $advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"])); - } - else + if($this->customviewmodule == "Activities" && $columns[1] == "status") + { + $advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"])); + } + else { $advfiltersql[] = $this->getRealValues($columns[0],$columns[1],$advfltrow["comparator"],trim($advfltrow["value"])); } @@ -720,7 +701,7 @@ } if(isset($advfiltersql)) { - $advfsql = implode(" and ",$advfiltersql); + $advfsql = implode(" and ",$advfiltersql); } return $advfsql; } @@ -896,36 +877,25 @@ function getAdvComparator($comparator,$value) { -/* fLabels['e'] = 'equals'; - fLabels['n'] = 'not equal to'; - fLabels['s'] = 'starts with'; - fLabels['c'] = 'contains'; - fLabels['k'] = 'does not contain'; - fLabels['l'] = 'less than'; - fLabels['g'] = 'greater than'; - fLabels['m'] = 'less or equal'; - fLabels['h'] = 'greater or equal';*/ - //require_once('include/database/PearDatabase.php'); - if($comparator == "e") { if(trim($value) != "") - { - $rtvalue = " = ".PearDatabase::quote($value); - }else - { - $rtvalue = " is NULL"; - } + { + $rtvalue = " = ".PearDatabase::quote($value); + }else + { + $rtvalue = " is NULL"; + } } if($comparator == "n") { if(trim($value) != "") - { - $rtvalue = " <> ".PearDatabase::quote($value); - }else - { - $rtvalue = "is NOT NULL"; - } + { + $rtvalue = " <> ".PearDatabase::quote($value); + }else + { + $rtvalue = "is NOT NULL"; + } } if($comparator == "s") { @@ -955,7 +925,7 @@ { $rtvalue = " >= ".PearDatabase::quote($value); } - + return $rtvalue; } function getDateforStdFilterBytype($type) @@ -1163,12 +1133,6 @@ if($viewid != "" && $listquery != "") { $listviewquery = substr($listquery, strpos($listquery,'from'),strlen($listquery)); - //$listviewquery = substr($listviewquery,strpos($listviewquery,'from'),strpos($listviewquery,'where')); - - //$wherequery = substr($listquery, strpos($listquery,'where'),strlen($listquery)); - - - //echo $listviewquery." ".$wherequery; if($module == "Activities" || $module == "Emails") { $query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery; @@ -1195,7 +1159,6 @@ } } - //echo $query; return $query; } @@ -1223,46 +1186,22 @@ return $query; } - /*function getMetricsCustomView($viewnames) - { - global $adb; - $tabid = getTabid($this->customviewmodule); - $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; - $ssql .= " where ; - //echo $ssql; - $result = $adb->query($ssql); - while($cvrow=$adb->fetch_array($result)) - { - if($cvrow['setdefault'] == 1) - { - $shtml .= ""; - $this->setdefaultviewid = $cvrow['cvid']; - } - else - { - $shtml .= ""; - } - } - //echo $shtml; - return $shtml; - }*/ function getCustomActionDetails($cvid) { global $adb; $sSQL = "select customaction.* from customaction inner join customview on customaction.cvid = customview.cvid"; - $sSQL .= " where customaction.cvid=".$cvid; - //echo $sSQL; - $result = $adb->query($sSQL); - - while($carow = $adb->fetch_array($result)) - { - $calist["subject"] = $carow["subject"]; - $calist["module"] = $carow["module"]; - $calist["content"] = $carow["content"]; + $sSQL .= " where customaction.cvid=".$cvid; + $result = $adb->query($sSQL); + + while($carow = $adb->fetch_array($result)) + { + $calist["subject"] = $carow["subject"]; + $calist["module"] = $carow["module"]; + $calist["content"] = $carow["content"]; $calist["cvid"] = $carow["cvid"]; - } - return $calist; + } + return $calist; } function getParentId($fields,$values) Modified: vtigercrm/trunk/modules/CustomView/EditView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/EditView.php (original) +++ vtigercrm/trunk/modules/CustomView/EditView.php Mon Mar 27 22:22:35 2006 @@ -41,31 +41,31 @@ $smarty->assign("DATAFORMAT",$current_user->date_format); if($recordid == "") { - $oCustomView = new CustomView(); - $modulecollist = $oCustomView->getModuleColumnsList($cv_module); - $log->info('CustomView :: Successfully got ColumnsList for the module'.$cv_module); + $oCustomView = new CustomView(); + $modulecollist = $oCustomView->getModuleColumnsList($cv_module); + $log->info('CustomView :: Successfully got ColumnsList for the module'.$cv_module); if(isset($modulecollist)) { - $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist); + $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist); } //step2 - $stdfilterhtml = $oCustomView->getStdFilterCriteria(); - $log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module); + $stdfilterhtml = $oCustomView->getStdFilterCriteria(); + $log->info('CustomView :: Successfully got StandardFilter for the module'.$cv_module); $stdfiltercolhtml = getStdFilterHTML($cv_module); - $stdfilterjs = $oCustomView->getCriteriaJS(); + $stdfilterjs = $oCustomView->getCriteriaJS(); //step4 - $advfilterhtml = getAdvCriteriaHTML(); + $advfilterhtml = getAdvCriteriaHTML(); for($i=1;$i<10;$i++) - { - $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); - } + { + $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); + } $log->info('CustomView :: Successfully got AdvancedFilter for the module'.$cv_module); for($i=1;$i<6;$i++) - { - $smarty->assign("FOPTION".$i,$advfilterhtml); - $smarty->assign("BLOCK".$i,$choosecolhtml); - } + { + $smarty->assign("FOPTION".$i,$advfilterhtml); + $smarty->assign("BLOCK".$i,$choosecolhtml); + } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); @@ -82,7 +82,7 @@ $log->info('CustomView :: Successfully got ViewDetails for the Viewid'.$recordid); $modulecollist = $oCustomView->getModuleColumnsList($cv_module); $selectedcolumnslist = $oCustomView->getColumnsListByCvid($recordid); - $log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid); + $log->info('CustomView :: Successfully got ColumnsList for the Viewid'.$recordid); $smarty->assign("VIEWNAME",$customviewdtls["viewname"]); @@ -91,20 +91,20 @@ $smarty->assign("CHECKED","checked"); } if($customviewdtls["setmetrics"] == 1) - { - $smarty->assign("MCHECKED","checked"); - } + { + $smarty->assign("MCHECKED","checked"); + } for($i=1;$i<10;$i++) - { - $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$selectedcolumnslist[$i-1]); - $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); - } + { + $choosecolhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$selectedcolumnslist[$i-1]); + $smarty->assign("CHOOSECOLUMN".$i,$choosecolhtml); + } $stdfilterlist = $oCustomView->getStdFilterByCvid($recordid); $log->info('CustomView :: Successfully got Standard Filter for the Viewid'.$recordid); $stdfilterhtml = $oCustomView->getStdFilterCriteria($stdfilterlist["stdfilter"]); - $stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]); - $stdfilterjs = $oCustomView->getCriteriaJS(); + $stdfiltercolhtml = getStdFilterHTML($cv_module,$stdfilterlist["columnname"]); + $stdfilterjs = $oCustomView->getCriteriaJS(); if(isset($stdfilterlist["startdate"]) && isset($stdfilterlist["enddate"])) { @@ -113,24 +113,23 @@ } $advfilterlist = $oCustomView->getAdvFilterByCvid($recordid); - $log->info('CustomView :: Successfully got Advanced Filter for the Viewid'.$recordid,'info'); + $log->info('CustomView :: Successfully got Advanced Filter for the Viewid'.$recordid,'info'); for($i=1;$i<6;$i++) - { - $advfilterhtml = getAdvCriteriaHTML($advfilterlist[$i-1]["comparator"]); + { + $advfilterhtml = getAdvCriteriaHTML($advfilterlist[$i-1]["comparator"]); $advcolumnhtml = getByModule_ColumnsHTML($cv_module,$modulecollist,$advfilterlist[$i-1]["columnname"]); $smarty->assign("FOPTION".$i,$advfilterhtml); - $smarty->assign("BLOCK".$i,$advcolumnhtml); - //echo '
    ';print_r($advcolumnhtml);echo '
    '; + $smarty->assign("BLOCK".$i,$advcolumnhtml); $smarty->assign("VALUE".$i,$advfilterlist[$i-1]["value"]); - } + } $smarty->assign("STDFILTERCOLUMNS",$stdfiltercolhtml); - $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); - $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); + $smarty->assign("STDFILTERCRITERIA",$stdfilterhtml); + $smarty->assign("STDFILTER_JAVASCRIPT",$stdfilterjs); $smarty->assign("MANDATORYCHECK",implode(",",$oCustomView->mandatoryvalues)); $smarty->assign("SHOWVALUES",implode(",",$oCustomView->showvalues)); - + $cactionhtml = ""; if($cv_module == "Leads" || $cv_module == "Accounts" || $cv_module == "Contacts") @@ -153,120 +152,120 @@ $mod_strings = return_module_language($current_language,$module); foreach($oCustomView->module_list[$module] as $key=>$value) - { - $advfilter = array(); - $label = $app_list_strings['moduleList'][$module]." ".$key; - if(isset($columnslist[$module][$key])) - { - foreach($columnslist[$module][$key] as $field=>$fieldlabel) - { - if(isset($mod_strings[$fieldlabel])) - { - if($selected == $field) - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $mod_strings[$fieldlabel]; - $advfilter_option['selected'] = "selected"; - }else - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $mod_strings[$fieldlabel]; - $advfilter_option['selected'] = ""; - } - }else - { - if($selected == $field) - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $fieldlabel; - $advfilter_option['selected'] = "selected"; - }else - { - $advfilter_option['value'] = $field; - $advfilter_option['text'] = $fieldlabel; - $advfilter_option['selected'] = ""; - } - } - $advfilter[] = $advfilter_option; - } - $advfilter_out[$label]= $advfilter; - } - } - return $advfilter_out; + { + $advfilter = array(); + $label = $app_list_strings['moduleList'][$module]." ".$key; + if(isset($columnslist[$module][$key])) + { + foreach($columnslist[$module][$key] as $field=>$fieldlabel) + { + if(isset($mod_strings[$fieldlabel])) + { + if($selected == $field) + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $mod_strings[$fieldlabel]; + $advfilter_option['selected'] = "selected"; + }else + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $mod_strings[$fieldlabel]; + $advfilter_option['selected'] = ""; + } + }else + { + if($selected == $field) + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $fieldlabel; + $advfilter_option['selected'] = "selected"; + }else + { + $advfilter_option['value'] = $field; + $advfilter_option['text'] = $fieldlabel; + $advfilter_option['selected'] = ""; + } + } + $advfilter[] = $advfilter_option; + } + $advfilter_out[$label]= $advfilter; + } + } + return $advfilter_out; } //step2 //step3 function getStdFilterHTML($module,$selected="") { - global $app_list_strings; - global $oCustomView; + global $app_list_strings; + global $oCustomView; $stdfilter = array(); - $result = $oCustomView->getStdCriteriaByModule($module); + $result = $oCustomView->getStdCriteriaByModule($module); $mod_strings = return_module_language($current_language,$module); - if(isset($result)) - { - foreach($result as $key=>$value) - { - if(isset($mod_strings[$value])) + if(isset($result)) + { + foreach($result as $key=>$value) + { + if(isset($mod_strings[$value])) { - if($key == $selected) - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; - $filter['selected'] = "selected"; - }else - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; - $filter['selected'] =""; - } + if($key == $selected) + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; + $filter['selected'] = "selected"; + }else + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$mod_strings[$value]; + $filter['selected'] =""; + } }else { - if($key == $selected) - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; - $filter['selected'] = 'selected'; - }else - { - $filter['value'] = $key; - $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; - $filter['selected'] =''; - } + if($key == $selected) + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; + $filter['selected'] = 'selected'; + }else + { + $filter['value'] = $key; + $filter['text'] = $app_list_strings['moduleList'][$module]." - ".$value; + $filter['selected'] =''; + } } $stdfilter[]=$filter; - } - } - - return $stdfilter; + } + } + + return $stdfilter; } //step3 //step4 function getAdvCriteriaHTML($selected="") { - global $adv_filter_options; - global $app_list_strings; - $AdvCriteria = array(); - foreach($adv_filter_options as $key=>$value) - { - if($selected == $key) - { + global $adv_filter_options; + global $app_list_strings; + $AdvCriteria = array(); + foreach($adv_filter_options as $key=>$value) + { + if($selected == $key) + { $advfilter_criteria['value'] = $key; $advfilter_criteria['text'] = $value; $advfilter_criteria['selected'] = "selected"; - }else - { + }else + { $advfilter_criteria['value'] = $key; - $advfilter_criteria['text'] = $value; - $advfilter_criteria['selected'] = ""; - } - $AdvCriteria[] = $advfilter_criteria; - } - - return $AdvCriteria; + $advfilter_criteria['text'] = $value; + $advfilter_criteria['selected'] = ""; + } + $AdvCriteria[] = $advfilter_criteria; + } + + return $AdvCriteria; } //step4 Modified: vtigercrm/trunk/modules/CustomView/Forms.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Forms.php (original) +++ vtigercrm/trunk/modules/CustomView/Forms.php Mon Mar 27 22:22:35 2006 @@ -162,13 +162,7 @@ function getFieldSelect(&$column_fields,$colnum,&$required_fields,$suggest_field,$translated_fields,$module) { -/* -echo '
    column fields : ';print_r($column_fields); -echo '
    column : '.$colnum; -echo '
    required fields : ';print_r($required_fields); -echo '
    suggest fields : '.$suggest_field; -echo '
    translated fields : ';print_r($translated_fields); -*/ global $mod_strings; + global $mod_strings; global $app_strings; global $outlook_contacts_field_map; require_once('include/database/PearDatabase.php'); @@ -195,7 +189,6 @@ { continue; } -//echo '
    : '.$field; $output .= "\n"; - }*/ - $output .= "\n"; return $output; Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original) +++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Mon Mar 27 22:22:35 2006 @@ -80,7 +80,7 @@ $value[]=''.$metriclist['name'].''; $value[]=''.$metriclist['count'].''; - $entries[$metriclist['id']]=$value; + $entries[$metriclist['id']]=$value; } } @@ -94,7 +94,6 @@ global $adb; $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype"; $ssql .= " where customview.setmetrics = 1 order by customview.entitytype"; - //echo $ssql; $result = $adb->query($ssql); while($cvrow=$adb->fetch_array($result)) { Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Mon Mar 27 22:22:35 2006 @@ -341,54 +341,53 @@ ); $cvadvfilters = Array( - Array( - Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V', - 'comparator'=>'e', - 'value'=>'Hot' - ) - ), - - Array( - Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V', - 'comparator'=>'e', - 'value'=>'Prospect' - ) - ), - Array( + Array( + Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V', + 'comparator'=>'e', + 'value'=>'Hot' + ) + ), + Array( + Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V', + 'comparator'=>'e', + 'value'=>'Prospect' + ) + ), + Array( Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'comparator'=>'e', 'value'=>'Closed Won' ) ), - Array( + Array( Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V', 'comparator'=>'e', 'value'=>'Prospecting' ) ), - Array( + Array( Array('columnname'=>'troubletickets:status:ticketstatus:HelpDesk_Status:V', 'comparator'=>'n', 'value'=>'Closed' ) ), - Array( + Array( Array('columnname'=>'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V', 'comparator'=>'e', 'value'=>'High' ) ), - Array( - Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', + Array( + Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'n', 'value'=>'Accepted' ), - Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', + Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'n', 'value'=>'Rejected' ) ), - Array( + Array( Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V', 'comparator'=>'e', 'value'=>'Rejected' @@ -398,9 +397,9 @@ foreach($customviews as $key=>$customview) { - $queryid = insertCustomView($customview['viewname'],$customview['setdefault'],$customview['setmetrics'],$customview['cvmodule']); - insertCvColumns($queryid,$cvcolumns[$key]); - + $queryid = insertCustomView($customview['viewname'],$customview['setdefault'],$customview['setmetrics'],$customview['cvmodule']); + insertCvColumns($queryid,$cvcolumns[$key]); + if(isset($cvstdfilters[$customview['stdfilterid']])) { $i = $customview['stdfilterid']; @@ -408,7 +407,7 @@ } if(isset($cvadvfilters[$customview['advfilterid']])) { - insertCvAdvFilter($queryid,$cvadvfilters[$customview['advfilterid']]); + insertCvAdvFilter($queryid,$cvadvfilters[$customview['advfilterid']]); } } @@ -423,10 +422,8 @@ $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; - //echo $customviewsql; $customviewresult = $adb->query($customviewsql); } - return $genCVid; } @@ -439,7 +436,6 @@ { $columnsql = "insert into cvcolumnlist (cvid,columnindex,columnname)"; $columnsql .= " values (".$CVid.",".$i.",'".$columnslist[$i]."')"; - //echo $columnsql; $columnresult = $adb->query($columnsql); } } @@ -455,7 +451,6 @@ $stdfiltersql .= "'".$filtercriteria."',"; $stdfiltersql .= "'".$startdate."',"; $stdfiltersql .= "'".$enddate."')"; - //echo $stdfiltersql; $stdfilterresult = $adb->query($stdfiltersql); } } @@ -468,23 +463,11 @@ foreach($filters as $i=>$filter) { $advfiltersql = "insert into cvadvfilter(cvid,columnindex,columnname,comparator,value)"; - $advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',"; - $advfiltersql .= "'".$filter['comparator']."',"; - $advfiltersql .= "'".$filter['value']."')"; - //echo $advfiltersql; - $advfilterresult = $adb->query($advfiltersql); + $advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',"; + $advfiltersql .= "'".$filter['comparator']."',"; + $advfiltersql .= "'".$filter['value']."')"; + $advfilterresult = $adb->query($advfiltersql); } - - /*for($i=0;$iquery($advfiltersql); - }*/ - } } ?> Modified: vtigercrm/trunk/modules/CustomView/Save.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/Save.php (original) +++ vtigercrm/trunk/modules/CustomView/Save.php Mon Mar 27 22:22:35 2006 @@ -35,7 +35,6 @@ $setmetrics = 0; } - //echo $viewname.$setdefault; $allKeys = array_keys($HTTP_POST_VARS); //<<<<<<>>>>>>>>> @@ -94,108 +93,101 @@ if($genCVid != "") { - if($setdefault == 1) - { - $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; - $updatedefaultresult = $adb->query($updatedefaultsql); - } - $log->info("CustomView :: Save :: setdefault upated successfully"); + if($setdefault == 1) + { + $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; + $updatedefaultresult = $adb->query($updatedefaultsql); + } + $log->info("CustomView :: Save :: setdefault upated successfully"); - $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; - $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; - //echo $customviewsql; - $customviewresult = $adb->query($customviewsql); - $log->info("CustomView :: Save :: customview created successfully"); - if($customviewresult) - { - if(isset($columnslist)) + $customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)"; + $customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')"; + $customviewresult = $adb->query($customviewsql); + $log->info("CustomView :: Save :: customview created successfully"); + if($customviewresult) { - for($i=0;$iquery($columnsql); - } - $log->info("CustomView :: Save :: cvcolumnlist created successfully"); - - $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; - $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; - $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; - $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; - $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; - //echo $stdfiltersql; - $stdfilterresult = $adb->query($stdfiltersql); - $log->info("CustomView :: Save :: cvstdfilter created successfully"); - for($i=0;$iquery($advfiltersql); - } - $log->info("CustomView :: Save :: cvadvfilter created successfully"); + if(isset($columnslist)) + { + for($i=0;$iquery($columnsql); + } + $log->info("CustomView :: Save :: cvcolumnlist created successfully"); + + $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; + $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; + $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; + $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; + $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; + $stdfilterresult = $adb->query($stdfiltersql); + $log->info("CustomView :: Save :: cvstdfilter created successfully"); + for($i=0;$iquery($advfiltersql); + } + $log->info("CustomView :: Save :: cvadvfilter created successfully"); + } } - } - $cvid = $genCVid; + $cvid = $genCVid; } }else { - if($setdefault == 1) - { + if($setdefault == 1) + { $updatedefaultsql = "update customview set setdefault=0 where entitytype='".$cvmodule."'"; $updatedefaultresult = $adb->query($updatedefaultsql); - } - $log->info("CustomView :: Save :: setdefault upated successfully".$genCVid); - $updatecvsql = "update customview set viewname='".$viewname."',setdefault=".$setdefault.",setmetrics=".$setmetrics." where cvid=".$cvid; - $updatecvresult = $adb->query($updatecvsql); - $log->info("CustomView :: Save :: customview upated successfully".$genCVid); - $deletesql = "delete from cvcolumnlist where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); + } + $log->info("CustomView :: Save :: setdefault upated successfully".$genCVid); + $updatecvsql = "update customview set viewname='".$viewname."',setdefault=".$setdefault.",setmetrics=".$setmetrics." where cvid=".$cvid; + $updatecvresult = $adb->query($updatecvsql); + $log->info("CustomView :: Save :: customview upated successfully".$genCVid); + $deletesql = "delete from cvcolumnlist where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); - $deletesql = "delete from cvstdfilter where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); + $deletesql = "delete from cvstdfilter where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); - $deletesql = "delete from cvadvfilter where cvid=".$cvid; - $deleteresult = $adb->query($deletesql); - $log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid); + $deletesql = "delete from cvadvfilter where cvid=".$cvid; + $deleteresult = $adb->query($deletesql); + $log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid); - $genCVid = $cvid; - if($updatecvresult) - { - if(isset($columnslist)) - { - for($i=0;$iquery($columnsql); - } - $log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid); - $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; - $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; - $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; - $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; - $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; - //echo $stdfiltersql; - $stdfilterresult = $adb->query($stdfiltersql); - $log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid); - for($i=0;$iquery($advfiltersql); - } - $log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid); - } - } + $genCVid = $cvid; + if($updatecvresult) + { + if(isset($columnslist)) + { + for($i=0;$iquery($columnsql); + } + $log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid); + $stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)"; + $stdfiltersql .= " values (".$genCVid.",'".$std_filter_list["columnname"]."',"; + $stdfiltersql .= "'".$std_filter_list["stdfilter"]."',"; + $stdfiltersql .= "'".$std_filter_list["startdate"]."',"; + $stdfiltersql .= "'".$std_filter_list["enddate"]."')"; + $stdfilterresult = $adb->query($stdfiltersql); + $log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid); + for($i=0;$iquery($advfiltersql); + } + $log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid); + } + } } } Modified: vtigercrm/trunk/modules/CustomView/SaveAction.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/SaveAction.php (original) +++ vtigercrm/trunk/modules/CustomView/SaveAction.php Mon Mar 27 22:22:35 2006 @@ -23,7 +23,7 @@ if($mode == "new") { $customactionsql = "insert into customaction(cvid,subject,module,content)"; - $customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')"; + $customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')"; $customactionresult = $adb->query($customactionsql); if($customactionresult == false) { @@ -34,21 +34,19 @@ echo $errormessage; } - //print_r($customactionsql); }elseif($mode == "edit") { $updatecasql = "update customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid; $updatecaresult = $adb->query($updatecasql); - if($updatecaresult == false) + if($updatecaresult == false) { include('themes/'.$theme.'/header.php'); - $errormessage = "Error Message
      -
    • Error while inserting the record -

    " ; - echo $errormessage; + $errormessage = "Error Message
      +
    • Error while inserting the record +

    " ; + echo $errormessage; } - //print_r($updatecasql); } } header("Location: index.php?action=index&module=$cvmodule&viewname=$cvid"); Modified: vtigercrm/trunk/modules/CustomView/SendMailAction.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/SendMailAction.php (original) +++ vtigercrm/trunk/modules/CustomView/SendMailAction.php Mon Mar 27 22:22:35 2006 @@ -31,87 +31,86 @@ if(trim($subject) != "") { -if(isset($storearray) && $camodule != "") -{ - foreach($storearray as $id) + if(isset($storearray) && $camodule != "") { - if($camodule == "Contacts") + foreach($storearray as $id) { - $sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) + if($camodule == "Contacts") { - $emailid = $camodulerow["email"]; - $otheremailid = $camodulerow["otheremail"]; - $yahooid = $camodulerow["yahooid"]; + $sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) + { + $emailid = $camodulerow["email"]; + $otheremailid = $camodulerow["otheremail"]; + $yahooid = $camodulerow["yahooid"]; - if(trim($emailid) != "") + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + }elseif(trim($otheremailid) != "") + { + SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); + }elseif(trim($yahooid) != "") + { + SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Contact. Please give any email id."); + } + } + + }elseif($camodule == "Leads") + { + $sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - }elseif(trim($otheremailid) != "") + $emailid = $camodulerow["email"]; + $yahooid = $camodulerow["yahooid"]; + + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + } + elseif($trim($yahooid) != "") + { + SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Lead. Please give any email id."); + } + } + }elseif($camodule == "Accounts") + { + $sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'"; + $result = $adb->query($sql); + $camodulerow = $adb->fetch_array($result); + if(isset($camodulerow)) { - SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); - }elseif(trim($yahooid) != "") - { - SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Contact. Please give any email id."); - } + $emailid = $camodulerow["email1"]; + $otheremailid = $camodulerow["email2"]; + + if(trim($emailid) != "") + { + SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); + } + elseif(trim($otheremailid) != "") + { + SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); + } + else + { + $adb->println("There is no email id for this Account. Please give any email id."); + } + } } - - }elseif($camodule == "Leads") - { - $sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'"; - //echo $sql; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email"]; - $yahooid = $camodulerow["yahooid"]; - - if(trim($emailid) != "") - { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - } - elseif($trim($yahooid) != "") - { - SendMailtoCustomView($camodule,$id,$yahooid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Lead. Please give any email id."); - } - } - }elseif($camodule == "Accounts") - { - $sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'"; - $result = $adb->query($sql); - $camodulerow = $adb->fetch_array($result); - if(isset($camodulerow)) - { - $emailid = $camodulerow["email1"]; - $otheremailid = $camodulerow["email2"]; - - if(trim($emailid) != "") - { - SendMailtoCustomView($camodule,$id,$emailid,$current_user->id,$subject,$contents); - } - elseif(trim($otheremailid) != "") - { - SendMailtoCustomView($camodule,$id,$otheremailid,$current_user->id,$subject,$contents); - } - else - { - $adb->println("There is no email id for this Account. Please give any email id."); - } - } } } -} } function SendMailtoCustomView($module,$id,$to,$current_user_id,$subject,$contents) @@ -119,57 +118,57 @@ require_once("modules/Emails/class.phpmailer.php"); - $mail = new PHPMailer(); + $mail = new PHPMailer(); - $mail->Subject = $subject; - $mail->Body = nl2br($contents); - $mail->IsSMTP(); + $mail->Subject = $subject; + $mail->Body = nl2br($contents); + $mail->IsSMTP(); - if($current_user_id != '') - { - global $adb; - $sql = "select * from users where id= ".$current_user_id; - $result = $adb->query($sql); - $from = $adb->query_result($result,0,'email1'); - $initialfrom = $adb->query_result($result,0,'user_name'); - } - if($mail_server=='') - { - global $adb; - $mailserverresult=$adb->query("select * from systems where server_type='email'"); - $mail_server = $adb->query_result($mailserverresult,0,'server'); - $mail_server_username = $adb->query_result($mailserverresult,0,'server_username'); - $mail_server_password = $adb->query_result($mailserverresult,0,'server_password'); - $smtp_auth = $adb->query_result($mailserverresult,0,'smtp_auth'); + if($current_user_id != '') + { + global $adb; + $sql = "select * from users where id= ".$current_user_id; + $result = $adb->query($sql); + $from = $adb->query_result($result,0,'email1'); + $initialfrom = $adb->query_result($result,0,'user_name'); + } + if($mail_server=='') + { + global $adb; + $mailserverresult=$adb->query("select * from systems where server_type='email'"); + $mail_server = $adb->query_result($mailserverresult,0,'server'); + $mail_server_username = $adb->query_result($mailserverresult,0,'server_username'); + $mail_server_password = $adb->query_result($mailserverresult,0,'server_password'); + $smtp_auth = $adb->query_result($mailserverresult,0,'smtp_auth'); $adb->println("Mail Server Details : '".$mail_server."','".$mail_server_username."','".$mail_server_password."'"); - $_REQUEST['server']=$mail_server; - } - $mail->Host = $mail_server; - $mail->SMTPAuth = $smtp_auth; - $mail->Username = $mail_server_username; - $mail->Password = $mail_server_password; - $mail->From = $from; - $mail->FromName = $initialfrom; + $_REQUEST['server']=$mail_server; + } + $mail->Host = $mail_server; + $mail->SMTPAuth = $smtp_auth; + $mail->Username = $mail_server_username; + $mail->Password = $mail_server_password; + $mail->From = $from; + $mail->FromName = $initialfrom; - $mail->AddAddress($to); - $mail->AddReplyTo($from); - $mail->WordWrap = 50; + $mail->AddAddress($to); + $mail->AddReplyTo($from); + $mail->WordWrap = 50; - $mail->IsHTML(true); + $mail->IsHTML(true); $mail->AltBody = "This is the body in plain text for non-HTML mail clients"; $adb->println("Mail sending process : To => '".$to."', From => '".$from."'"); - if(!$mail->Send()) - { + if(!$mail->Send()) + { $adb->println("(CustomView/SendMailAction.php) Error in Mail Sending : ".$mail->ErrorInfo); - $errormsg = "Mail Could not be sent..."; - } + $errormsg = "Mail Could not be sent..."; + } else { $adb->println("(CustomView/SendMailAction.php) Mail has been Sent to => ".$to); } - + } header("Location: index.php?action=index&module=$camodule&viewname=$viewid"); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:23:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:23:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4512 - /vtigercrm/trunk/vtigerlogger.php Message-ID: <20060328052330.C3485505F09@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:23:26 2006 New Revision: 4512 Log: file has been removed Removed: vtigercrm/trunk/vtigerlogger.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:35:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:35:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4513 - in /vtigercrm/trunk/modules/Dashboard: Entity_charts.php accumulated_bargraph.php display_charts.php line_graph.php pie_graph.php vertical_bargraph.php Message-ID: <20060328053511.0B829506512@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:35:01 2006 New Revision: 4513 Log: junk code removed in dashboards modules Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php vtigercrm/trunk/modules/Dashboard/display_charts.php vtigercrm/trunk/modules/Dashboard/line_graph.php vtigercrm/trunk/modules/Dashboard/pie_graph.php vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Mon Mar 27 22:35:01 2006 @@ -17,11 +17,10 @@ //To get the account names -/* - Function to get the Account name for a given account id - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. +/* Function to get the Account name for a given account id + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ function get_account_name($acc_id) @@ -45,163 +44,163 @@ return $name; } -/* Function returns the values to render the graph for a particular type - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/* Function returns the values to render the graph for a particular type + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. +*/ // TO get the Values for a particular graph type function module_Chart($user_id,$date_start="2000-01-01",$end_date="2017-01-01",$query,$graph_for,$title,$added_qry="",$module="",$graph_type) { - - global $adb; - global $days,$date_array,$period_type; - - $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; - $query.=$where; + + global $adb; + global $days,$date_array,$period_type; + + $where= " and crmentity.smownerid=".$user_id." and crmentity.createdtime between '".$date_start."' and '".$end_date."'" ; + $query.=$where; if($added_qry!="") $query.=$added_qry; - $result=$adb->query($query); - $no_of_rows=$adb->num_rows($result); - $mod_count_array=array(); - $mod_name_array=array(); - $count_by_date[]=array(); - $mod_tot_cnt_array=array(); - - $mod_name_val=""; - $mod_cnt_crtd_date=""; + $result=$adb->query($query); + $no_of_rows=$adb->num_rows($result); + $mod_count_array=array(); + $mod_name_array=array(); + $count_by_date[]=array(); + $mod_tot_cnt_array=array(); + + $mod_name_val=""; + $mod_cnt_crtd_date=""; $target_val=""; $bar_target_val=""; $test_target_val=""; - if($no_of_rows!=0) - { - while($row = $adb->fetch_array($result)) - { - $mod_name= $row[$graph_for]; - if($mod_name=="") - $mod_name="Un Assigned"; - $crtd_time=$row['createdtime']; - $crtd_time_array=explode(" ",$crtd_time); - $crtd_date=$crtd_time_array[0]; - - if(!isset($mod_tot_cnt_array[$crtd_date])) - $mod_tot_cnt_array[$crtd_date]=0; - - $mod_tot_cnt_array[$crtd_date]+=1; - - if (in_array($mod_name,$mod_name_array) == false) - { - array_push($mod_name_array,$mod_name); // getting all the unique Names into the array - } - + if($no_of_rows!=0) + { + while($row = $adb->fetch_array($result)) + { + $mod_name= $row[$graph_for]; + if($mod_name=="") + $mod_name="Un Assigned"; + $crtd_time=$row['createdtime']; + $crtd_time_array=explode(" ",$crtd_time); + $crtd_date=$crtd_time_array[0]; + + if(!isset($mod_tot_cnt_array[$crtd_date])) + $mod_tot_cnt_array[$crtd_date]=0; + + $mod_tot_cnt_array[$crtd_date]+=1; + + if (in_array($mod_name,$mod_name_array) == false) + { + array_push($mod_name_array,$mod_name); // getting all the unique Names into the array + } + //Counting the number of values for a type of graph - if(!isset($mod_count_array[$mod_name])) - $mod_count_array[$mod_name]=0; - $mod_count_array[$mod_name]++; + if(!isset($mod_count_array[$mod_name])) + $mod_count_array[$mod_name]=0; + $mod_count_array[$mod_name]++; //Counting the number of values for a type of graph for a particular date - if(!isset($count_by_date[$mod_name][$crtd_date])) - $count_by_date[$mod_name][$crtd_date]=0; - - $count_by_date[$mod_name][$crtd_date]+=1; - } - $mod_by_mod_cnt=count($mod_name_array); - - if($mod_by_mod_cnt!=0) - { - $url_string=""; - - $mod_cnt_table="
    '; $list .= ''; $list .= $mod_strings['FieldType'].'
    - "; - - //Assigning the Header values to the table and giving the dates as graphformat - for($i=0; $i<$days; $i++) - { - $tdate=$date_array[$i]; - $values=Graph_n_table_format($period_type,$tdate); - $graph_format=$values[0]; - $table_format=$values[1]; - $mod_cnt_table.= ""; - - } - $mod_cnt_table .= "" ; + if(!isset($count_by_date[$mod_name][$crtd_date])) + $count_by_date[$mod_name][$crtd_date]=0; + + $count_by_date[$mod_name][$crtd_date]+=1; + } + $mod_by_mod_cnt=count($mod_name_array); + + if($mod_by_mod_cnt!=0) + { + $url_string=""; + + $mod_cnt_table="
    Status $table_formatTotal
    + "; + + //Assigning the Header values to the table and giving the dates as graphformat + for($i=0; $i<$days; $i++) + { + $tdate=$date_array[$i]; + $values=Graph_n_table_format($period_type,$tdate); + $graph_format=$values[0]; + $table_format=$values[1]; + $mod_cnt_table.= ""; + + } + $mod_cnt_table .= "" ; //For all type of the array - for ($i=0;$iTotal"; + $test_target_val.="K".$link_val; + } + $mod_cnt_table .=""; //For all Days getting the table - for($k=0; $k<$days;$k++) - { - $tdate=$date_array[$k]; - if(!isset($mod_tot_cnt_array[$tdate])) - $mod_tot_cnt_array[$tdate]="0"; - $tot= $mod_tot_cnt_array[$tdate]; - if($period_type!="yday") - $mod_cnt_table.=""; - } - $cnt_total=array_sum($mod_tot_cnt_array); - $mod_cnt_table.="
    Status $table_formatTotal
    Total$tot$cnt_total
    "; - $mod_cnt_table.="
    "; - $title_of_graph="$title : $cnt_total"; + for($k=0; $k<$days;$k++) + { + $tdate=$date_array[$k]; + if(!isset($mod_tot_cnt_array[$tdate])) + $mod_tot_cnt_array[$tdate]="0"; + $tot= $mod_tot_cnt_array[$tdate]; + if($period_type!="yday") + $mod_cnt_table.="    		$tot$cnt_total
    "; + $mod_cnt_table.="
    "; + $title_of_graph="$title : $cnt_total"; $bar_target_val=urlencode($bar_target_val); $test_target_val=urlencode($test_target_val); - - $Prod_mod_val=array($mod_name_val,$mod_cnt_val,$title_of_graph,$bar_target_val,$mod_graph_date,$urlstring,$mod_cnt_table,$test_target_val); - return $Prod_mod_val; - } - else - { - $data=0; - - } - - } + + $Prod_mod_val=array($mod_name_val,$mod_cnt_val,$title_of_graph,$bar_target_val,$mod_graph_date,$urlstring,$mod_cnt_table,$test_target_val); + return $Prod_mod_val; + } + else + { + $data=0; + + } + + } else - { - $data=0; + { + $data=0; echo "

    The data is not available with the specified time period

    "; - } - return $data; + } + return $data; } /** Saving the images of the graph in the /cache/images - otherwise it will render the graph with the given details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ + * otherwise it will render the graph with the given details + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. +*/ function save_image_map($filename,$image_map) { - - global $log; - - if (!$handle = fopen($filename, 'w')) { - $log->debug(" Cannot open file ($filename)"); - return; - } - - // Write $somecontent to our opened file. - if (fwrite($handle, $image_map) === FALSE) { - $log->debug(" Cannot write to file ($filename)"); - return false; - } - - fclose($handle); - return true; + + global $log; + + if (!$handle = fopen($filename, 'w')) { + $log->debug(" Cannot open file ($filename)"); + return; + } + + // Write $somecontent to our opened file. + if (fwrite($handle, $image_map) === FALSE) { + $log->debug(" Cannot write to file ($filename)"); + return false; + } + + fclose($handle); + return true; } ?> Modified: vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/accumulated_bargraph.php Mon Mar 27 22:35:01 2006 @@ -13,72 +13,66 @@ $top=(isset($_REQUEST['top']))?$_REQUEST['top']:40; $bottom=(isset($_REQUEST['bottom']))?$_REQUEST['bottom']:50; $title=(isset($_REQUEST['title']))?$_REQUEST['title']:"Horizontal graph"; -//$target_val=(isset($_REQUEST['target_val']))?$_REQUEST['target_val']:""; $target_val=(isset($_REQUEST['test']))?$_REQUEST['test']:""; -/* -function accumlated_graph($refer_code,$referdata,$datavalue,$title,$target_val,$width,$height,$left,$right,$top,$bottom) -{ -*/ - //Exploding the data values - $datavalue=explode("K",$datavalue); - $name_value=explode(",",$referdata); - $datax=explode(",",$refer_code); //The values to the XAxis - $target_val=urldecode($target_val); - $target_val=explode("K",$target_val); +//Exploding the data values +$datavalue=explode("K",$datavalue); +$name_value=explode(",",$referdata); +$datax=explode(",",$refer_code); //The values to the XAxis +$target_val=urldecode($target_val); +$target_val=explode("K",$target_val); - $color_array=array("#FF8B8B","#8BFF8B","#A8A8FF","#FFFF6E","#C5FFFF","#FFA8FF","#FFE28B","lightpink","burlywood2","cadetblue"); +$color_array=array("#FF8B8B","#8BFF8B","#A8A8FF","#FFFF6E","#C5FFFF","#FFA8FF","#FFE28B","lightpink","burlywood2","cadetblue"); - // Create the graph. These two calls are always required - $graph = new Graph($width,$height,"auto"); - $graph->SetScale("textlin"); +// Create the graph. These two calls are always required +$graph = new Graph($width,$height,"auto"); +$graph->SetScale("textlin"); - $graph->SetShadow(); +$graph->SetShadow(); - // Create the lines of the Graph - for($i=0;$iSetFillColor($color_array[$i]); - $bplot[$i]->SetWidth(10); +// Create the lines of the Graph +for($i=0;$iSetFillColor($color_array[$i]); + $bplot[$i]->SetWidth(10); - $bplot[$i]->value->Show(); - $bplot[$i]->value->SetFont(FF_FONT1,FS_NORMAL,8); - $bplot[$i]->value->SetColor("black"); - $bplot[$i]->value->SetFormat('%d'); - $bplot[$i]->SetValuePos('max'); + $bplot[$i]->value->Show(); + $bplot[$i]->value->SetFont(FF_FONT1,FS_NORMAL,8); + $bplot[$i]->value->SetColor("black"); + $bplot[$i]->value->SetFormat('%d'); + $bplot[$i]->SetValuePos('max'); - } +} - $gbplot = new AccBarPlot($bplot); - $gbplot->SetWidth(0.7); +$gbplot = new AccBarPlot($bplot); +$gbplot->SetWidth(0.7); - // Add the bar to the graph - $graph->Add($gbplot); +// Add the bar to the graph +$graph->Add($gbplot); - $graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetTickLabels($datax); - $graph->title->Set($title); +$graph->title->Set($title); - $graph->Set90AndMargin($left,$right,$top,$bottom); - //$graph->SetFrame(false); - $graph->title->SetFont(FF_FONT1,FS_BOLD); - $graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); - $graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Set90AndMargin($left,$right,$top,$bottom); +//$graph->SetFrame(false); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); - $graph->SetColor("#7D9CB8"); - $graph->SetMarginColor("#3D6A93"); +$graph->SetColor("#7D9CB8"); +$graph->SetMarginColor("#3D6A93"); - // Display the graph - $graph->Stroke(); -//} +// Display the graph +$graph->Stroke(); ?> Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/display_charts.php (original) +++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Mar 27 22:35:01 2006 @@ -88,125 +88,6 @@ "ticketsbystatus" => "Tickets by status", "ticketsbypriority" => "Tickets by Priority", ); -/* -if($type == "leadsource") -{ - $graph_by="leadsource"; - $graph_title="Leads By Source"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -// To display the charts for Lead status -if ($type == "leadstatus") -{ - $graph_by="leadstatus"; - $graph_title="Leads By Status"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -//Charts for Lead Industry -if($type == "leadindustry") -{ - $graph_by="industry"; - $graph_title="Leads By Industry"; - $module="Leads"; - $classsel_name = "dashMnuSel"; -} -//Sales by Lead Source -if($type == "salesbyleadsource") -{ - $graph_by="leadsource"; - $graph_title="Sales by LeadSource"; - $module="Potentials"; - $classsel_name = "dashMnuSel"; -} -//Sales by Account -if($type == "salesbyaccount") -{ - $graph_by="accountid"; - $graph_title="Sales by Accounts"; - $module="Potentials"; - $classsel_name = "dashMnuSel"; -} -//Charts for Account by Industry -if($type == "accountindustry") -{ - $graph_by="industry"; - $graph_title="Account By Industry"; - $module="Accounts"; - $classsel_name = "dashMnuSel"; -} -//Charts for Products by Category -if($type == "productcategory") -{ - $graph_by="productcategory"; - $graph_title="Products by Category"; - $module="Products"; -} -// Sales Order by Accounts -if($type == "sobyaccounts") -{ - $graph_by="accountid"; - $graph_title="Sales Order by Accounts"; - $module="SalesOrder"; -} -//Sales Order by Status -if($type == "sobystatus") -{ - $graph_by="sostatus"; - $graph_title="Sales Order by Status"; - $module="SalesOrder"; -} -//Purchase Order by Status -if($type == "pobystatus") -{ - $graph_by="postatus"; - $graph_title="Purchase Order by Status"; - $module="PurchaseOrder"; -} -//Quotes by Accounts -if($type == "quotesbyaccounts") -{ - $graph_by="accountid"; - $graph_title="Quotes by Accounts"; - $module="Quotes"; -} -//Quotes by Stage -if($type == "quotesbystage") -{ - $graph_by="quotestage"; - $graph_title="Quotes by Stage"; - $module="Quotes"; -} -//Invoice by Accounts -if($type == "invoicebyacnts") -{ - $graph_by="accountid"; - $graph_title="Invoices by Accounts"; - $module="Invoice"; -} -//Invoices by status -if($type == "invoicebystatus") -{ - $graph_by="invoicestatus"; - $graph_title="Invoices by status"; - $module="Invoice"; -} -//Tickets by Status -if($type == "ticketsbystatus") -{ - $graph_by="ticketstatus"; - $graph_title="Tickets by status"; - $module="HelpDesk"; -} -//Tickets by Priority -if($type == "ticketsbypriority") -{ - $graph_by="priority"; - $graph_title="Tickets by Priority"; - $module="HelpDesk"; -} - */ function get_graph_by_type($graph_by,$graph_title,$module,$where,$query) { global $user_id,$date_start,$end_date,$type; @@ -245,12 +126,12 @@ } - /** Returns the Horizontal,vertical, pie graphs and Accumulated Graphs - for the details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/** Returns the Horizontal,vertical, pie graphs and Accumulated Graphs +for the details +* Portions created by vtiger are Copyright (C) vtiger. +* All Rights Reserved. +* Contributor(s): ______________________________________.. +*/ // Function for get graphs @@ -262,7 +143,6 @@ $val=explode(":",$title); $display_title=$val[0]; - //$sHTML = "

    $display_title in between $date_start and $end_date

    "; $sHTML .= "
    @@ -336,12 +216,12 @@ return $sHTML; } - /** Returns graph, if the cached image is present it'll display that image, - otherwise it will render the graph with the given details - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ +/** Returns graph, if the cached image is present it'll display that image, +otherwise it will render the graph with the given details +* Portions created by vtiger are Copyright (C) vtiger. +* All Rights Reserved. +* Contributor(s): ______________________________________.. +*/ // Function to get the chached image if exists function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type) Modified: vtigercrm/trunk/modules/Dashboard/line_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/line_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/line_graph.php Mon Mar 27 22:35:01 2006 @@ -40,23 +40,14 @@ // Setup the graph -//$graph = new Graph(300,200); $graph = new Graph($width,$height); $graph->SetMarginColor('white'); $graph->SetScale("textlin"); -//$graph->SetFrame(false); -//$graph->SetMargin(30,50,30,30); $graph->SetMargin($left,$right,$top,$bottom); - $graph->tabtitle->Set($title ); $graph->tabtitle->SetFont(FF_FONT2,FS_BOLD,13); - - $graph->yaxis->HideZeroLabel(); -//$graph->ygrid->SetFill(true,'#EFEFEF at 0.5','#BBCCFF at 0.5'); -//$graph->ygrid->SetFill(true,'#E3FDFA at 0.5','#F4FDF5 at 0.5'); $graph->xgrid->Show(); -//$graph->xgrid->Show(); $thick=6; // Create the lines of the Graph @@ -66,8 +57,6 @@ $graph_data=explode(",",$data); $name=$name_value[$i]; - -// $lineplot ->SetWeight($i); $color_val=$color_array[$i]; $temp="p".$i; $$temp = new LinePlot($graph_data); @@ -102,9 +91,6 @@ // Set some other color then the boring default $graph->SetColor("#CCDFCC"); $graph->SetMarginColor("#98C098"); - - -//$graph->xaxis->SetTextAlign('center','top'); $graph->xaxis->SetTickLabels($datax); $graph->xaxis->SetLabelAngle(90); Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original) +++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Mon Mar 27 22:35:01 2006 @@ -16,13 +16,13 @@ /** Function to render the Horizontal Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. + */ function pie_chart($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) { - + global $log,$root_directory; //We'll be getting the values in the form of a string separated by commas @@ -36,8 +36,8 @@ for($i=0;$iSetTheme("sand"); $p1->ExplodeSlice(1); $p1->SetCenter(0.45); - //$p1->SetLegends($gDateLocale->GetShortMonth()); $p1->SetLegends($datax); - //$p1->ShowBorder(false); - // Setup the labels $p1->SetLabelType(PIE_VALUE_PER); $p1->value->Show(); - //$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); - //$p1->value->SetFormat('%2.1f%%'); $p1->value->SetFormat('%2.1f%%'); - //$p1->value->SetFormat("$datax\n$datay('%2.1f%')"); - - $p1->SetCSIMTargets($target,$alts); // Don't display the border $graph->SetFrame(false); @@ -73,13 +65,13 @@ $graph->Add($p1); $graph-> Stroke( $cache_file_name ); - $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img = "" ; - $img.=$imgMap; - return $img; + $imgMap = $graph ->GetHTMLImageMap ($html_image_name); + save_image_map($cache_file_name.'.map', $imgMap); + $base_name_cache_file=basename($cache_file_name); + $ccc="cache/images/".$base_name_cache_file; + $img = "" ; + $img.=$imgMap; + return $img; } ?> Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php ============================================================================== --- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original) +++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Mon Mar 27 22:35:01 2006 @@ -15,9 +15,9 @@ include ("jpgraph/src/jpgraph_iconplot.php"); /** Function to render the Vertical Bar Graph - * Portions created by vtiger are Copyright (C) vtiger. - * All Rights Reserved. - * Contributor(s): ______________________________________.. + * Portions created by vtiger are Copyright (C) vtiger. + * All Rights Reserved. + * Contributor(s): ______________________________________.. */ function vertical_graph($referdata,$refer_code,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_image_name) @@ -27,7 +27,7 @@ $datay=explode(",",$referdata); //The datay values $datax=explode(",",$refer_code); // The datax values $target_val=urldecode($target_val);// The links values for bar are given as string in the encoded form, here we are decoding it - $target=explode(",",$target_val); + $target=explode(",",$target_val); $alts=array(); //Array which contains the data which is displayed on the mouse over $temp=array(); @@ -97,7 +97,6 @@ $bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); $graph->SetFrame(false); $graph->SetMarginColor('white'); - //$graph->ygrid->SetFill(true,'azure1','azure2'); $graph->xgrid->Show(); // To get the Targets @@ -120,18 +119,15 @@ $bplot->value->SetFormat('%d'); - // Display the graph -// $graph->Stroke(); - - //Getting the graph in the form of html page + //Getting the graph in the form of html page $graph-> Stroke( $cache_file_name ); $imgMap = $graph ->GetHTMLImageMap ($html_image_name); - save_image_map($cache_file_name.'.map', $imgMap); - $base_name_cache_file=basename($cache_file_name); - $ccc="cache/images/".$base_name_cache_file; - $img= "" ; - $img.=$imgMap; - return $img; + save_image_map($cache_file_name.'.map', $imgMap); + $base_name_cache_file=basename($cache_file_name); + $ccc="cache/images/".$base_name_cache_file; + $img= "" ; + $img.=$imgMap; + return $img; } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:41:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:41:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4514 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060328054157.98A5C506548@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:41:53 2006 New Revision: 4514 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Mon Mar 27 22:41:53 2006 @@ -29,60 +29,59 @@ var $db; // Stored fields - var $leadid; - var $email; + var $leadid; + var $email; var $firstname; - var $salutation; + var $salutation; var $lastname; var $company; var $annualrevenue; - + var $industry; - var $campaign; - var $rating; - var $status; - var $leadsource; - var $designation; - var $licencekey; - var $region; - var $space; - var $comments; - var $priority; - var $partnercontact; - var $maildate; - var $nextstepdate; - var $fundingsituation; - var $deleted; - - var $description; - // These are for related fields - var $city; - var $code; - var $state; - var $country; - var $phone; - var $mobile; - var $fax; - var $lane; - var $leadaddresstype; - var $currency; - var $website; - var $callornot; - var $readornot; - var $empct; - - var $accountid; + var $campaign; + var $rating; + var $status; + var $leadsource; + var $designation; + var $licencekey; + var $region; + var $space; + var $comments; + var $priority; + var $partnercontact; + var $maildate; + var $nextstepdate; + var $fundingsituation; + var $deleted; + + var $description; + // These are for related fields + var $city; + var $code; + var $state; + var $country; + var $phone; + var $mobile; + var $fax; + var $lane; + var $leadaddresstype; + var $currency; + var $website; + var $callornot; + var $readornot; + var $empct; + + var $accountid; var $contactid; var $campaignid; - var $potentialid; - + var $potentialid; + var $module_id = "leadid"; - //var $tab_name = Array('crmentity','account','accountbillads','accountshipads'); var $tab_name = Array('crmentity','leaddetails','leadsubdetails','leadaddress','leadscf'); - var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid'); - - + var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid'); + + var $entity_table = "crmentity"; var $table_name = "leaddetails"; @@ -94,51 +93,50 @@ var $column_fields = Array(); var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid'); - + var $combofieldNames = Array('leadsource'=>'leadsource_dom' - ,'salutation'=>'salutation_dom' - ,'status'=>'leadstatus_dom' - ,'industry'=>'industry_dom' - ,'rating'=>'rating_dom' - ,'licencekey'=>'licensekey_dom'); - + ,'salutation'=>'salutation_dom' + ,'status'=>'leadstatus_dom' + ,'industry'=>'industry_dom' + ,'rating'=>'rating_dom' + ,'licencekey'=>'licensekey_dom'); + // This is used to retrieve related fields from form posts. - var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid'); - + // This is the list of fields that are in the lists. - var $list_fields = Array( - 'Last Name'=>Array('leaddetails'=>'lastname'), - 'First Name'=>Array('leaddetails'=>'firstname'), - 'Company'=>Array('leaddetails'=>'company'), - 'Phone'=>Array('leadaddress'=>'phone'), - 'Website'=>Array('leadsubdetails'=>'website'), - 'Email'=>Array('leaddetails'=>'email'), - 'Assigned To'=>Array('crmentity'=>'smownerid') - ); - var $list_fields_name = Array( - 'Last Name'=>'lastname', - 'First Name'=>'firstname', - 'Company'=>'company', - 'Phone'=>'phone', - 'Website'=>'website', - 'Email'=>'email', - 'Assigned To'=>'assigned_user_id' - ); - var $list_link_field= 'lastname'; + var $list_fields = Array( + 'Last Name'=>Array('leaddetails'=>'lastname'), + 'First Name'=>Array('leaddetails'=>'firstname'), + 'Company'=>Array('leaddetails'=>'company'), + 'Phone'=>Array('leadaddress'=>'phone'), + 'Website'=>Array('leadsubdetails'=>'website'), + 'Email'=>Array('leaddetails'=>'email'), + 'Assigned To'=>Array('crmentity'=>'smownerid') + ); + var $list_fields_name = Array( + 'Last Name'=>'lastname', + 'First Name'=>'firstname', + 'Company'=>'company', + 'Phone'=>'phone', + 'Website'=>'website', + 'Email'=>'email', + 'Assigned To'=>'assigned_user_id' + ); + var $list_link_field= 'lastname'; var $record_id; var $list_mode; - var $popup_type; + var $popup_type; var $search_fields = Array( - 'Name'=>Array('leaddetails'=>'lastname'), - 'Company'=>Array('leaddetails'=>'company') - ); - var $search_fields_name = Array( - 'Name'=>'lastname', - 'Company'=>'company' - ); + 'Name'=>Array('leaddetails'=>'lastname'), + 'Company'=>Array('leaddetails'=>'company') + ); + var $search_fields_name = Array( + 'Name'=>'lastname', + 'Company'=>'company' + ); var $required_fields = array("lastname"=>1, 'company'=>1); @@ -152,12 +150,7 @@ $this->column_fields = getColumnFields('Leads'); } - function get_summary_text() - { - return "$this->firstname $this->lastname"; - } - -//method added to construct the query to fetch the custom fields + //method added to construct the query to fetch the custom fields function constructCustomQueryAddendum() { global $adb; @@ -165,7 +158,7 @@ $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=7"; $result = $adb->query($sql1); $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel + //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel $sql3 = "select "; for($i=0; $i < $numRows;$i++) { @@ -384,100 +377,6 @@ - function save_relationship_changes($is_update) - { - if($this->task_id != "") - { - $this->set_lead_task_relationship($this->id, $this->task_id); - } - if($this->note_id != "") - { - $this->set_lead_note_relationship($this->id, $this->note_id); - } - if($this->meeting_id != "") - { - $this->set_lead_meeting_relationship($this->id, $this->meeting_id); - } - if($this->call_id != "") - { - $this->set_lead_call_relationship($this->id, $this->call_id); - } - if($this->email_id != "") - { - $this->set_lead_email_relationship($this->id, $this->email_id); - } - } - - - function set_lead_task_relationship($lead_id, $task_id) - { - $query = "UPDATE tasks set parent_id='$lead_id', parent_type='Lead' where id='$task_id'"; - $this->db->query($query) or die("Error setting lead to task relationship: ".mysql_error()); - } - - function clear_lead_task_relationship($lead_id) - { - $query = "update tasks set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to task relationship: ".mysql_error()); - } - - function set_lead_note_relationship($lead_id, $note_id) - { - $query = "UPDATE notes set parent_id='$lead_id', parent_type='Lead' where id='$note_id'"; - $this->db->query($query) or die("Error setting lead to note relationship: ".mysql_error()); - } - - function clear_lead_note_relationship($lead_id) - { - $query = "update notes set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to note relationship: ".mysql_error()); - } - - function set_lead_meeting_relationship($lead_id, $meeting_id) - { - $query = "UPDATE meetings set parent_id='$lead_id', parent_type='Lead' where id='$meeting_id'"; - $this->db->query($query) or die("Error setting lead to meeting relationship: ".mysql_error()); - } - - function clear_lead_meeting_relationship($lead_id) - { - $query = "update meetings set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to meeting relationship: ".mysql_error()); - } - - function set_lead_call_relationship($lead_id, $call_id) - { - $query = "UPDATE calls set parent_id='$lead_id', parent_type='Lead' where id='$call_id'"; - $this->db->query($query) or die("Error setting lead to call relationship: ".mysql_error()); - } - - function clear_lead_call_relationship($lead_id) - { - $query = "update calls set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to call relationship: ".mysql_error()); - } - - function set_lead_email_relationship($lead_id, $email_id) - { - $query = "UPDATE emails set parent_id='$lead_id', parent_type='Lead' where id='$email_id'"; - $this->db->query($query) or die("Error setting lead to email relationship: ".mysql_error()); - } - - function clear_lead_email_relationship($lead_id) - { - $query = "update emails set parent_id='', parent_type='' where parent_id='$lead_id' and deleted=0"; - $this->db->query($query) or die("Error clearing lead to email relationship: ".mysql_error()); - } - - function mark_relationships_deleted($id) - { - - $this->clear_lead_task_relationship($id); - $this->clear_lead_note_relationship($id); - $this->clear_lead_meeting_relationship($id); - $this->clear_lead_call_relationship($id); - $this->clear_lead_email_relationship($id); - } // This method is used to provide backward compatibility with old data that was prefixed with http:// // We now automatically prefix http:// @@ -497,28 +396,12 @@ $this->remove_redundant_http(); } - function list_view_parse_additional_sections(&$list_form, $section){ - - if($list_form->exists($section.".row.yahoo_id") && isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse($section.".row.yahoo_id"); - elseif ($list_form->exists($section.".row.no_yahoo_id")) - $list_form->parse($section.".row.no_yahoo_id"); - return $list_form; - - - } function get_lead_field_options($list_option) { $comboFieldArray = getComboArray($this->combofieldNames); return $comboFieldArray[$list_option]; } - function get_list_view_data(){ - $temp_array = $this->get_list_view_array(); - $temp_array["ENCODED_NAME"]=htmlspecialchars($this->firstname.' '.$this->lastname, ENT_QUOTES); - return $temp_array; - - } - + //Used By vtigerCRM Word Plugin function getColumnNames_Lead() { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:48:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:48:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4515 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060328054820.23EF24EBE2A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:48:14 2006 New Revision: 4515 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php (contents, props changed) Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 00:59:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 05:59:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4516 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060328055918.3AC7250655F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 22:59:12 2006 New Revision: 4516 Log: Unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:02:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:02:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4517 - in /vtigercrm/trunk/modules/Quotes: Popup.html PopupSearchForm.html SearchForm.html Message-ID: <20060328060245.BC11D506583@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:02:36 2006 New Revision: 4517 Log: file has been removed Removed: vtigercrm/trunk/modules/Quotes/Popup.html vtigercrm/trunk/modules/Quotes/PopupSearchForm.html vtigercrm/trunk/modules/Quotes/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:04:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:04:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4518 - /vtigercrm/trunk/modules/Notes/SearchForm.html Message-ID: <20060328060431.8F4BB506582@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:04:26 2006 New Revision: 4518 Log: modules/notes/SearchForm.html file deleted Removed: vtigercrm/trunk/modules/Notes/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:04:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:04:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4519 - /vtigercrm/trunk/modules/Quotes/index.php Message-ID: <20060328060445.73A79506582@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:04:39 2006 New Revision: 4519 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/index.php Modified: vtigercrm/trunk/modules/Quotes/index.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/index.php (original) +++ vtigercrm/trunk/modules/Quotes/index.php Mon Mar 27 23:04:39 2006 @@ -50,10 +50,6 @@ require_once ($theme_path."layout_utils.php"); -global $mod_strings; - - - include ('modules/Quotes/ListView.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:06:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:06:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4520 - /vtigercrm/trunk/modules/Quotes/Forms.php Message-ID: <20060328060612.64807506593@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:06:06 2006 New Revision: 4520 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Forms.php Modified: vtigercrm/trunk/modules/Quotes/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Forms.php (original) +++ vtigercrm/trunk/modules/Quotes/Forms.php Mon Mar 27 23:06:06 2006 @@ -173,60 +173,4 @@ return $the_script; } -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. - */ - -/* -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_quote_subject = $mod_strings['Subject']; -$lbl_pot_name = $mod_strings['Potential Name']; -$lbl_acct_name = $mod_strings['Account Name']; -$lbl_quote_stage = $mod_strings['Quote Stage']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$lbl_change_button_label = $app_strings['LBL_CHANGE_BUTTON_LABEL']; -$user_id = $current_user->id; -$comboFieldNames = Array('quotestage'=>'quotestage_dom' - ); -$comboFieldArray = getComboArray($comboFieldNames); -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - $lbl_required_symbol$lbl_quote_subject
    -
    - $lbl_pot_name
    -  
    - $lbl_quote_stage
    -

    - - - - -EOQ; -$the_form .= get_left_form_footer(); -$the_form .= get_validate_record_js(); - -return $the_form; -} -*/ ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:08:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:08:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4521 - in /vtigercrm/trunk/install: 2setConfig.php 3confirmConfig.php Message-ID: <20060328060837.2A0CF506593@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:08:26 2006 New Revision: 4521 Log: create database added in installation Modified: vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:10:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:10:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4522 - /vtigercrm/trunk/modules/Quotes/Save.php Message-ID: <20060328061044.CBC0650652A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:10:35 2006 New Revision: 4522 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Save.php Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Mon Mar 27 23:10:35 2006 @@ -23,7 +23,6 @@ require_once('modules/Quotes/Quote.php'); require_once('include/logging.php'); -//require_once('database/DatabaseConnection.php'); require_once('include/database/PearDatabase.php'); include("modules/Emails/mail.php"); @@ -45,18 +44,11 @@ $log->debug("Mode is ".$focus->mode); } - - -//$focus->retrieve($_REQUEST['record']); - foreach($focus->column_fields as $fieldname => $val) { if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } @@ -79,7 +71,6 @@ $log->debug("Deleting from quotesproductrel table "); $query1 = "delete from quotesproductrel where quoteid=".$focus->id; - //echo $query1; $adb->query($query1); } @@ -101,7 +92,6 @@ { $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; - //echo $query; $adb->query($query); //Checking the re-order level and sending mail updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); @@ -109,15 +99,6 @@ } -/* -echo 'rowid : '.$_REQUEST[$product_id_var]; -echo '
    '; -echo 'status : '.$_REQUEST['hdnRowStatus1']; -echo '
    '; -echo 'qty : '.$_REQUEST['txtQty1']; -echo '
    '; -echo 'LP: '.$_REQUEST['txtListPrice1']; -*/ $return_id = $focus->id; if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; @@ -150,8 +131,6 @@ $diff_qty = $old_qty - $qty; $upd_qty = $qtyinstk+$diff_qty; - //Updating the Product Quantity - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } @@ -159,7 +138,6 @@ { $diff_qty = $qty - $old_qty; $upd_qty = $qtyinstk-$diff_qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); @@ -168,7 +146,6 @@ else { $upd_qty = $qtyinstk-$qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } @@ -177,7 +154,6 @@ { $upd_qty = $qtyinstk-$qty; - //updateProductQty($product_id, $upd_qty); sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:11:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:11:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4523 - /vtigercrm/trunk/themes/blue/header.html Message-ID: <20060328061155.CDE1250652A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:11:49 2006 New Revision: 4523 Log: file removed as header is smartified Removed: vtigercrm/trunk/themes/blue/header.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:14:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:14:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4524 - /vtigercrm/trunk/modules/Contacts/ContactFormBase.php Message-ID: <20060328061444.AEF4350652A@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:14:36 2006 New Revision: 4524 Log: ContactFormBase.php deleted Removed: vtigercrm/trunk/modules/Contacts/ContactFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:15:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:15:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4525 - /vtigercrm/trunk/modules/Accounts/AccountFormBase.php Message-ID: <20060328061516.81EF950659C@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:15:05 2006 New Revision: 4525 Log: AccountFormBase.php deleted Removed: vtigercrm/trunk/modules/Accounts/AccountFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:23:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:23:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4526 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060328062349.C31585065AB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:23:40 2006 New Revision: 4526 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Mon Mar 27 23:23:40 2006 @@ -114,12 +114,6 @@ $this->column_fields = getColumnFields('Quotes'); } - function create_tables () { - } - - function drop_tables () { - } - function get_summary_text() { return $this->name; @@ -146,10 +140,6 @@ $button = ''; - if(isPermitted("Activities",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id; $query = "SELECT contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name,recurringevents.recurringtype from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid left join cntactivityrel on cntactivityrel.activityid= activity.activityid left join contactdetails on contactdetails.contactid = cntactivityrel.contactid left join users on users.id=crmentity.smownerid left outer join recurringevents on recurringevents.activityid=activity.activityid left join activitygrouprelation on activitygrouprelation.activityid=crmentity.crmid left join groups on groups.groupname=activitygrouprelation.groupname where seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (activity.status is not NULL && activity.status != 'Completed') and (activity.status is not NULL && activity.status != 'Deferred') or (activity.eventstatus !='' && activity.eventstatus = 'Planned')"; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:26:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:26:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4527 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060328062627.5BBB75065BA@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:26:21 2006 New Revision: 4527 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Mon Mar 27 23:26:21 2006 @@ -25,20 +25,13 @@ require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$currentModule,$theme; $log = LoggerManager::getLogger('quote_list'); - -global $currentModule; -global $theme; // Get _dom arrays from Database $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); - -// focus_list is the means of passing data to a ListView. -global $focus_list; if (!isset($where)) $where = ""; @@ -114,7 +107,6 @@ '.$cvHTML; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; $smarty->assign("MOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:30:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:30:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4528 - /vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Message-ID: <20060328063039.043295065C8@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:30:33 2006 New Revision: 4528 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original) +++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Mon Mar 27 23:30:33 2006 @@ -23,25 +23,15 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); - global $app_strings; - global $current_language; - global $current_user; + global $app_strings,$current_language,$current_user; $current_module_strings = return_module_language($current_language, 'Quotes'); - global $list_max_entries_per_page; - global $urlPrefix; - global $adb; + global $list_max_entries_per_page,$adb,$theme,$mod_strings; $log = LoggerManager::getLogger('quote_list'); - - global $currentModule; - global $theme; // Get _dom arrays from Database $comboFieldNames = Array('quotestage'=>'quotestage_dom'); $comboFieldArray = getComboArray($comboFieldNames); - - // focus_list is the means of passing data to a ListView. - global $focus_list; $url_string = ''; $sorder = ''; @@ -59,8 +49,6 @@ } $focus = new Quote(); - global $theme; - global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:34:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:34:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4529 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060328063415.7BAAC5065AD@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:34:08 2006 New Revision: 4529 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Mon Mar 27 23:34:08 2006 @@ -42,7 +42,6 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); $smarty->assign("BLOCKS", getBlocks("Campaigns","detail_view",'',$focus->column_fields)); -//echo '
    ';print_r($focus->column_fields); echo '
    '; $smarty->assign("CUSTOMFIELD", $cust_fld); $smarty->assign("SINGLE_MOD","Campaign"); @@ -68,5 +67,4 @@ $permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; - ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:35:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:35:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4530 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060328063519.49A125065ED@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:35:13 2006 New Revision: 4530 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Mon Mar 27 23:35:13 2006 @@ -19,7 +19,6 @@ global $mod_strings; global $current_user; global $currentModule; -//echo '+++++++++++++++++'.$currentModule; $focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); @@ -93,8 +92,6 @@ $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -//$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); - $campaign_tables = Array('campaign','crmentity'); $tabid = getTabid("Campaigns"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:35:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:35:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4531 - /vtigercrm/trunk/modules/Settings/language/en_us.lang.php Message-ID: <20060328063521.390AB5065D0@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:35:14 2006 New Revision: 4531 Log: label changed from User Management tp Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Mon Mar 27 23:35:14 2006 @@ -306,7 +306,7 @@ //Fields for Settings -'LBL_USER_MANAGEMENT'=>'User Management', +'LBL_USER_MANAGEMENT'=>'Users & Access Management', 'LBL_USERS'=>'Users', From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:36:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:36:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4532 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060328063633.8345A5065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:36:27 2006 New Revision: 4532 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Mar 27 23:36:27 2006 @@ -140,7 +140,6 @@ $list_query = getListQuery("Campaigns"); } //<<<<<<<>>>>>>>> -//echo $listquery; if(isset($where) && $where != '') { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:36:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:36:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4533 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060328063636.9C6305065DD@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:36:29 2006 New Revision: 4533 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Mon Mar 27 23:36:29 2006 @@ -29,10 +29,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $mod_strings; -global $current_user; -global $log; +global $app_strings,$mod_strings,$log,$theme; $log->debug("Inside Quote EditView"); @@ -89,7 +86,6 @@ $log->debug("Accountid Id from the request is ".$_REQUEST['account_id']); } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array @@ -135,8 +131,7 @@ $smarty->assign("UPDATEINFO",updateInfo($focus->id)); $num_of_products = getNoOfAssocProducts($module,$focus); $smarty->assign("ROWCOUNT", $num_of_products); - //$associated_prod = getAssociatedProducts("Quotes",$focus); - $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); //getAssociatedProducts("Quotes",$focus); + $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus); $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod); $smarty->assign("MODE", $focus->mode); $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']); @@ -164,35 +159,6 @@ $smarty->assign("ADJUSTMENTVALUE", "0.000"); $smarty->assign("SUBTOTAL", $InvTotal.".00"); $smarty->assign("GRANDTOTAL", $InvTotal.".00"); - -} -else -{ - $smarty->assign("ROWCOUNT", '1'); - $smarty->assign("TAXVALUE", '0'); - $smarty->assign("ADJUSTMENTVALUE", '0'); - //Setting the first row - $log->debug("Setting the first product row when the mode is create"); - $output =''; - $output .= '    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .=''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:38:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:38:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4534 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060328063844.660425065CE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:38:37 2006 New Revision: 4534 Log: Removed Commented Code Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Mon Mar 27 23:38:37 2006 @@ -21,11 +21,9 @@ require_once('modules/Contacts/Contact.php'); require_once('modules/Leads/Lead.php'); - class Campaign extends CRMEntity { var $log; var $db; - // Stored fields var $id; @@ -73,7 +71,6 @@ $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted=0 and contactdetails.campaignid = '.$id; - //echo $query; return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:38:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:38:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4535 - /vtigercrm/trunk/modules/Quotes/DetailView.php Message-ID: <20060328063854.7E6B45065CE@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:38:48 2006 New Revision: 4535 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/DetailView.php Modified: vtigercrm/trunk/modules/Quotes/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/DetailView.php (original) +++ vtigercrm/trunk/modules/Quotes/DetailView.php Mon Mar 27 23:38:48 2006 @@ -26,9 +26,7 @@ require_once('include/CustomFieldUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); -global $mod_strings; -global $app_strings; -global $currentModule; +global $mod_strings,$app_strings,$currentModule,$theme,$profile_id; $focus = new Quote(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { @@ -42,7 +40,6 @@ } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -80,20 +77,13 @@ $smarty->assign("CONVERTSALESORDER","permitted"); if(isPermitted("Invoice",1,$_REQUEST['record']) == 'yes') -{ $smarty->assign("CONVERTINVOICE","permitted"); - //$smarty->assign("CONVERTINVOICE"," "); -} if(isPermitted("Quotes",2,$_REQUEST['record']) == 'yes') -{ $smarty->assign("DELETE","permitted"); - //$smarty->assign("DELETEBUTTON"," "); -} //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; $smarty->assign("CONVERTMODE",'quotetoinvoice'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:42:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:42:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4536 - /vtigercrm/trunk/modules/Users/createemailtemplate.php Message-ID: <20060328064258.D60B65065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:42:53 2006 New Revision: 4536 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/createemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/createemailtemplate.php Mon Mar 27 23:42:53 2006 @@ -16,9 +16,7 @@ require_once('include/database/PearDatabase.php'); global $app_strings; -global $app_list_strings; global $mod_strings; -global $current_user; global $current_language; global $theme; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:43:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:43:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4537 - /vtigercrm/trunk/modules/Quotes/CreatePDF.php Message-ID: <20060328064343.C85985065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:43:39 2006 New Revision: 4537 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Mar 27 23:43:39 2006 @@ -3,9 +3,7 @@ require_once('modules/Quotes/Quote.php'); require_once('include/database/PearDatabase.php'); -//Curency Settings By OpenCRM -global $adb; -global $app_strings; +global $adb,$app_strings; $sql="select currency_symbol from currency_info"; $result = $adb->query($sql); @@ -304,11 +302,9 @@ $r2 = $this->w - ($r1 * 2) ; $y1 = 80; $x1 = $positions[1]; - //$y2 = $this->h - $x1 - $y1 - 17; $y2 = $bottom; $this->SetXY( $r1, $y1 ); $this->SetFont( "Helvetica", "", 10); - //$this->Rect( $r1, $y1, $r2, $y2, "D"); $colX = $r1; $columns = $tab; @@ -517,7 +513,6 @@ $page_num='1'; $pdf = new PDF( 'P', 'mm', 'A4' ); $pdf->Open(); -//$pdf->AddPage(); $num_pages=ceil(($num_products/$products_per_page)); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:43:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:43:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4538 - /vtigercrm/trunk/modules/Users/createemailtemplate.html Message-ID: <20060328064357.622A95065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:43:53 2006 New Revision: 4538 Log: Deleted the file as it is no longer used after smartification Removed: vtigercrm/trunk/modules/Users/createemailtemplate.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:45:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:45:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4539 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060328064500.B83075065CC@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:44:56 2006 New Revision: 4539 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Mon Mar 27 23:44:56 2006 @@ -171,21 +171,6 @@ } - function resetPreferences(){ - if(!isset($this->user_preferences)){ - if(isset($_SESSION["USER_PREFERENCES"])){ - $this->user_preferences = $_SESSION["USER_PREFERENCES"]; - foreach($this->user_preferences as $key => $val){ - unset($_SESSION[$key]); - } - } - } - unset($this->user_preferences); - unset ($_SESSION["USER_PREFERENCES"]); - $query = "UPDATE $this->table_name SET user_preferences=NULL where id='$this->id'"; - $result =& $this->db->query($query); - $this->log->debug("RESETING: PREFERENCES ROWS AFFECTED WHILE UPDATING USER PREFERENCES:".$this->db->getAffectedRowCount($result)); - } function savePreferecesToDB(){ $data = base64_encode(serialize($this->user_preferences)); @@ -207,23 +192,7 @@ } } - function getPreference($name){ - if(array_key_exists($name,$this->user_preferences )) - return $this->user_preferences[$name]; - return ''; - } - function create_tables () { - - } - - function drop_tables () { - /*$query = 'DROP TABLE IF EXISTS '.$this->table_name; - $this->db->query($query, true); */ - - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - - } + function get_summary_text() { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:45:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:45:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4540 - in /vtigercrm/trunk/Smarty/templates: Settings.tpl SettingsMenu.tpl Message-ID: <20060328064503.6DB775065ED@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:44:58 2006 New Revision: 4540 Log: assign module owner moved to usermanagemant Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Settings.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Settings.tpl Mon Mar 27 23:44:58 2006 @@ -41,6 +41,9 @@ + + @@ -147,8 +150,6 @@ - Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Mon Mar 27 23:44:58 2006 @@ -16,13 +16,14 @@
     
     
    		'; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= '
    {$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}
    {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}    		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    +{$MOD.LBL_ASSIGN_MODULE_OWNERS}     		{$MOD.LBL_SETTING_ANNOUNCEMENT}
    {$MOD.LBL_ANNOUNCEMENT}    		{$MOD.LBL_CURRENCY_CONFIGURATION}
    {$MOD.LBL_CURRENCY_CONFIG}     		{$MOD.LBL_ASSIGN_MODULE_OWNERS}
    -{$MOD.LBL_ASSIGN_MODULE_OWNERS}     		{$MOD.LBL_MIGRATION_INFO}
    {$MOD.LBL_MIGRATION}
    -
    +
    {$MOD.LBL_CUSTOM_FIELD_SETTINGS} {$MOD.LBL_PICKLIST_SETTINGS} {$MOD.LBL_FIELD_ORDERING} @@ -44,7 +45,7 @@
    -
    +
    {$MOD.EMAILTEMPLATES} {$MOD.WORDINTEGRATION} {$MOD.NOTIFICATIONSCHEDULERS} @@ -58,13 +59,12 @@
    - From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:46:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:46:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4541 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Message-ID: <20060328064601.9F7BD5065F7@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:45:57 2006 New Revision: 4541 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php ============================================================================== --- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original) +++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Mon Mar 27 23:45:57 2006 @@ -15,7 +15,6 @@ global $mod_strings; global $app_strings; -global $app_list_strings; global $current_language; global $theme; $theme_path="themes/".$theme."/"; @@ -37,21 +36,6 @@ $tempid = $_REQUEST['templateid']; $sql = "select * from emailtemplates where templateid=".$tempid; $result = $adb->query($sql); -/* $temprow = $adb->fetch_array($result); - $cnt=1; - $selcount = $_REQUEST['templatename']; - do - { - if ($cnt == $selcount) - { - $templatename = $temprow["templatename"]; - } - $cnt++; - }while($temprow = $adb->fetch_array($result)); - - $result = fetchEmailTemplateInfo($templatename); -*/ -// $emailtemplateResult = $adb->fetch_array($result); } $smarty->assign("FOLDERNAME", $emailtemplateResult["foldername"]); @@ -65,7 +49,6 @@ $smarty->display("DetailViewEmailTemplate.tpl"); - ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:46:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:46:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4542 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060328064641.D97025065F7@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:46:37 2006 New Revision: 4542 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:47:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:47:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4543 - /vtigercrm/trunk/modules/Users/detailviewemailtemplate.html Message-ID: <20060328064734.934A15065CC@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:47:30 2006 New Revision: 4543 Log: Deleted the file as it is no longer used after smartification Removed: vtigercrm/trunk/modules/Users/detailviewemailtemplate.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:49:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:49:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4544 - /vtigercrm/trunk/modules/Users/editemailtemplate.php Message-ID: <20060328064917.0D2DF506602@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:49:13 2006 New Revision: 4544 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:51:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:51:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4545 - in /vtigercrm/trunk/modules/Activities: GroupAllocationView.php SendReminder.php Message-ID: <20060328065128.4444350660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:51:23 2006 New Revision: 4545 Log: Unwanted contents removed Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php vtigercrm/trunk/modules/Activities/SendReminder.php Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Activities/SendReminder.php ============================================================================== --- vtigercrm/trunk/modules/Activities/SendReminder.php (original) +++ vtigercrm/trunk/modules/Activities/SendReminder.php Mon Mar 27 23:51:23 2006 @@ -30,8 +30,6 @@ global $adb; // Select the events with reminder -//$query="select crmentity.crmid,activity.*,activity_reminder.* from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id where ".$adb->getDBDateString("activity.date_start")." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0;"; - $query="select crmentity.crmid,activity.*,activity_reminder.*,recurringevents.activityid,recurringevents.recurringdate,recurringevents.recurringtype from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left join recurringevents on activity.activityid=recurringevents.activityid where '".date('Y-m-d')."' between ".$adb->getDBDateString("activity.date_start")." and ". $adb->getDBDateString("activity.due_date") ." and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0;"; @@ -111,7 +109,7 @@ //Set the mail body/contents here #$contents ="Hi,\n\n This a activity reminder mail. Kindly visit the link for more details of the activity Click here\n\n Regards,\n Reminder Manager"; - $contents = nl2br($adb->query_result($result_main,0,'notificationbody')) ."\n\n Kindly visit the link for more details on the activity Click here"; + $contents = nl2br($adb->query_result($result_main,0,'notificationbody')) ."\n\n Kindly visit the link for more details on the activity Click here \n\n Regards,\n Reminder Manager"; if(count($to_addr) >=1) { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:51:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:51:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4546 - /vtigercrm/trunk/modules/Users/listemailtemplates.php Message-ID: <20060328065136.3B8B850660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:51:32 2006 New Revision: 4546 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php ============================================================================== --- vtigercrm/trunk/modules/Users/listemailtemplates.php (original) +++ vtigercrm/trunk/modules/Users/listemailtemplates.php Mon Mar 27 23:51:32 2006 @@ -16,8 +16,6 @@ $sql = "select * from emailtemplates order by templateid DESC"; $result = $adb->query($sql); $temprow = $adb->fetch_array($result); - //echo '
    '; print_r($temprow); echo '
    '; - $edit="Edit "; $del="Del "; @@ -31,7 +29,6 @@ global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; - $smarty = new vtigerCRM_Smarty; $smarty->assign("UMOD", $mod_strings); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:52:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:52:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4547 - /vtigercrm/trunk/modules/Contacts/AddBusinessCard.php Message-ID: <20060328065226.BE4A750660B@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 27 23:52:22 2006 New Revision: 4547 Log: Unwanted tag removed Modified: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php Modified: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:54:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:54:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4548 - /vtigercrm/trunk/modules/Accounts/DeleteMemberAccountRelationship.php Message-ID: <20060328065400.C0536506609@vtiger.fosslabs.com> Author: richie Date: Mon Mar 27 23:53:55 2006 New Revision: 4548 Log: DeleteMemberAccountRelationship.php file removed Removed: vtigercrm/trunk/modules/Accounts/DeleteMemberAccountRelationship.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 01:58:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 06:58:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4550 - /vtigercrm/trunk/modules/Accounts/Forms.php Message-ID: <20060328065810.EC9C850661A@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:58:05 2006 New Revision: 4550 Log: junk code removal done Modified: vtigercrm/trunk/modules/Accounts/Forms.php Modified: vtigercrm/trunk/modules/Accounts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:00:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:00:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4551 - /vtigercrm/trunk/modules/Accounts/EditView.php Message-ID: <20060328070003.1B1F9506623@vtiger.fosslabs.com> Author: don Date: Mon Mar 27 23:59:58 2006 New Revision: 4551 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Accounts/EditView.php Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:00:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:00:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4552 - /vtigercrm/trunk/modules/Vendors/PopupSearchForm.html Message-ID: <20060328070040.CC77A506618@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:00:36 2006 New Revision: 4552 Log: file has been removed Removed: vtigercrm/trunk/modules/Vendors/PopupSearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:01:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:01:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4553 - /vtigercrm/trunk/modules/Vendors/SearchForm.html Message-ID: <20060328070122.C1A7F50662D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:01:18 2006 New Revision: 4553 Log: file has been removed Removed: vtigercrm/trunk/modules/Vendors/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:02:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:02:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4554 - /vtigercrm/trunk/modules/Vendors/Vendor.js Message-ID: <20060328070236.3030F506629@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:02:31 2006 New Revision: 4554 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.js Modified: vtigercrm/trunk/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.js (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.js Tue Mar 28 00:02:31 2006 @@ -8,9 +8,6 @@ * ********************************************************************************/ -function set_focus() -{ -} function cancelForm(frm) { window.history.back(); @@ -124,8 +121,6 @@ var fldId = getOpenerObj("vendor_id"); fldName.value = vendor_name; fldId.value = vendor_id; - //window.opener.document.EditView.vendor_name.value = vendor_name; - //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_address(vendor_id, vendor_name, street, city, state, code, country,pobox ) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:03:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:03:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4555 - /vtigercrm/trunk/modules/Vendors/index.php Message-ID: <20060328070308.DB9B3506630@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:03:04 2006 New Revision: 4555 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/index.php Modified: vtigercrm/trunk/modules/Vendors/index.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/index.php (original) +++ vtigercrm/trunk/modules/Vendors/index.php Tue Mar 28 00:03:04 2006 @@ -16,8 +16,6 @@ $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once ($theme_path."layout_utils.php"); -global $mod_strings; - include ('modules/Vendors/ListView.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:07:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:07:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4556 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060328070722.D940250663E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:07:18 2006 New Revision: 4556 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Tue Mar 28 00:07:18 2006 @@ -59,10 +59,6 @@ 'Vendor Name'=>'vendorname', 'Phone'=>'phone' ); -/* -// var $combofieldNames = Array('manufacturer'=>'manufacturer_dom' - ,'productcategory'=>'productcategory_dom'); -*/ //Added these variables which are used as default order by and sortorder in ListView var $default_order_by = 'vendorname'; @@ -86,19 +82,7 @@ $button = ''; - if(isPermitted("Products",1,"") == 'yes') - { - $button .= ' '; - } - if(isPermitted("Products",3,"") == 'yes') - { - if($focus->product_novendor() !=0) - { - $button .= ' '; - } - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; - $query = 'select products.productid, products.productname, products.productcode, products.commissionrate, products.qty_per_unit, products.unit_price, crmentity.crmid, crmentity.smownerid,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0'; return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset); @@ -111,13 +95,7 @@ $button = ''; - if(isPermitted("PurchaseOrder",1,"") == 'yes') - { - - $button .= ' '; - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; - $query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id; return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset); @@ -129,10 +107,6 @@ $focus = new Contact(); $button = ''; - if(isPermitted("Contacts",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:09:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:09:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4557 - /vtigercrm/trunk/modules/Notes/NoteFormBase.php Message-ID: <20060328070905.3ED8450652A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:09:00 2006 New Revision: 4557 Log: Deleted the file as it is no longer uses Removed: vtigercrm/trunk/modules/Notes/NoteFormBase.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:14:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:14:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4558 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060328071419.E057D5065BE@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:14:15 2006 New Revision: 4558 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Tue Mar 28 00:14:15 2006 @@ -14,13 +14,8 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page,$currentModule,$theme; -global $list_max_entries_per_page; -global $currentModule; - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:16:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:16:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4559 - /vtigercrm/trunk/modules/Vendors/EditView.php Message-ID: <20060328071618.CC35E50664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:16:13 2006 New Revision: 4559 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/EditView.php Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Tue Mar 28 00:16:13 2006 @@ -14,10 +14,7 @@ require_once('modules/Vendors/Vendor.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; +global $app_strings,$mod_strings,$theme; $focus = new Vendor(); $smarty = new vtigerCRM_Smarty(); @@ -35,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:17:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:17:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4560 - /vtigercrm/trunk/modules/Vendors/DetailView.php Message-ID: <20060328071749.C635650664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:17:45 2006 New Revision: 4560 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/DetailView.php Modified: vtigercrm/trunk/modules/Vendors/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/DetailView.php (original) +++ vtigercrm/trunk/modules/Vendors/DetailView.php Tue Mar 28 00:17:45 2006 @@ -10,7 +10,6 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('include/utils/utils.php'); require_once('modules/Vendors/Vendor.php'); require_once('include/utils/utils.php'); @@ -28,10 +27,8 @@ $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:20:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:20:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4561 - /vtigercrm/trunk/modules/Accounts/SearchForm.html Message-ID: <20060328072015.A118D506659@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 00:20:09 2006 New Revision: 4561 Log: SearchForm.html deleted Removed: vtigercrm/trunk/modules/Accounts/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:26:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:26:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4562 - in /vtigercrm/trunk/modules/Contacts: AddBusinessCard.php BusinessCard.html BusinessCard.php SaveBusinessCard.php Message-ID: <20060328072623.DD23B506667@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 00:26:18 2006 New Revision: 4562 Log: Business card info deleted Removed: vtigercrm/trunk/modules/Contacts/AddBusinessCard.php vtigercrm/trunk/modules/Contacts/BusinessCard.html vtigercrm/trunk/modules/Contacts/BusinessCard.php vtigercrm/trunk/modules/Contacts/SaveBusinessCard.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:28:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:28:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4563 - in /vtigercrm/trunk/Smarty/templates: DetailView.tpl ListView.tpl Message-ID: <20060328072852.0EBBA50664D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:28:47 2006 New Revision: 4563 Log: AddBusinesscard link removed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl vtigercrm/trunk/Smarty/templates/ListView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 28 00:28:47 2006 @@ -74,9 +74,6 @@ Import {$MODULE} | {/if} Export {$MODULE} - {if $MODULE eq 'Contacts'} -  | Add Business Card - {/if} {else}   Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Mar 28 00:28:47 2006 @@ -92,9 +92,6 @@ Import {$MODULE} | {/if} Export {$MODULE} - {if $MODULE eq 'Contacts'} -  | Add Business Card - {/if} {else}   From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:29:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:29:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4564 - in /vtigercrm/trunk/modules/Products: PopupVendorSearchForm.html SearchForm.html Message-ID: <20060328072903.33F08506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:28:58 2006 New Revision: 4564 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/PopupVendorSearchForm.html vtigercrm/trunk/modules/Products/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:29:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:29:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4565 - /vtigercrm/trunk/modules/Portal/ListView.php Message-ID: <20060328072935.55EA1506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:29:31 2006 New Revision: 4565 Log: Removed Junk & Commented Code Modified: vtigercrm/trunk/modules/Portal/ListView.php Modified: vtigercrm/trunk/modules/Portal/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Portal/ListView.php (original) +++ vtigercrm/trunk/modules/Portal/ListView.php Tue Mar 28 00:29:31 2006 @@ -33,7 +33,6 @@ $portal_array['portalurl'] = $portalurl; $portal_info[]=$portal_array; } -//echo '
    ';print_r($portal_array);echo '
    '; $smarty = new vtigerCRM_Smarty; $smarty->assign("IMAGEPATH", $image_path); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:30:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:30:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4566 - in /vtigercrm/trunk/modules/Leads: ConvertLead.php Lead.js Lead.php LeadConvertToEntities.php Save.php Message-ID: <20060328073004.7B1A0506664@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:29:55 2006 New Revision: 4566 Log: Unwanted Codes removed Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php vtigercrm/trunk/modules/Leads/Lead.js vtigercrm/trunk/modules/Leads/Lead.php vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php vtigercrm/trunk/modules/Leads/Save.php Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ConvertLead.php (original) +++ vtigercrm/trunk/modules/Leads/ConvertLead.php Tue Mar 28 00:29:55 2006 @@ -29,10 +29,6 @@ $log->debug(" the userid is ".$userid); $crmid = $adb->getUniqueID("crmentity"); -//$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted) values(".$id.",".$userid.",".$userid.",account,0,0)"; - -//$adb->query($sql_crmentity); - $sql = "SELECT firstname, lastname, company, smownerid from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.leadid =".$id; $result = $adb->query($sql); Modified: vtigercrm/trunk/modules/Leads/Lead.js ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.js (original) +++ vtigercrm/trunk/modules/Leads/Lead.js Tue Mar 28 00:29:55 2006 @@ -324,8 +324,6 @@ var fldId = getOpenerObj("lead_id"); fldName.value = product_name; fldId.value = product_id; - //window.opener.document.EditView.lead_name.value = product_name; - //window.opener.document.EditView.lead_id.value = product_id; } function add_data_to_relatedlist(entity_id,recordid) { Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Tue Mar 28 00:29:55 2006 @@ -186,8 +186,6 @@ //check if the custom table exists or not in the first place function checkIfCustomTableExists() { - //$result = mysql_query("select * from accountcf"); - //$testrow = mysql_num_fields($result); $result = $this->db->query("select * from leadscf"); $testrow = $this->db->num_fields($result); if($testrow > 1) Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original) +++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Tue Mar 28 00:29:55 2006 @@ -217,8 +217,6 @@ } - -//$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted) values(".$crmid.",".$current_user_id.",".$current_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0)"; $sql_crmentity = "insert into 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: vtigercrm/trunk/modules/Leads/Save.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Save.php (original) +++ vtigercrm/trunk/modules/Leads/Save.php Tue Mar 28 00:29:55 2006 @@ -39,41 +39,10 @@ foreach($focus->column_fields as $fieldname => $val) { - /* - $tempvalue; - if($field == 'assigned_user_id') - { - //check which radio button the user has chosen - if($_REQUEST['assigntype'] == 'T') - { - $value='null'; - $focus->$field = $value; - } - else - { - $tempvalue = $_REQUEST['assigned_user_id']; - $value = $tempvalue; - $focus->$field = $value; - } - } - else if(isset($_REQUEST[$field])) - { - $value=$_REQUEST[$field]; - $focus->$field = $value; - } - - if(get_magic_quotes_gpc() == 1) - { - $focus->$field = stripslashes($focus->$field); - } - */ - if(isset($_REQUEST[$fieldname])) + if(isset($_REQUEST[$fieldname])) { $value = $_REQUEST[$fieldname]; $log->info("the value is ".$value); - //echo '
    '; - //echo $fieldname." ".$value; - //echo '
    '; $focus->column_fields[$fieldname] = $value; } if(isset($_REQUEST['annualrevenue'])) @@ -84,73 +53,10 @@ } -/* -foreach($focus->additional_column_fields as $field) -{ - if(isset($_REQUEST[$field])) - { - if($field == 'assigned_user_id') - { - //check which radio button the user has chosen - if($_REQUEST['assigntype'] == 'T') - { - $value = 'null'; - } - else - { - $value = $_REQUEST['assigned_user_id']; - } - } - - else - { - $value = $_REQUEST[$field]; - } - $focus->$field = $value; - if(get_magic_quotes_gpc() == 1) - { - $focus->$field = stripslashes($focus->$field); - } - } -} -$createLeadFlag = true; -if($focus->id == "") -{ -} -else -{ -$createLeadFlag = false; -if($_REQUEST['assigntype'] == 'T') - { - $tempvalue = $_REQUEST['assigned_group_name']; - $value=$tempvalue; - updateLeadGroupRelation($focus->id,$value); - } -else -{ -updateLeadGroupRelation($focus->id,''); -} - - -} -*/ -//$focus->saveentity("Leads"); $focus->save("Leads"); $return_id = $focus->id; $log->info("the return id is ".$return_id); -/* -if($createLeadFlag) -{ - if($_REQUEST['assigntype'] == 'T') - { - $tempvalue = $_REQUEST['assigned_group_name']; - $value=$tempvalue; - insert2LeadGroupRelation($focus->id,$value); - } -} -save_customfields($focus->id); -*/ if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module']; else $return_module = "Leads"; if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; @@ -239,19 +145,5 @@ } } - /* srini patch - else - { - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0) - { - //Update Block - } - else - { - //Insert Block - $query = 'insert into leadcf ('.$columns.') values('.$values.')'; - $adb->query($query); - } - }*/ } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:36:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:36:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4567 - /vtigercrm/trunk/include/utils/DeleteUtils.php Message-ID: <20060328073621.93158506683@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:36:16 2006 New Revision: 4567 Log: comments removed Modified: vtigercrm/trunk/include/utils/DeleteUtils.php Modified: vtigercrm/trunk/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DeleteUtils.php (original) +++ vtigercrm/trunk/include/utils/DeleteUtils.php Tue Mar 28 00:36:16 2006 @@ -104,11 +104,8 @@ } elseif($return_module=="Products") { - //$relation_query = "DELETE from invoiceproductrel where productid=".$return_id." and invoiceid=".$record; - //$adb->query($relation_query); //Removing the relation from the quotes product rel $inv_query = "select * from invoiceproductrel where productid=".$return_id; - //echo $qt_query; $result = $adb->query($inv_query); $num_rows = $adb->num_rows($result); for($i=0; $i< $num_rows; $i++) @@ -220,11 +217,8 @@ } elseif($return_module == "Products") { - //$relation_query = "DELETE FROM quotesproductrel where productid=".$return_id." and quoteid=".$record; - //$adb->query($relation_query); //Removing the relation from the quotes product rel $qt_query = "select * from quotesproductrel where productid=".$return_id; - //echo $qt_query; $result = $adb->query($qt_query); $num_rows = $adb->num_rows($result); for($i=0; $i< $num_rows; $i++) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:37:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:37:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4568 - in /vtigercrm/trunk/modules/Calendar: dayview.php monthview.php weekview.php Message-ID: <20060328073719.95105506684@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:37:14 2006 New Revision: 4568 Log: file has been removed Removed: vtigercrm/trunk/modules/Calendar/dayview.php vtigercrm/trunk/modules/Calendar/monthview.php vtigercrm/trunk/modules/Calendar/weekview.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:38:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:38:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4569 - in /vtigercrm/trunk/modules: Accounts/Account.js Invoice/Invoice.js PurchaseOrder/PurchaseOrder.js Quotes/Quote.js Message-ID: <20060328073848.9E0B3506684@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:38:39 2006 New Revision: 4569 Log: copyAddress function moved to include/js/Inventory.js Modified: vtigercrm/trunk/modules/Accounts/Account.js vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js vtigercrm/trunk/modules/Quotes/Quote.js Modified: vtigercrm/trunk/modules/Accounts/Account.js ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.js (original) +++ vtigercrm/trunk/modules/Accounts/Account.js Tue Mar 28 00:38:39 2006 @@ -9,42 +9,7 @@ ********************************************************************************/ -function copyAddressRight(form) { - - form.ship_street.value = form.bill_street.value; - - form.ship_city.value = form.bill_city.value; - - form.ship_state.value = form.bill_state.value; - - form.ship_code.value = form.bill_code.value; - - form.ship_country.value = form.bill_country.value; - - form.ship_pobox.value = form.bill_pobox.value; - - return true; - -} - -function copyAddressLeft(form) { - - form.bill_street.value = form.ship_street.value; - - form.bill_city.value = form.ship_city.value; - - form.bill_state.value = form.ship_state.value; - - form.bill_code.value = form.ship_code.value; - - form.bill_country.value = form.ship_country.value; - - form.bill_pobox.value = form.ship_pobox.value; - - return true; - -} - +document.write(" - -EOQ; - -return $the_script; -} - - */ -/** - * Create HTML form to enter a new record with the minimum necessary fields. - * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc. - * All Rights Reserved. - * Contributor(s): ______________________________________.. -function get_new_record_form () { -global $mod_strings; -global $app_strings; -global $current_user; - -$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL']; -$lbl_first_name = $mod_strings['LBL_FIRST_NAME']; -$lbl_last_name = $mod_strings['LBL_LAST_NAME']; -$lbl_phone = $mod_strings['LBL_PHONE']; -$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS']; -$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE']; -$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY']; -$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL']; -$user_id = $current_user->id; - -$the_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']); -$the_form .= << - - - - - - $lbl_first_name
    -
    - $lbl_required_symbol$lbl_last_name
    -
    - $lbl_phone
    -
    - $lbl_email_address
    -

    - - - -EOQ; -$the_form .= get_left_form_footer(); -$the_form .= get_validate_record_js(); - -return $the_form; -} - - */ ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:41:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:41:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4571 - /vtigercrm/trunk/include/js/Inventory.js Message-ID: <20060328074116.D8F23506627@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:41:11 2006 New Revision: 4571 Log: js common for inventory has been moved to inventory.js file Added: vtigercrm/trunk/include/js/Inventory.js From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:44:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:44:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4572 - in /vtigercrm/trunk: include/utils/ modules/Emails/ modules/HelpDesk/ modules/Import/ modules/Migration/ Message-ID: <20060328074458.C95FD506627@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:44:43 2006 New Revision: 4572 Log: * Modified for junk code removal Modified: vtigercrm/trunk/include/utils/export.php vtigercrm/trunk/modules/Emails/Email.php vtigercrm/trunk/modules/HelpDesk/HelpDesk.php vtigercrm/trunk/modules/Import/ImportAccount.php vtigercrm/trunk/modules/Import/ImportContact.php vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/ImportOpportunity.php vtigercrm/trunk/modules/Import/ImportSteplast.php vtigercrm/trunk/modules/Import/UsersLastImport.php vtigercrm/trunk/modules/Migration/Migration.php Modified: vtigercrm/trunk/include/utils/export.php ============================================================================== --- vtigercrm/trunk/include/utils/export.php (original) +++ vtigercrm/trunk/include/utils/export.php Tue Mar 28 00:44:43 2006 @@ -41,92 +41,21 @@ $result = $current_user->retrieve($_SESSION['authenticated_user_id']); if($result == null) { - session_destroy(); - header("Location: index.php?action=Login&module=Users"); + session_destroy(); + header("Location: index.php?action=Login&module=Users"); } } if ($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) { -die("you can't export!"); + die("you can't export!"); } - - -$contact_fields = array( -"id"=>"Contact ID" -,"lead_source"=>"Lead Source" -,"date_entered"=>"Date Entered" -,"date_modified"=>"Date Modified" -,"first_name"=>"First Name" -,"last_name"=>"Last Name" -,"salutation"=>"Salutation" -,"birthdate"=>"Lead Source" -,"do_not_call"=>"Do Not Call" -,"email_opt_out"=>"Email Opt Out" -,"title"=>"Title" -,"department"=>"Department" -,"birthdate"=>"Birthdate" -,"do_not_call"=>"Do Not Call" -,"phone_home"=>"Phone (Home)" -,"phone_mobile"=>"Phone (Mobile)" -,"phone_work"=>"Phone (Work)" -,"phone_other"=>"Phone (Other)" -,"phone_fax"=>"Fax" -,"email1"=>"Email" -,"email2"=>"Email (Other)" -,"yahoo_id"=>"Yahoo! ID" -,"assistant"=>"Assistant" -,"assistant_phone"=>"Assistant Phone" -,"primary_address_street"=>"Primary Address Street" -,"primary_address_city"=>"Primary Address City" -,"primary_address_state"=>"Primary Address State" -,"primary_address_postalcode"=>"Primary Address Postalcode" -,"primary_address_country"=>"Primary Address Country" -,"alt_address_street"=>"Other Address Street" -,"alt_address_city"=>"Other Address City" -,"alt_address_state"=>"Other Address State" -,"alt_address_postalcode"=>"Other Address Postalcode" -,"alt_address_country"=>"Other Address Country" -,"description"=>"Description" -); - -/*$account_fields = array( -"id"=>"Account ID", -"name"=>"Account Name", -"website"=>"Website", -"industry"=>"Industry", -"account_type"=>"Type", -"ticker_symbol"=>"Ticker Symbol", -"employees"=>"Employees", -"ownership"=>"Ownership", -"phone_office"=>"Phone", -"phone_fax"=>"Fax", -"phone_alternate"=>"Other Phone", -"email1"=>"Email", -"email2"=>"Other Email", -"rating"=>"Rating", -"sic_code"=>"SIC Code", -"annual_revenue"=>"Annual Revenue", -"billing_address_street"=>"Billing Address Street", -"billing_address_city"=>"Billing Address City", -"billing_address_state"=>"Billing Address State", -"billing_address_postalcode"=>"Billing Address Postalcode", -"billing_address_country"=>"Billing Address Country", -"shipping_address_street"=>"Shipping Address Street", -"shipping_address_city"=>"Shipping Address City", -"shipping_address_state"=>"Shipping Address State", -"shipping_address_postalcode"=>"Shipping Address Postalcode", -"shipping_address_country"=>"Shipping Address Country", -"description"=>"Description" -); - -*/ - //Function added to convert line breaks to space in description during export -function br2nl_vt($str) { - $str = preg_replace("/(\r\n)/", " ", $str); - return $str; +function br2nl_vt($str) +{ + $str = preg_replace("/(\r\n)/", " ", $str); + return $str; } function export_all($type) @@ -140,7 +69,7 @@ if ($type == "Contacts") { $focus = new Contact; - } + } else if ($type == "Accounts") { $focus = new Account; @@ -168,7 +97,6 @@ { $focus = new Lead; } - else if ($type == "Emails") { $focus = new Email; @@ -190,22 +118,10 @@ $where = $_SESSION['export_where']; } -/* - if ( isset( $_SESSION['order_by'] )) - { - $order_by = $_SESSION['order_by']; - } - else - { - $order_by = ""; - } - */ $order_by = ""; - $query = $focus->create_export_query($order_by,$where); + $query = $focus->create_export_query($order_by,$where); - //print $query; -//exit; $result = $adb->query($query,true,"Error exporting $type: "."
    $query"); @@ -222,7 +138,6 @@ { $new_arr = array(); - //foreach (array_values($val) as $value) foreach ($val as $key => $value) { if($key=="description") @@ -248,7 +163,7 @@ header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" ); header( "Cache-Control: post-check=0, pre-check=0", false ); header("Content-Length: ".strlen($content)); - print $content; +print $content; + exit; ?> - Modified: vtigercrm/trunk/modules/Emails/Email.php ============================================================================== --- vtigercrm/trunk/modules/Emails/Email.php (original) +++ vtigercrm/trunk/modules/Emails/Email.php Tue Mar 28 00:44:43 2006 @@ -45,7 +45,6 @@ var $date_start; var $time_start; var $module_id="emailid"; - var $default_email_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote'); var $table_name = "activity"; var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel'); @@ -53,24 +52,20 @@ // This is the list of fields that are in the lists. var $list_fields = Array( - 'Subject'=>Array('activity'=>'subject'), - 'Related to'=>Array('seactivityrel'=>'activityid'), - 'Date Sent'=>Array('activity'=>'date_start'), - 'Assigned To'=>Array('crmentity','smownerid') - ); + 'Subject'=>Array('activity'=>'subject'), + 'Related to'=>Array('seactivityrel'=>'activityid'), + 'Date Sent'=>Array('activity'=>'date_start'), + 'Assigned To'=>Array('crmentity','smownerid') + ); var $list_fields_name = Array( - 'Subject'=>'subject', - 'Related to'=>'activityid', - 'Date Sent'=>'date_start', - 'Assigned To'=>'assigned_user_id'); + 'Subject'=>'subject', + 'Related to'=>'activityid', + 'Date Sent'=>'date_start', + 'Assigned To'=>'assigned_user_id' + ); var $list_link_field= 'subject'; - - - var $rel_users_table = "salesmanactivityrel"; - var $rel_contacts_table = "cntactivityrel"; - var $rel_serel_table = "seactivityrel"; var $object_name = "Email"; @@ -82,9 +77,6 @@ var $default_order_by = 'subject'; var $default_sort_order = 'ASC'; - function create_tables () { - - } function Email() { $this->log = LoggerManager::getLogger('email'); $this->db = new PearDatabase(); @@ -106,12 +98,7 @@ $focus = new Contact(); - $button .= ' '; - - if(isPermitted("Contacts",3,"") == 'yes') - { - $button .= ' '; - } + $button = ''; $returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id; $query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.PearDatabase::quote($id).' and crmentity.deleted=0'; @@ -136,7 +123,7 @@ $result=$adb->query($query); $noofrows = $adb->num_rows($result); - $header[] = $app_strings['LBL_LIST_NAME']; + $header [] = $app_strings['LBL_LIST_NAME']; $header []= $app_strings['LBL_LIST_USER_NAME']; @@ -172,7 +159,7 @@ //Adding Security Check for User - $entries_list[] = entries; + $entries_list[] = $entries; } if($entries_list != '') @@ -198,7 +185,6 @@ left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid inner join users on crm2.smcreatorid= users.id where crmentity.crmid=".PearDatabase::quote($id); - //where crmentity.crmid=".$id; $query .= ' union all '; $query .= "select attachments.description title ,'Attachments' ActivityType, attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified, @@ -225,32 +211,33 @@ return $query; } - /** - * Used to releate email and contacts -- Outlook Plugin - */ - function set_emails_contact_invitee_relationship($email_id, $contact_id) - { - $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; - $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); - } + /** + * Used to releate email and contacts -- Outlook Plugin + */ + function set_emails_contact_invitee_relationship($email_id, $contact_id) + { + $query = "insert into $this->rel_contacts_table (contactid,activityid) values('$contact_id','$email_id')"; + $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); + } - /** - * Used to releate email and salesentity -- Outlook Plugin - */ - function set_emails_se_invitee_relationship($email_id, $contact_id) - { - $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; - $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); - } + /** + * Used to releate email and salesentity -- Outlook Plugin + */ + function set_emails_se_invitee_relationship($email_id, $contact_id) + { + $query = "insert into $this->rel_serel_table (crmid,activityid) values('$contact_id','$email_id')"; + $this->db->query($query,true,"Error setting email to contact relationship: "."
    $query"); + } - /** - * Used to releate email and Users -- Outlook Plugin - */ - function set_emails_user_invitee_relationship($email_id, $user_id) - { - $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; - $this->db->query($query,true,"Error setting email to user relationship: "."
    $query"); - } + /** + * Used to releate email and Users -- Outlook Plugin + */ + function set_emails_user_invitee_relationship($email_id, $user_id) + { + $query = "insert into $this->rel_users_table (smid,activityid) values ('$user_id', '$email_id')"; + $this->db->query($query,true,"Error setting email to user relationship: "."
    $query"); + } + } ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Import/ImportAccount.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportAccount.php (original) +++ vtigercrm/trunk/modules/Import/ImportAccount.php Tue Mar 28 00:44:43 2006 @@ -24,8 +24,6 @@ require_once('data/SugarBean.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Potentials/Opportunity.php'); -//require_once('modules/Cases/Case.php'); -//require_once('modules/Calls/Call.php'); require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Accounts/Account.php'); @@ -35,15 +33,10 @@ class ImportAccount extends Account { var $db; -// Get _dom arrays from Database -//$comboFieldNames = Array('accounttype'=>'account_type_dom' -// ,'industry'=>'industry_dom'); -//$comboFieldArray = getComboArray($comboFieldNames); - - - // these are fields that may be set on import - // but are to be processed and incorporated - // into fields of the parent class + // Get _dom arrays from Database + //$comboFieldNames = Array('accounttype'=>'account_type_dom' + // ,'industry'=>'industry_dom'); + //$comboFieldArray = getComboArray($comboFieldNames); // This is the list of fields that are required. @@ -51,10 +44,10 @@ // This is the list of the functions to run when importing var $special_functions = array( - //"add_billing_address_streets" - //,"add_shipping_address_streets" - //,"fix_website" - ); + //"add_billing_address_streets" + //,"add_shipping_address_streets" + //,"fix_website" + ); function fix_website() Modified: vtigercrm/trunk/modules/Import/ImportContact.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportContact.php (original) +++ vtigercrm/trunk/modules/Import/ImportContact.php Tue Mar 28 00:44:43 2006 @@ -18,19 +18,6 @@ ********************************************************************************/ include_once('config.php'); require_once('include/logging.php'); -/* -require_once('database/DatabaseConnection.php'); -require_once('data/SugarBean.php'); -require_once('include/utils/utils.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Cases/Case.php'); -require_once('modules/Tasks/Task.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Meetings/Meeting.php'); -require_once('modules/Calls/Call.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Accounts/Account.php'); -*/ require_once('modules/Contacts/Contact.php'); require_once('modules/Import/UsersLastImport.php'); require_once('include/database/PearDatabase.php'); @@ -54,16 +41,16 @@ // This is the list of the functions to run when importing var $special_functions = array( - //"get_names_from_full_name" - "add_create_account" - //,"add_salutation" - //,"add_lead_source" - //,"add_birthdate" - //,"add_do_not_call" - //,"add_email_opt_out" - //,"add_primary_address_streets" - //,"add_alt_address_streets" - ); + //"get_names_from_full_name" + "add_create_account" + //,"add_salutation" + //,"add_lead_source" + //,"add_birthdate" + //,"add_do_not_call" + //,"add_email_opt_out" + //,"add_primary_address_streets" + //,"add_alt_address_streets" + ); function add_salutation() { @@ -83,7 +70,6 @@ } } - function add_birthdate() { @@ -161,98 +147,6 @@ $this->last_name = join(' ',$name_arr); } - - /* function add_create_account() - { - global $adb; - // global is defined in UsersLastImport.php - global $imported_ids; - global $current_user; - - if ( (! isset($this->account_name) || $this->account_name == '') && - (! isset($this->account_id) || $this->account_id == '') ) - { - return; - } - - $arr = array(); - - // check if it already exists - $focus = new Account(); - - $query = ''; - - // if user is defining the account id to be associated with this contact.. - if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - } - - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); - - $row = $this->db->fetchByAssoc($result, -1, false); - - // we found a row with that id - if (isset($row['id']) && $row['id'] != -1) - { - // if it exists but was deleted, just remove it entirely - if ( isset($row['deleted']) && $row['deleted'] == 1) - { - $query2 = "delete from {$focus->table_name} WHERE id='". $row['id']."'"; - - $this->log->info($query2); - - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); - - } - // else just use this id to link the contact to the account - else - { - $focus->id = $row['id']; - } - } - - // if we didnt find the account, so create it - if (! isset($focus->id) || $focus->id == '') - { - $focus->name = $this->account_name; - $focus->assigned_user_id = $current_user->id; - $focus->modified_user_id = $current_user->id; - - if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save(); - // avoid duplicate mappings: - if (! isset( $imported_ids[$this->account_id]) ) - { - // save the new account as a users_last_import - $last_import = new UsersLastImport(); - $last_import->assigned_user_id = $current_user->id; - $last_import->bean_type = "Accounts"; - $last_import->bean_id = $focus->id; - $last_import->save(); - $imported_ids[$this->account_id] = 1; - } - } - - // now just link the account - $this->account_id = $focus->id; - - }*/ function add_create_account() { @@ -277,29 +171,13 @@ $query = ''; // if user is defining the account id to be associated with this contact.. - /*if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - }*/ - - //$query = "select * from {$focus->table_name} WHERE accountname='{$acc_name}' left join crmentity on crmentity.crmid =account.accountid"; //Modified to remove the spaces at first and last in account name -- after 4.2 patch 2 - $adb->println("Account name in csv file related to contact - to be search =>'".$acc_name."'"); $acc_name = trim(addslashes($acc_name)); - $adb->println("Account name going to search in database after addslashes, trim =>'".$acc_name."'"); $query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid"; - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); + $result = $adb->query($query) or die("Error selecting sugarbean: ".mysql_error()); $row = $this->db->fetchByAssoc($result, -1, false); @@ -317,8 +195,7 @@ $this->log->info($query2); - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); + $result2 = $adb->query($query2) or die("Error deleting existing sugarbean: ".mysql_error()); } // else just use this id to link the contact to the account @@ -343,14 +220,6 @@ $adb->println("New Account created id=".$focus->id); - /*if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save();*/ // avoid duplicate mappings: if (! isset( $imported_ids[$acc_id]) ) { @@ -377,7 +246,7 @@ // This is the list of fields that can be imported // some of these don't map directly to columns in the db -//we need to add two or more arrays as the columns are distributed across the tables now + //we need to add two or more arrays as the columns are distributed across the tables now /*var $importable_fields = array( "contactid"=>1, "firstname"=>1, Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Tue Mar 28 00:44:43 2006 @@ -72,69 +72,25 @@ return "Object:ImportMap id=$this->id name=$this->name module=$this->module content=$this->content"; } - function create_tables () - { - /* - $query = 'CREATE TABLE '.$this->table_name.' ( '; - $query .='id char(36) NOT NULL'; - $query .=', name char(36) NOT NULL'; - $query .=', module char(36) NOT NULL'; - $query .=', content blob'; - $query .=', has_header bool NOT NULL default 1'; - $query .=', deleted bool NOT NULL default 0'; - $query .=', date_entered datetime NOT NULL'; - $query .=', date_modified datetime NOT NULL'; - $query .=', assigned_user_id char(36)'; - $query .=', is_published char(3) NOT NULL default \'no\''; - $query .=', PRIMARY KEY ( ID ) )'; - - - - - $this->db->query($query,true,"Error creating table: ".$this->table_name. ":" ); - - - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - // Create the indexes - $this->create_index("create index idx_cont_owner_id_module_and_name on ".$this->table_name." (assigned_user_id, module, name, deleted)");*/ - } - - function drop_tables () - { - /* - $query = 'DROP TABLE IF EXISTS '.$this->table_name; - - - - $this->db->query($query); - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - - } - function save_map( $owner_id, $name, $module, $has_header,$content ) { - $query_arr = array( - 'assigned_user_id'=>$owner_id,'name'=>$name); + $query_arr = array('assigned_user_id'=>$owner_id,'name'=>$name); $this->retrieve_by_string_fields($query_arr, false); $result = 1; $this->assigned_user_id = $owner_id; - //$this->new_with_id=$this->db->getUniqueID("import_maps"); + $this->name = $name; $this->module = $module; - //$this->content = $content; + $this->content = "".$this->db->getEmptyBlob().""; $this->has_header = $has_header; $this->deleted = 0; $returnid = $this->save(); - //$this->db->println("save_map=".$this->new_with_id); + $this->db->updateBlob($this->table_name,"content","name='".$name."' and module='".$module."'",$content); - //$this->db->updateBlob($this->table_name,"content","id=".$this->new_with_id,$content); - + return $result; } Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original) +++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Tue Mar 28 00:44:43 2006 @@ -24,8 +24,6 @@ require_once('data/SugarBean.php'); require_once('modules/Contacts/Contact.php'); require_once('modules/Potentials/Opportunity.php'); -//require_once('modules/Cases/Case.php'); -//require_once('modules/Calls/Call.php'); require_once('modules/Notes/Note.php'); require_once('modules/Emails/Email.php'); require_once('modules/Accounts/Account.php'); @@ -41,28 +39,25 @@ class ImportOpportunity extends Potential { var $db; - // these are fields that may be set on import - // but are to be processed and incorporated - // into fields of the parent class - - // This is the list of fields that are required. - /*var $required_fields = array( - "potentialname"=>1, - "account_id"=>1, - "closingdate"=>1, - "sales_stage"=>1, - "amount"=>1 -);*/ - + /* + var $required_fields = array( + "potentialname"=>1, + "account_id"=>1, + "closingdate"=>1, + "sales_stage"=>1, + "amount"=>1 + ); + */ + // This is the list of the functions to run when importing var $special_functions = array( - "add_create_account", - //"add_lead_source", - //"add_opportunity_type", - //"add_date_closed" - //"add_sales_stage" - ); + "add_create_account", + //"add_lead_source", + //"add_opportunity_type", + //"add_date_closed" + //"add_sales_stage" + ); function add_lead_source() { @@ -116,100 +111,7 @@ //exactly the same function from ImportAccount.php // lets put this in one place.. - /*function add_create_account() - { - global $adb; - // global is defined in UsersLastImport.php - global $imported_ids; - global $current_user; - - if ( (! isset($this->account_name) || $this->account_name == '') && - (! isset($this->account_id) || $this->account_id == '') ) - { - return; - } - - $arr = array(); - - // check if it already exists - $focus = new Account(); - - $query = ''; - - // if user is defining the account id to be associated with this contact.. - if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'" -; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - } - - $this->log->info($query); - - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); - - $row = $this->db->fetchByAssoc($result, -1, false); - // if we found a row with that id - if (isset($row['id']) && $row['id'] != -1) - { - // if it exists but was deleted, just remove it entirely - if ( isset($row['deleted']) && $row['deleted'] == 1) - { - $query2 = "delete from {$focus->table_name} WHERE id='". $row['id']."'"; - - $this->log->info($query2); - - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); - - } - // else just use this id to link the contact to the account - else - { - $focus->id = $row['id']; - } - } - - // we didnt find the account, so create it - if (! isset($focus->id) || $focus->id == '') - { - $focus->name = $this->account_name; - $focus->assigned_user_id = $current_user->id; - $focus->modified_user_id = $current_user->id; - - if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save(); - // avoid duplicate mappings: - if (! isset( $imported_ids[$this->account_id]) ) - { - // save the new account as a users_last_import - $last_import = new UsersLastImport(); - $last_import->assigned_user_id = $current_user->id; - $last_import->bean_type = "Accounts"; - $last_import->bean_id = $focus->id; - $last_import->save(); - $imported_ids[$this->account_id] = 1; - } - } - - $this->account_id = $focus->id; - - } - */ - - -function add_create_account() + function add_create_account() { global $adb; // global is defined in UsersLastImport.php @@ -232,24 +134,12 @@ $query = ''; // if user is defining the account id to be associated with this contact.. - /*if ( isset($this->account_id) && $this->account_id != '') - { - $query = "select * from {$focus->table_name} WHERE id='{$this->account_id}'"; - } - // else user is defining the account name to be associated with this contact.. - else - { - $query = "select * from {$focus->table_name} WHERE name='{$this->account_name}'"; - }*/ - - //$query = "select * from {$focus->table_name} WHERE accountname='{$acc_name}' left join crmentity on crmentity.crmid =account.accountid"; - $acc_name = addslashes($acc_name); + $acc_name = trim(addslashes($acc_name)); $query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid"; $this->log->info($query); - $result = $adb->query($query) - or die("Error selecting sugarbean: ".mysql_error()); + $result = $adb->query($query) or die("Error selecting sugarbean: ".mysql_error()); $row = $this->db->fetchByAssoc($result, -1, false); @@ -267,8 +157,7 @@ $this->log->info($query2); - $result2 = $adb->query($query2) - or die("Error deleting existing sugarbean: ".mysql_error()); + $result2 = $adb->query($query2) or die("Error deleting existing sugarbean: ".mysql_error()); } // else just use this id to link the contact to the account @@ -287,20 +176,11 @@ $focus->column_fields['assigned_user_id'] = $current_user->id; $focus->column_fields['modified_user_id'] = $current_user->id; - //$focus->saveentity("Accounts"); $focus->save("Accounts"); $acc_id = $focus->id; $adb->println("New Account created id=".$focus->id); - /*if ( isset($this->account_id) && - $this->account_id != '') - { - $focus->new_with_id = true; - $focus->id = $this->account_id; - } - - $focus->save();*/ // avoid duplicate mappings: if (! isset( $imported_ids[$acc_id]) ) { @@ -321,7 +201,6 @@ $adb->println("curr contact accid=".$this->column_fields["account_id"]); } - function fix_website() Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportSteplast.php (original) +++ vtigercrm/trunk/modules/Import/ImportSteplast.php Tue Mar 28 00:44:43 2006 @@ -61,23 +61,22 @@ if ( isset($_REQUEST['message'])) { -?> - -
    - - - - - -
    -
    - -
    -
    -
    - +
    + + + + + +
    +
    + +
    +
    +
    +
    @@ -89,29 +88,31 @@ - - +
    + + - +
    + - - - - - - - - - + + + + + + + + + - +
    - -
    + + +
    - - + bean_type = "Contacts"; $contact_query = $seedUsersLastImport->create_list_query($o,$w); $current_module_strings = return_module_language($current_language, 'Contacts'); -/*$seedUsersLastImport->list_fields = Array('id', 'first_name', 'last_name', 'account_name', 'account_id', 'title', 'yahoo_id', 'email1', 'phone_work', 'assigned_user_name', 'assigned_user_id'); - -$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Contacts' and users_last_import.bean_id=contactdetails.contactid AND users_last_import.deleted=0"; -*/ - $contact = new Contact(); -//$seedUsersLastImport->list_fields = $contact->column_fields; $seedUsersLastImport->list_fields = $contact->list_fields; $list_result = $adb->query($contact_query); @@ -143,6 +139,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Contacts','', false); $xtpl=new XTemplate ('modules/Contacts/ListView.html'); @@ -150,7 +147,6 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { @@ -166,8 +162,8 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); $adb->println("IMPLST Naviga"); $adb->println($navigation_array); + //Retreive the List View Table Header - $listview_header = getListViewHeader($contact,"Contacts"); $xtpl->assign("LISTHEADER", $listview_header); @@ -219,24 +215,15 @@ $xtpl->out("main"); - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Contacts/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Contacts" ); - #$ListView->setQuery($where, "", "","CONTACT"); - #$ListView->processListView($seedUsersLastImport, "main", "CONTACT"); - - echo "
    "; } -//opps list +//To display the list of Potentials imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Potentials"; -#$seedUsersLastImport->list_fields = Array('id', 'name','account_id','account_name','amount','date_closed','assigned_user_name', 'assigned_user_id'); - $current_module_strings = return_module_language($current_language, 'Potentials'); $potential_query = $seedUsersLastImport->create_list_query($o,$w); @@ -250,6 +237,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Potentials','', false); $xtpl=new XTemplate ('modules/Potentials/ListView.html'); @@ -257,7 +245,6 @@ $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') { @@ -271,7 +258,6 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($potential,"Potentials"); $xtpl->assign("LISTHEADER", $listview_header); @@ -317,27 +303,17 @@ $xtpl->assign("Prev", $prevoutput); $xtpl->parse("main"); - $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Potentials' and users_last_import.bean_id=potential.potentialid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Potentials/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Potentials" ); - #$ListView->setQuery($where, "", "","POTENTIAL"); - #$ListView->processListView($seedUsersLastImport, "main", "POTENTIAL"); echo "
    "; } -//leads list +//To display the list of Leads imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Leads"; -#$seedUsersLastImport->list_fields = Array('id', 'name','account_id','account_name','amount','date_closed','assigned_user_name', 'assigned_user_id'); - $current_module_strings = return_module_language($current_language, 'Potentials'); $lead_query = $seedUsersLastImport->create_list_query($o,$w); @@ -351,6 +327,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty $implict_account=true; echo get_form_header('Last Imported Leads','', false); $xtpl=new XTemplate ('modules/Leads/ListView.html'); @@ -371,7 +348,6 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($lead,"Leads"); $xtpl->assign("LISTHEADER", $listview_header); @@ -417,26 +393,16 @@ $xtpl->assign("Prev", $prevoutput); $xtpl->parse("main"); - $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Potentials' and users_last_import.bean_id=potential.potentialid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Potentials/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Potentials" ); - #$ListView->setQuery($where, "", "","POTENTIAL"); - #$ListView->processListView($seedUsersLastImport, "main", "POTENTIAL"); echo "
    "; } - +//To display the list of Accounts imported $newForm = null; $seedUsersLastImport = new UsersLastImport(); $seedUsersLastImport->bean_type = "Accounts"; $account_query = $seedUsersLastImport->create_list_query($o,$w); -//$seedUsersLastImport->list_fields = Array('id', 'name', 'website', 'phone_office', 'billing_address_city', 'assigned_user_name', 'assigned_user_id'); -//$seedUsersLastImport->list_fields = Array('accountid', 'accountname', 'website', 'phone', 'email1', 'assigned_user_name', 'fax'); $current_module_strings = return_module_language($current_language, 'Accounts'); @@ -449,6 +415,7 @@ if($noofrows>1) { + //Change this XTemplate to Smarty if($implict_account==true) echo get_form_header('Newly created Accounts','', false); else @@ -457,7 +424,6 @@ $xtpl->assign("MOD", $mod_strings); $xtpl->assign("APP", $app_strings); $xtpl->assign("IMAGE_PATH",$image_path); - //Retreiving the start value from request if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') @@ -472,9 +438,7 @@ $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); //Retreive the List View Table Header - $listview_header = getListViewHeader($account,"Accounts"); - //$xtpl->assign("LISTHEADER", $listview_header); $listview_entries = getListViewEntries($account,"Accounts",$list_result,$navigation_array); $xtpl->assign("LISTHEADER", $listview_header); @@ -521,14 +485,6 @@ $xtpl->out("main"); - //$where = "users_last_import.assigned_user_id='{$current_user->id}' AND users_last_import.bean_type='Accounts' and users_last_import.bean_id=account.accountid AND users_last_import.deleted=0"; - - #$ListView = new ListView(); - #$ListView->initNewXTemplate( 'modules/Accounts/ListView.html',$current_module_strings); - #$ListView->setHeaderTitle("Last Imported Accounts" ); - #$ListView->setQuery($where, "", "name"); - #$ListView->setQuery($where, "", "","ACCOUNT"); - #$ListView->processListView($seedUsersLastImport, "main", "ACCOUNT"); } ?> Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/trunk/modules/Import/UsersLastImport.php (original) +++ vtigercrm/trunk/modules/Import/UsersLastImport.php Tue Mar 28 00:44:43 2006 @@ -40,12 +40,13 @@ var $table_name = "users_last_import"; var $object_name = "UsersLastImport"; - var $column_fields = Array("id" - ,"assigned_user_id" - ,"bean_type" - ,"bean_id" - ,"deleted" - ); + var $column_fields = Array( + "id" + ,"assigned_user_id" + ,"bean_type" + ,"bean_id" + ,"deleted" + ); var $new_schema = true; @@ -65,21 +66,10 @@ } - function create_tables () - { - } - - function drop_tables () - { - } - - function mark_deleted_by_user_id($user_id) { - $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'"; $this->db->query($query,true,"Error marking last imported accounts deleted: "); - } @@ -92,48 +82,6 @@ if ($this->bean_type == 'Contacts') { - /*$query = "SELECT distinct - account.accountname as account_name, - account.accountid as account_id, - contactdetails.contactid, - crmentity.smownerid, - contactdetails.yahooid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import - LEFT JOIN users ON contactdetails.contactid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - inner join crmentity on crmentity.crmid=contactdetails.contactid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0"; - */ - /*$query = "SELECT distinct crmid, - account.accountname as account_name, - contactdetails.contactid, - contactdetails.accountid, - contactdetails.yahooid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.id as assigned_user_id, - smownerid, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import - LEFT JOIN users ON contactdetails.contactid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - inner join crmentity on crmentity.crmid=contactdetails.contactid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0";*/ $query = "SELECT distinct crmid, account.accountname as account_name, contactdetails.contactid, @@ -159,19 +107,6 @@ } else if ($this->bean_type == 'Accounts') { - /*$query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM accounts, users_last_import - LEFT JOIN users - ON accounts.assigned_user_id=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=accounts.id - AND users_last_import.deleted=0 - AND accounts.deleted=0 - AND users.status='ACTIVE'";*/ $query = "SELECT distinct account.*, accountbillads.city, users.user_name assigned_user_name, crmid, smownerid @@ -191,29 +126,6 @@ else if ($this->bean_type == 'Potentials') { - /*$query = "SELECT distinct - accounts.id account_id, - accounts.name account_name, - users.user_name assigned_user_name, - opportunities.* - FROM opportunities, users_last_import - LEFT JOIN users - ON opportunities.assigned_user_id=users.id - LEFT JOIN accounts_opportunities - ON opportunities.id=accounts_opportunities.opportunity_id - LEFT JOIN accounts - ON accounts_opportunities.account_id=accounts.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Potentials' - AND users_last_import.bean_id=opportunities.id - AND users_last_import.deleted=0 - AND accounts_opportunities.deleted=0 - AND accounts.deleted=0 - AND opportunities.deleted=0 - AND users.status='ACTIVE'";*/ - $query = "SELECT distinct account.accountid account_id, account.accountname account_name, @@ -254,109 +166,10 @@ } - - /*if(! empty($order_by)) - { - $query .= " ORDER BY $order_by"; - }*/ - return $query; } - - - -/* function create_list_query(&$order_by, &$where) - { - - echo 'the bean type is >>>>>>>>>>>>>>>>>>>>>>>>>>>> ' .$this->bean_type; - global $current_user; - $query = ''; - - if ($this->bean_type == 'Contacts') - { - $query = "SELECT distinct - account.accountname as account_name, - account.accountid as account_id, - contactdetails.contactid, - crmentity.smownerid, - contactdetails.firstname, - contactdetails.lastname, - contactdetails.phone, - contactdetails.title, - contactdetails.email, - users.user_name as assigned_user_name - FROM contactdetails, users_last_import inner join crmentity on crmentity.crmid=contactdetails.contactid - LEFT JOIN users ON crmentity.smownerid=users.id - LEFT JOIN account ON account.accountid=contactdetails.accountid - WHERE users_last_import.assigned_user_id= '{$current_user->id}' - AND users_last_import.bean_type='Contacts' - AND users_last_import.bean_id=contactdetails.contactid - AND users_last_import.deleted=0 AND crmentity.deleted=0 AND users.status='ACTIVE'"; - - echo 'Contacts >>>>>>>>>>>>>>>> '.$query; - } - else if ($this->bean_type == 'Accounts') - { - /*$query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM account, users_last_import - LEFT JOIN users - ON account.assigned_user_id=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=accounts.id - AND users_last_import.deleted=0 - AND accounts.deleted=0 - AND users.status='ACTIVE'"; - - $query = "SELECT distinct account.*, - users.user_name assigned_user_name - FROM account, users_last_import inner join crmentity on crmentity.crmid=account.accountid left join users - ON crmentity.smownerid=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Accounts' - AND users_last_import.bean_id=crmentity.crmid - AND users_last_import.deleted=0 - AND crmentity.deleted=0 - AND users.status='ACTIVE'"; - echo '
    Accounts >>>>>>>>>>>>>>>> '.$query; - } - else if ($this->bean_type == 'Potentials') - { - - $query = "SELECT distinct - account.accountid account_id, - account.accountname account_name, - users.user_name assigned_user_name - FROM potential, users_last_import inner join crmentity on crmentity.crmid=potential.potentialdid left join users - ON crmentity.smownerid=users.id - WHERE - users_last_import.assigned_user_id= - '{$current_user->id}' - AND users_last_import.bean_type='Potentials' - AND users_last_import.bean_id=crmentity.crmid - AND users_last_import.deleted=0 - AND crmentity.deleted=0 - AND users.status='ACTIVE'"; - - - echo '
    Potentials >>>>>>>>>>>>>>>> '.$query; - } - - if(! empty($order_by)) - { - $query .= " ORDER BY $order_by"; - } - - return $query; - - }*/ function list_view_parse_additional_sections(&$list_form) { @@ -391,42 +204,22 @@ function undo_contacts($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Contacts' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; - /*$query2 = "update crmentity set crmentity.deleted=1 inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.contactid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2);*/ - - //TODO WELL BEFORE RELEASE RICHIE - //$query4 = "update contpotentialrel"; - - //$this->log->info($query4); - - // $result4 = $this->db->query($query4) - // or die("Error undoing last import: ".mysql_error()); - } return $count; } @@ -434,42 +227,22 @@ function undo_leads($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Leads' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; - /*$query2 = "update crmentity set crmentity.deleted=1 inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.contactid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2);*/ - - //TODO WELL BEFORE RELEASE RICHIE - //$query4 = "update contpotentialrel"; - - //$this->log->info($query4); - - // $result4 = $this->db->query($query4) - // or die("Error undoing last import: ".mysql_error()); - } return $count; } @@ -478,57 +251,21 @@ { // this should just be a loop foreach module type $count = 0; - $query1 = "select bean_id from users_last_import - where assigned_user_id='$user_id' - AND bean_type='Accounts' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count++; - //$count = $this->db->getAffectedRowCount($result2); - - - /*$query2 = "update accounts set accounts.deleted=1 - where accounts.id='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2); - - $query3 = "update accounts_contacts set accounts_contacts.deleted=1 - where accounts_contacts.account_id='{$row1['bean_id']}' - AND accounts_contacts.deleted=0"; - - $this->log->info($query3); - - $result3 = $this->db->query($query3) - or die("Error undoing last import: ".mysql_error()); - - $query4 = "update accounts_opportunities set accounts_opportunities.deleted=1 - where accounts_opportunities.account_id='{$row1['bean_id']}' - AND accounts_opportunities.deleted=0"; - - $this->log->info($query4); - - $result4 = $this->db->query($query4) - or die("Error undoing last import: ".mysql_error()); - */ + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); + + $count++; } return $count; @@ -538,54 +275,21 @@ { // this should just be a loop foreach module type $count = 0; - $query1 = "select bean_id from users_last_import - where assigned_user_id='$user_id' - AND bean_type='Potentials' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count++; - - /*$query2 = "update opportunities set opportunities.deleted=1 - where opportunities.id='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); - - $count = $this->db->getAffectedRowCount($result2); - - $query3 = "update opportunities_contacts set opportunities_contacts.deleted=1 - where opportunities_contacts.opportunity_id='{$row1['bean_id']}' - AND opportunities_contacts.deleted=0"; - - $this->log->info($query3); - - $result3 = $this->db->query($query3) - or die("Error undoing last import: ".mysql_error()); - - - $query4 = "update accounts_opportunities set accounts_opportunities.deleted=1 - where accounts_opportunities.opportunity_id='{$row1['bean_id']}' - AND accounts_opportunities.deleted=0"; - - $this->log->info($query4); - - $result4 = $this->db->query($query4) - or die("Error undoing last import: ".mysql_error()); */ + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); + + $count++; } return $count; @@ -594,22 +298,19 @@ function undo_products($user_id) { $count = 0; - $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' - AND bean_type='Products' AND deleted=0"; - - $this->log->info($query1); - - $result1 = $this->db->query($query1) - or die("Error getting last import for undo: ".mysql_error()); - - while ( $row1 = $this->db->fetchByAssoc($result1)) - { - $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; - - $this->log->info($query2); - - $result2 = $this->db->query($query2) - or die("Error undoing last import: ".mysql_error()); + $query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0"; + + $this->log->info($query1); + + $result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); + + while ( $row1 = $this->db->fetchByAssoc($result1)) + { + $query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'"; + + $this->log->info($query2); + + $result2 = $this->db->query($query2) or die("Error undoing last import: ".mysql_error()); $count++; } Modified: vtigercrm/trunk/modules/Migration/Migration.php ============================================================================== --- vtigercrm/trunk/modules/Migration/Migration.php (original) +++ vtigercrm/trunk/modules/Migration/Migration.php Tue Mar 28 00:44:43 2006 @@ -100,22 +100,6 @@ echo '
    Current Database has been created.'; } - function dropAllData($conn) - { - $tables_list = $conn->get_tables(); - foreach($tables_list as $key) - { - //if the table name has _seq, the let it pass - if(strpos($key,"_seq")) - { - $conn->println('
    skipping table '.$key .' for truncation '); - continue; - } - $sql = "delete from ".$key; - $conn->query($sql); - } - } - function applyDumpData($host_name,$mysql_port,$mysql_username,$mysql_password,$dbname,$dumpfile) { if($mysql_password != '') @@ -149,7 +133,7 @@ //To handle the file includes for each and every version //Here we have to decide which files should be included, where the files will be added newly for every public release - //Mickie -- Handle Here + //Handle Here -- Mickie include("ModifyDatabase/42P2_to_50Alpha.php"); $conn->println("Mickie ---- Ends\n\n\n"); @@ -202,9 +186,6 @@ $this->conn->println("Going to Create the current Database"); $this->createDatabase($conn,$new_dbname); - //Drop all the values from the tables - //$this->dropAllData($conn); - //Apply the dump of the old database to the current database $this->conn->println("Going to apply the old database dump to the new database."); $this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:44:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:44:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4573 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060328074459.C407F50668B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:44:54 2006 New Revision: 4573 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Tue Mar 28 00:44:54 2006 @@ -164,12 +164,7 @@ if ( isset($_GET['team']) ) { $team = $_GET['team']; $x = $user->set_prefteam($team); - } //else { - /* Get the last used team */ - //$team = $user->get_prefteam(); - //} - //$user->readKnownParties(); - + } /* Get group or user whose calendar should be displayed */ /* default to current checked in user */ if ( ($team == CAL_EVERYTHING) && ! is_admin($current_user) ) { @@ -339,18 +334,12 @@ */ class appointment extends tutos_base { - /* --------------------------------------------------------------------------- - */ var $db; function appointment() { global $table,$current_user; - #$this->init($dbconn); $this->db = new PearDatabase(); - # if ( ! class_exists ("product") ) { - # require_once 'product.pinc'; - # } $this->descr = ""; $this->trace = 0; $this->outside = 0; @@ -359,7 +348,6 @@ $this->end = new DateTime(); $this->t_ignore = 0; $this->visitor = -1; - #$this->product = new product($this->dbconn); $this->remember = 0; $this->remembered = 0; $this->email = 0; @@ -373,7 +361,6 @@ $this->init_custom("appointment1"); - # Repeat stuff $this->repeat = APP_NOREP; $this->r_arg = 0; $this->r_ignore = 0; @@ -383,21 +370,6 @@ $this->tablename = $this->dbconn->prefix .$table['appointment1'][name]; } - /** - * fill the object data with a given resultset - * - * @param Object $r a result set object - * @param int $pos a index in the resultset - */ - - /* function getUserName($userid) - { - //require_once("modules/Users/User.php"); - $user = new User(); - $user->retrieve($userid); - return $user->first_name." ".$user->last_name; - } -*/ function getContactName($contactid) { require_once("modules/Contacts/Contact.php"); @@ -409,10 +381,7 @@ // srini read_result function read_result ($val_array, $pos=-1) { - // print("
    GS --> read_result pos=".$pos); - // print_r($val_array); if($pos!=-1) return; - //print("GS --> continuing"); $fmt_sthr=''; $fmt_stm=''; list($sthr,$stmn,$stsc) = split(":",$val_array["time_start"]); @@ -461,10 +430,8 @@ $this->subject = $val_array["subject"]; $this->module_name = $val_array["activitytype"]; $this->record_id = $val_array["activityid"]; - #$this->creator = getObject($this->dbconn,$r->get($pos, "creator")); $obj->creator->id = $val_array["smownerid"]; - #$this->creator = $val_array["creator"]; $this->creator = getUserName($val_array["smownerid"]); //For displaying the group name in the calendar -Jaguar @@ -958,19 +925,11 @@ function getLink($text = -1) { global $lang,$mod_strings; - // commented temporary srini - /*if ( ($this->mod_ok()) && ($this->end->getTimestamp() - time() > 0 ) ) {*/ // commented and added by raj #$url = $this->getModURL(); - // $url = "../../index.php?module=Activities&action=DetailView&actvity_mode=Events&record=".$this->record_id; $url = "index.php?action=DetailView&module=Activities&record=".$this->record_id ."&activity_mode=Events"; - // $info = $mod_strings['LBL_CHANGE_APPNT']; - /*} else { - $url = $this->getURL(); - $info = $lang['seeapp']; - }*/ if ( $this->repeat == APP_NOREP ) { if ( $this->t_ignore == 0) { $info = sprintf ($info,$this->start->getDateTimeShort(),$this->end->getDateTimeShort()); @@ -1074,8 +1033,6 @@ } else if ($fld == "end") { $d = new DateTime($data); $this->setEndTime($d); -# } else if ($fld == "participant") { -# $this->setLName($data); } else if ($fld == "t_ignore") { $this->t_ignore = $data; } else if ($fld == "r_ignore") { @@ -1244,9 +1201,7 @@ $end = $app->end; $start->setDateTime($app->start->getYYYYMMDD()); $end->setDateTime($app->end->getYYYYMMDD()); -# if ( $start->getDate() == $end->GetDate() ) { $end->addDays(1); -# } $start_ts2 = $start->getTimestamp(); $end_ts2 = $end->getTimestamp(); } else { @@ -1322,7 +1277,6 @@ */ function getLocation() { global $lang; - #return "outside ."\">". $lang['AppLoc'][$this->outside] .""; return "". $this->outside .""; } /** @@ -1415,8 +1369,6 @@ //added from Fredy's patch echo " ". $this->creator ."  \n"; - #echo " ". $this->getLocation() ."\n"; - #echo " ". $this->outside ."\n"; echo " \n"; //added account names to the calendar entry given by Fredy @@ -1484,10 +1436,8 @@ //Added for description $descr = eregi_replace("\n","
    ",$this->descr); if ($descr != "" ) { - //echo " module_name."s.gif\" border=\"0\">  echo " "; echo "".$this->getLink(urlReplace($descr))." \n"; - //echo " ". $this->creator ." \n"; } @@ -1513,11 +1463,6 @@ echo "
    ". $this->visitor->getLink() ."\n"; } - /*product::small_infolist($current_user,$this,3,$class); - foreach($tutos[activemodules] as $i => $f) { - $x = new $tutos[modules][$f][name]($this->dbconn); - $x->small_infolist($current_user,$this,3,$class); - }*/ } return; } @@ -1678,24 +1623,6 @@ info => $lang['NewAppointInfo'], category => array("app","new","obj") ); - /* if ( ($obj->getType() == "company") || - ($obj->getType() == "department") - ) { - $x[0][url] = addUrlParameter($x[0][url],"vid=".$obj->id); - $x[0][category] = array("app","new","module"); - $x[0][text] = $lang['NewAppoint']; - } else if ( ($obj->getType() == "product") ) { - $x[0][url] = addUrlParameter($x[0][url],"pid=".$obj->id); - $x[0][category] = array("app","new","module"); - $x[0][text] = $lang['NewAppoint']; - } else { - $x[1] = array( url => "app_new_r.php", - text => $lang['NewAppointR'], - info => $lang['NewAppointInfoR'], - category => array("app","new","obj") - ); - } -*/ return $x; } /** From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:45:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:45:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4574 - /vtigercrm/trunk/modules/Import/SugarFile.php Message-ID: <20060328074556.61ECD506695@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:45:49 2006 New Revision: 4574 Log: * Removed the file as it is not used anywhere Removed: vtigercrm/trunk/modules/Import/SugarFile.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:46:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:46:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4575 - /vtigercrm/trunk/include/js/clock.js Message-ID: <20060328074659.9E48F506693@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:46:55 2006 New Revision: 4575 Log: common function related to cookies has been removed Modified: vtigercrm/trunk/include/js/clock.js Modified: vtigercrm/trunk/include/js/clock.js ============================================================================== --- vtigercrm/trunk/include/js/clock.js (original) +++ vtigercrm/trunk/include/js/clock.js Tue Mar 28 00:46:55 2006 @@ -203,39 +203,6 @@ ClockAndAssign(); } -// Setting cookies -function set_cookie ( name, value, exp_y, exp_m, exp_d, path, domain, secure ) -{ - var cookie_string = name + "=" + escape ( value ); - - if (exp_y) //delete_cookie(name) - { - var expires = new Date ( exp_y, exp_m, exp_d ); - cookie_string += "; expires=" + expires.toGMTString(); - } - - if (path) cookie_string += "; path=" + escape ( path ); - if (domain) cookie_string += "; domain=" + escape ( domain ); - if (secure) cookie_string += "; secure"; - - document.cookie = cookie_string; -} - -// Retrieving cookies -function get_cookie(cookie_name) -{ - var results = document.cookie.match(cookie_name + '=(.*?)(;|$)'); - if (results) return (unescape(results[1])); - else return null; -} - -// Delete cookies -function delete_cookie( cookie_name ) -{ - var cookie_date = new Date ( ); // current date & time - cookie_date.setTime ( cookie_date.getTime() - 1 ); - document.cookie = cookie_name += "=; expires=" + cookie_date.toGMTString(); -} if (get_cookie("timezone")==null || get_cookie("timezone")==false || get_cookie("timezone")<0 || get_cookie("timezone")=="1") { lcl(0,true) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 02:47:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 07:47:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4576 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060328074726.276BF506695@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 00:47:22 2006 New Revision: 4576 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Tue Mar 28 00:47:22 2006 @@ -32,14 +32,10 @@ include_once $calpath .'webelements.p3'; include_once $calpath .'permission.p3'; include_once $calpath .'preference.pinc'; - #include_once $calpath .'task.pinc'; include_once $calpath .'appointment.pinc'; include_once $calpath .'addEventUI.php'; require_once('modules/Calendar/UserCalendar.php'); - #include_once $calpath .'product.pinc'; - - /* Check if user is allowed to use it */ - #check_user(); + loadmodules("appointment","show"); loadlayout(); /** @@ -51,7 +47,6 @@ $this->pref = new preference(); $this->db = new PearDatabase(); $calobj = new UserCalendar(); -// $this->tablename = $calobj->table_name; } /** @@ -65,8 +60,6 @@ */ function getHourList($hour,$maxcol,$table,$i) { - //echo '
    ';print_r($table);echo '
    '; - //echo $maxcol; global $adb; echo ""; echo " @@ -94,7 +87,7 @@ } echo "\n"; echo $table[$i][$c]->formatted(); - echo "
    ";//\n"; + echo " "; } else if ( $table[$i][$c] = -1 ) { # SKIP occupied by rowspan } @@ -115,7 +108,6 @@ "; } - //end @@ -316,10 +308,6 @@ global $tutos, $lang,$msg; $this->name = $mod_strings['LBL_MODULE_NAME']; - #if ( ! $this->user->feature_ok(usecalendar,PERM_SEE) ) { - # $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); - # $this->stop = true; - #} $this->teamname = ""; $this->t = Date("Ymd"); @@ -337,22 +325,11 @@ } $this->addHidden("t", $this->t); $this->uids = cal_parse_options($this->pref,$this->teamname); - #$this->team = $this->user->get_prefteam(); - # menu - #$m = appointment::getSelectLink($this->user); - #$m[category][] = "obj"; - #$this->addmenu($m); - #$m = appointment::getAddLink($this->user,$this->user); - #$this->addMenu($m); } } - -# info($t,$this->user->get_prefteam(),$teamname,$uids); - $l = new calendar_day($current_user); $l->display(); - #$dbconn->Close(); ?> - - -EOQ; - -return $the_script; -} - ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 05:13:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:13:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4598 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060328101320.32D4D506771@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:13:15 2006 New Revision: 4598 Log: get_set_focus_js() has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Tue Mar 28 03:13:15 2006 @@ -168,7 +168,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if(isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 05:26:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:26:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4599 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060328102658.6C1DF5067BB@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:26:52 2006 New Revision: 4599 Log: changes made for multiselect combo box Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Tue Mar 28 03:26:52 2006 @@ -8,22 +8,22 @@ * All Rights Reserved. * ********************************************************************************/ + +require_once('include/CustomFieldUtil.php'); +require_once('XTemplate/xtpl.php'); -require_once ($theme_path."layout_utils.php"); -require_once('include/CustomFieldUtil.php'); -global $mod_strings,$adb; echo get_module_title("Settings", $mod_strings['LBL_MODULE_NAME'].": ".$mod_strings['NEW']." ".$mod_strings[$_REQUEST['fld_module']]." ".$mod_strings['CUSTOMFIELD'], true); -require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; -global $theme; +global $mod_strings,$app_strings,$app_list_strings,$theme,$adb; + $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; + require_once($theme_path.'layout_utils.php'); + $tabid=$_REQUEST['tabid']; $fieldid=$_REQUEST['fieldid']; + $xtpl=new XTemplate ('modules/Settings/customfield.html'); if(isset($fieldid) && $fieldid!='') { @@ -37,7 +37,8 @@ $xtpl->assign("LABELVALUE",$customfield_fieldlabel); $xtpl->assign("LENGTHVALUE",$fieldlength); $xtpl->assign("DECIMALVALUE",$decimalvalue); - if($fieldtype == '7') + $xtpl->assign("READ","readonly"); + if($fieldtype == '7' || $fieldtype == '11') { $query = "select * from ".$customfield_columnname; $result = $adb->query($query); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 05:29:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:29:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4600 - /vtigercrm/trunk/install/2setConfig.php Message-ID: <20060328102952.C706A5067C5@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:29:48 2006 New Revision: 4600 Log: width for dbtype is removed Modified: vtigercrm/trunk/install/2setConfig.php Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 05:32:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 10:32:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4601 - /vtigercrm/trunk/modules/Settings/customfield.html Message-ID: <20060328103203.12B745067D2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 03:31:59 2006 New Revision: 4601 Log: readonly permission is given for decimal,length and picklist filed Modified: vtigercrm/trunk/modules/Settings/customfield.html Modified: vtigercrm/trunk/modules/Settings/customfield.html ============================================================================== --- vtigercrm/trunk/modules/Settings/customfield.html (original) +++ vtigercrm/trunk/modules/Settings/customfield.html Tue Mar 28 03:31:59 2006 @@ -280,7 +280,7 @@ - +
    {APP.LBL_REQUIRED_SYMBOL}{MOD.LBL_LENGTH}
    @@ -288,7 +288,7 @@ - +
    {MOD.LBL_DECIMAL_PLACES}
    @@ -296,7 +296,7 @@ - +
    {APP.LBL_REQUIRED_SYMBOL}{MOD.LBL_PICK_LIST_VALUES}
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 06:14:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 11:14:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4602 - /vtigercrm/trunk/pkg/php/php.ini Message-ID: <20060328111453.BEFD85067E2@vtiger.fosslabs.com> Author: richie Date: Tue Mar 28 04:14:49 2006 New Revision: 4602 Log: mysql dll entry added extensions renamed to ext as in php5 Modified: vtigercrm/trunk/pkg/php/php.ini Modified: vtigercrm/trunk/pkg/php/php.ini ============================================================================== --- vtigercrm/trunk/pkg/php/php.ini (original) +++ vtigercrm/trunk/pkg/php/php.ini Tue Mar 28 04:14:49 2006 @@ -425,7 +425,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. -extension_dir = "VTIGER_HOME\php\extensions" +extension_dir = "VTIGER_HOME\php\ext" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically @@ -563,6 +563,7 @@ ;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll +extension=php_mysql.dll ;extension=php_msql.dll ;extension=php_oci8.dll ;extension=php_openssl.dll From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 09:30:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 14:30:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4603 - /vtigercrm/trunk/modules/Calendar/calendar_monthview.php Message-ID: <20060328143026.DED235076E2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 07:30:21 2006 New Revision: 4603 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_monthview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_monthview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_monthview.php Tue Mar 28 07:30:21 2006 @@ -4,7 +4,6 @@ /** * Copyright 1999 - 2004 by Gero Kohnert */ -//global $calpath,$callink,$current_user; global $calpath,$callink,$current_user,$adb; $callink = "index.php?module=Calendar&action="; include_once $calpath .'webelements.p3'; @@ -68,7 +67,6 @@ $y = Date("Y"); } -#echo "\n"; echo ""; echo "\n"; @@ -120,7 +116,6 @@ echo ""; echo "\n"; - //echo "\n"; for ( $i = $current_user->weekstart;$i<=6;$i++ ) { @@ -154,15 +149,6 @@ $xxd = Date("d",$ts); // day of month with leading zero $xm = Date("n",$ts); // month (1-12 $xy = Date("Y",$ts); // Year (2005) - -/* if ( $wd == $l->user->weekstart ) { - # new week - echo "\n"; - $w0 = (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3; - $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) ); - echo " \n"; - } -*/ // Overlapping days -starts by Fredy @@ -173,11 +159,9 @@ // break; //commented as january is not coming for all the even years } # new week - //echo "******************************"; echo "\n"; $w0 = (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3; $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) ); - //echo " \n"; } // check for overlapping days @@ -240,22 +224,18 @@ echo "\n"; echo " \n"; } - #echo "1 ".$this->user->weekstart ."
    "; $color = ""; $username=$pref->callist[$idx]->creator; @@ -330,8 +305,6 @@ echo "\n
    ". $mod_strings['LBL_WEEK'] ."
    ". $wn ." 
    ". $wn ." \n"; if (($xm == $m ) || $month_overlap) { - #echo " ". $xxd .""; // added by raj /* Select appointments for this day */ $from = new DateTime(); $to = new DateTime(); $from->setDateTimeTS($ts - 12 * 3600); $to->setDateTimeTS($ts - 12 * 3600); - #$to->addDays(7); $pref->callist = array(); $app = new appointment(); $app->readCal($pref,$from,$to); - // appointment::readCal($pref,$from,$to); $dd = new DateTime(); - # $d = strftime($lang['DateFormatStr'],$ts); $dd->setDateTimeTS($ts); $d = $dd->getDate(); $tref = Date("Ymd",$ts); @@ -265,7 +245,6 @@ if ($col=="today") { echo $xd; - //echo " ". $xd .""; echo "
    "; echo "+"; echo "
    "; @@ -273,12 +252,10 @@ else { echo $xd; - //echo " ". $xd .""; echo "
    "; echo "+"; echo "
    "; } - // $next = NextDay($ts); # Check for workday @@ -308,11 +285,9 @@ } else { - //echo "
    \"--------\"
    \n"; $pref->callist[$idx]->formatted(); - //echo "\n
    "; - #echo "2 ".$this->user->weekstart ."
    "; $a++; } @@ -340,7 +313,6 @@ echo "
    \n"; } - // } else { @@ -359,10 +331,8 @@ } $a++; $w++; - // $ts += 86400; //changed for fixing the Daylight Saving Time issue as per suggestion by Bushwack post id - //http://forums.vtiger.com/viewtopic.php?p=14967#14967 $ts = strtotime('+1 day', $ts); } if ( $n == 1 ) @@ -371,15 +341,6 @@ } echo "\n"; -//echo ""; -//echo ""; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "\n"; -//echo "
     
    \n"; echo "\n"; echo ""; echo " @@ -418,8 +379,6 @@ # selection of none allowed echo "
    \n"; -#echo "\n"; -#echo "\n"; ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 10:00:12 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:00:12 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4606 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060328150013.8D289508ADA@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:00:07 2006 New Revision: 4606 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Tue Mar 28 08:00:07 2006 @@ -1,3 +1,54 @@ +function DisableSharing() +{ + + x = document.SharedList.selected_id.length; + idstring = ""; + xx = 0; + if ( x == undefined) + { + + if (document.SharedList.selected_id.checked) + { + document.SharedList.idlist.value=document.SharedList.selected_id.value; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + else + { + for(i = 0; i < x ; i++) + { + if(document.SharedList.selected_id[i].checked) + { + idstring = document.SharedList.selected_id[i].value +";"+idstring + xx++ + } + } + if (xx != 0) + { + document.SharedList.idlist.value=idstring; + } + else + { + alert("Please select atleast one user"); + return false; + } + } + if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + { + document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; + } + else + { + return false; + } +} + + + function showhide(argg) { var x=document.getElementById(argg).style; @@ -83,7 +134,7 @@ function check_form() { - if(trim(document.appSave.subject.value) == "") + if(document.appSave.subject.value == "") { alert("Missing Event Name"); document.appSave.subject.focus() @@ -104,51 +155,108 @@ } -function DisableSharing() -{ - - x = document.SharedList.selected_id.length; - idstring = ""; - xx = 0; - if ( x == undefined) - { - - if (document.SharedList.selected_id.checked) - { - document.SharedList.idlist.value=document.SharedList.selected_id.value; - } - else - { - alert("Please select atleast one user"); - return false; - } - } - else - { - for(i = 0; i < x ; i++) - { - if(document.SharedList.selected_id[i].checked) - { - idstring = document.SharedList.selected_id[i].value +";"+idstring - xx++ - } - } - if (xx != 0) - { - document.SharedList.idlist.value=idstring; - } - else - { - alert("Please select atleast one user"); - return false; - } - } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) - { - document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; - } - else - { - return false; - } -} + +var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; +function setObjects() +{ + availListObj=getObj("available") + selectedColumnsObj=getObj("selectedusers") + +} + +function addColumn() +{ + var selectlength=selectedColumnsObj.length + var availlength=availListObj.length + var s=0 + for (i=0;i Author: saraj Date: Tue Mar 28 08:01:19 2006 New Revision: 4607 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php Modified: vtigercrm/trunk/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_share.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_share.php Tue Mar 28 08:01:19 2006 @@ -156,108 +156,5 @@ return true; } -var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj; -function setObjects() -{ - availListObj=getObj("available") - selectedColumnsObj=getObj("selectedusers") - -} -function addColumn() -{ - var selectlength=selectedColumnsObj.length - var availlength=availListObj.length - var s=0 - for (i=0;i From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 10:13:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:13:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4608 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060328151321.7F720508D8C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:13:17 2006 New Revision: 4608 Log: error in javascript has been fixed Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Mar 28 08:13:17 2006 @@ -500,7 +500,7 @@ {ldelim} var item = response.responseText; getObj('tagfields').innerHTML = item; - document.getElementById(txtBox).value =''; + document.getElementById('txtbox_tagfields').value =''; {rdelim} From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 10:49:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4609 - in /vtigercrm/trunk/include/fpdf: pdf.php templates/ templates/body.php Message-ID: <20060328154941.8FBF250A041@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:49:34 2006 New Revision: 4609 Log: files added as the common files moved Added: vtigercrm/trunk/include/fpdf/pdf.php vtigercrm/trunk/include/fpdf/templates/ vtigercrm/trunk/include/fpdf/templates/body.php (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 10:51:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:51:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4610 - in /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php Message-ID: <20060328155124.7397050A210@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:51:16 2006 New Revision: 4610 Log: common code moved to include/pdf/body.php and the include statement changed to include/fpdf/templates/body.php as body.php has been moved from pdf_templates/body.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php vtigercrm/trunk/modules/Quotes/CreatePDF.php vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ column_fields[account_id]); -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - - // **************** BEGIN POPULATE DATA ******************** // populate data -$so_name = getSoName($focus->column_fields["salesorder_id"]); +if($focus->column_fields["salesorder_id"] != '') + $so_name = getSoName($focus->column_fields["salesorder_id"]); +else + $so_name = ''; $po_name = $focus->column_fields["purchaseorder"]; $valid_till = $focus->column_fields["duedate"]; @@ -444,7 +46,7 @@ $conditions = $focus->column_fields["terms_conditions"]; $description = $focus->column_fields["description"]; -$invoice_status = $focus->column_fields["invoicestatus"]; +$status = $focus->column_fields["invoicestatus"]; // Company information $add_query = "select * from organizationdetails"; @@ -462,7 +64,6 @@ $org_phone = $adb->query_result($result,0,"phone"); $org_fax = $adb->query_result($result,0,"fax"); $org_website = $adb->query_result($result,0,"website"); - $logo_name = $adb->query_result($result,0,"logoname"); } @@ -535,7 +136,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ retrieve_entity_info($_REQUEST['record'],"PurchaseOrder"); $vendor_name = getVendorName($focus->column_fields[vendor_id]); - -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// $logo_name = name of logo, no path needed. -// $location = array ('x','y','width','height') -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** @@ -537,7 +134,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original) +++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Tue Mar 28 08:51:16 2006 @@ -1,5 +1,5 @@ k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, (strlen($label." ".$total)*8)+4, $y2+1, 4.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -// add a line to the invoice/estimate -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** $focus = new Quote(); @@ -441,7 +38,7 @@ $conditions = $focus->column_fields["terms_conditions"]; $description = $focus->column_fields["description"]; -$quote_status = $focus->column_fields["quotestage"]; +$status = $focus->column_fields["quotestage"]; // Company information $add_query = "select * from organizationdetails"; @@ -532,7 +129,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original) +++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Mar 28 08:51:16 2006 @@ -1,6 +1,6 @@ retrieve_entity_info($_REQUEST['record'],"SalesOrder"); $account_name = getAccountName($focus->column_fields[account_id]); -// Xavier Nicolay 2004 -// Version 1.01 -class PDF extends FPDF -{ -// private variables -var $columns; -var $format; -var $angle=0; - -// private functions -function RoundedRect($x, $y, $w, $h, $r, $style = '') -{ - $k = $this->k; - $hp = $this->h; - if($style=='F') - $op='f'; - elseif($style=='FD' or $style=='DF') - $op='B'; - else - $op='S'; - $MyArc = 4/3 * (sqrt(2) - 1); - $this->_out(sprintf('%.2f %.2f m',($x+$r)*$k,($hp-$y)*$k )); - $xc = $x+$w-$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l', $xc*$k,($hp-$y)*$k )); - - $this->_Arc($xc + $r*$MyArc, $yc - $r, $xc + $r, $yc - $r*$MyArc, $xc + $r, $yc); - $xc = $x+$w-$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',($x+$w)*$k,($hp-$yc)*$k)); - $this->_Arc($xc + $r, $yc + $r*$MyArc, $xc + $r*$MyArc, $yc + $r, $xc, $yc + $r); - $xc = $x+$r ; - $yc = $y+$h-$r; - $this->_out(sprintf('%.2f %.2f l',$xc*$k,($hp-($y+$h))*$k)); - $this->_Arc($xc - $r*$MyArc, $yc + $r, $xc - $r, $yc + $r*$MyArc, $xc - $r, $yc); - $xc = $x+$r ; - $yc = $y+$r; - $this->_out(sprintf('%.2f %.2f l',($x)*$k,($hp-$yc)*$k )); - $this->_Arc($xc - $r, $yc - $r*$MyArc, $xc - $r*$MyArc, $yc - $r, $xc, $yc - $r); - $this->_out($op); -} - -function _Arc($x1, $y1, $x2, $y2, $x3, $y3) -{ - $h = $this->h; - $this->_out(sprintf('%.2f %.2f %.2f %.2f %.2f %.2f c ', $x1*$this->k, ($h-$y1)*$this->k, - $x2*$this->k, ($h-$y2)*$this->k, $x3*$this->k, ($h-$y3)*$this->k)); -} - -function Rotate($angle,$x=-1,$y=-1) -{ - if($x==-1) - $x=$this->x; - if($y==-1) - $y=$this->y; - if($this->angle!=0) - $this->_out('Q'); - $this->angle=$angle; - if($angle!=0) - { - $angle*=M_PI/180; - $c=cos($angle); - $s=sin($angle); - $cx=$x*$this->k; - $cy=($this->h-$y)*$this->k; - $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy)); - } -} - -function _endpage() -{ - if($this->angle!=0) - { - $this->angle=0; - $this->_out('Q'); - } - parent::_endpage(); -} - -// public functions -function sizeOfText( $text, $largeur ) -{ - $index = 0; - $nb_lines = 0; - $loop = TRUE; - while ( $loop ) - { - $pos = strpos($text, "\n"); - if (!$pos) - { - $loop = FALSE; - $line = $text; - } - else - { - $line = substr( $text, $index, $pos); - $text = substr( $text, $pos+1 ); - } - $length = floor( $this->GetStringWidth( $line ) ); - $res = 1 + floor( $length / $largeur) ; - $nb_lines += $res; - } - return $nb_lines; -} - -// addImage -// Default will place vtiger in the top left corner -function addImage( $logo_name, $location=array('10','10','0','0') ) { - if($logo_name)//error checking just in case, by OpenCRM - { - $x1 = $location[0]; - $y1 = $location[1]; - $stretchx = $location[2]; - $stretchy = $location[3]; - $this->Image('test/logo/'.$logo_name,$x1,$y1,$stretchx,$stretchy); - } -} - -// Company -function addCompany( $nom, $address, $location='' ) -{ - $x1 = $location[0]; - $y1 = $location[1]; - //Positionnement en bas - $this->SetXY( $x1, $y1 ); - $this->SetFont('Arial','B',12); - $length = $this->GetStringWidth( $nom ); - $this->Cell( $length, 2, $nom); - $this->SetXY( $x1, $y1 + 4 ); - $this->SetFont('Arial','',10); - $length = $this->GetStringWidth( $address ); - //Coordonn??es de la soci??t?? - $lines = $this->sizeOfText( $address, $length) ; - $this->MultiCell($length, 4, $address); -} - -// bubble blocks -function title ($label, $total, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = $y1; - $mid = $y1 + ($y2 / 2); - $width=10; - $this->SetFillColor(192); - $this->RoundedRect($r1-16, $y1-1, 52, $y2+1, 2.5, 'DF'); - $this->SetXY( $r1 + 4, $y1+1 ); - $this->SetFont( "Helvetica", "B", 15); - $this->Cell($width,5, $label." ".$total, 0, 0, "C"); -} - -// text block, non-wrapped -function addTextBlock( $title,$text,$positions ) -{ - $r1 = $positions[0]; - $y1 = $positions[1]; - $this->SetXY( $r1, $y1); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell( $positions[2], 4,$title); - $this->SetXY( $r1, $y1+4); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell( $positions[2], 4, $text); -} - -function tableWrapper($position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = $position[3]; - else - $y2 = 17; - - $mid = $y1 + (13 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); -} - -function addBubble($page,$title,$position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - if($position[3]) - $y2 = 17*$position[3]; - else - $y2 = 17; - - $mid = $y1 + (19 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 3, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell($width,5,$page, 0,0, "C"); -} - -// bubble blocks -function addBubbleBlock ($page, $title, $position) -{ - $r1 = $position[0]; - $r2 = $r1 + 19 + $position[2] ; - $y1 = $position[1]; - $y2 = 17; - - $mid = $y1 + ($y2 / 2); - $width=10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), $y2, 4.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1+3 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell($width,5, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 - 5, $y1 + 9 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell($width,5,$page, 0,0, "C"); -} - -// record blocks -function addRecBlock( $data, $title, $postion ) -{ - $lengthtitle = strlen($title); - $lengthdata = strlen($data); - $length=$lengthtitle; - $r1 = $postion[0]; - $r2 = $r1 + 40 + $length; - $y1 = $postion[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1+1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title, 0, 0, "C"); - $this->SetXY( $r1 + ($r2-$r1)/2 -5 , $y1 + 5 ); - $this->SetFont( "Helvetica", "", 10); - $this->Cell(10,4,$data, 0, 0, "C"); -} - -// description blocks -function addDescBlock( $data, $title, $position ) -{ - $lengthtitle = strlen($title); - $lengthdata= $position[3]; - - $length=$position[2]; - $r1 = $position[0]; - $r2 = $r1 + 40 + $length; - $y1 = $position[1]; - $y2 = $y1+10; - $mid = $y1 + (($y2-$y1) / 2); - - $this->RoundedRect($r1,$y1, ($length + 40), ($lengthdata/140*30), 2.5, 'D'); - $this->Line( $r1, $mid, $r2, $mid); - $this->SetXY( $position[0]+2 , $y1 + 1 ); - $this->SetFont( "Helvetica", "B", 10); - $this->Cell(10,4, $title); - $this->SetXY( $position[0]+2 , $y1 + 6 ); - $this->SetFont( "Helvetica", "", 10); - $this->MultiCell(($length+36),4,$data); -} - -function drawLine($positions) -{ - $x=$positions[0]; - $y=$positions[1]; - $width=$positions[2]; - $this->Line( $x, $y, $x+$width, $y); -} - -// add columns to table -function addCols( $tab ,$positions ,$bottom) -{ - global $columns; - - $r1 = 10; - $r2 = $this->w - ($r1 * 2) ; - $y1 = 80; - $x1 = $positions[1]; - $y2 = $bottom; - $this->SetXY( $r1, $y1 ); - $this->SetFont( "Helvetica", "", 10); - - $colX = $r1; - $columns = $tab; - while ( list( $lib, $pos ) = each ($tab) ) - { - $this->SetXY( $colX, $y1+3 ); - $this->Cell( $pos, 1, $lib, 0, 0, "C"); - $colX += $pos; - switch($lib) { - case 'Total': - break; - default: - $this->Line( $colX, $y1, $colX, $y1+$y2); - break; - } - } -} - -function addLineFormat( $tab ) -{ - global $format, $columns; - - while ( list( $lib, $pos ) = each ($columns) ) - { - if ( isset( $tab["$lib"] ) ) - $format[ $lib ] = $tab["$lib"]; - } -} - -function addProductLine( $line, $tab ) -{ - global $columns, $format; - - $ordonnee = 10; - $maxSize = $line; - - reset( $columns ); - while ( list( $lib, $pos ) = each ($columns) ) - { - $longCell = $pos -2; - $text = $tab[ $lib ]; - $length = $this->GetStringWidth( $text ); - $formText = $format[ $lib ]; - $this->SetXY( $ordonnee, $line); - $this->MultiCell( $longCell, 3 , $text, 3, $formText); - if ( $maxSize < ($this->GetY() ) ) - $maxSize = $this->GetY() ; - $ordonnee += $pos; - } - return ( $maxSize - $line ); -} - -function addTotalsRec($names, $totals, $positions) -{ - $this->SetFont( "Arial", "B", 8); - $r1 = $positions[0]; - $r2 = $r1 + 90; - $y1 = $positions[1]; - $y2 = $y1+10; - $this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D'); - $this->Line( $r1, $y1+4, $r2, $y1+4); - $this->Line( $r1+27, $y1, $r1+27, $y2); // avant Subtotal - $this->Line( $r1+43, $y1, $r1+43, $y2); // avant Tax - $this->Line( $r1+66, $y1, $r1+66, $y2); // avant Adjustment - - $this->SetXY( $r1+2, $y1); - $this->Cell(10,4, $names[0]); - $this->SetX( $r1+29,$y1 ); - $this->Cell(10,4, $names[1]); - $this->SetX( $r1+45 ); - $this->Cell(10,4, $names[2]); - $this->SetX( $r1+66 ); - $this->Cell(10,4, $names[3]); - - - $this->SetXY( $r1+2, $y1+5 ); - $this->Cell( 10,4, $totals[0] ); - $this->SetXY( $r1+29, $y1+5 ); - $this->Cell( 10,4, $totals[1] ); - $this->SetXY( $r1+44, $y1+5 ); - $this->Cell( 10,4, $totals[2] ); - $this->SetXY( $r1+66, $y1+5 ); - $this->Cell( 10,4, $totals[3] ); - - $this->SetFont( "Arial", "B", 6); - $this->SetXY( $r1+90, $y2 - 8 ); - $this->SetFont( "Helvetica", "", 10); -} - -// add a watermark (temporary estimate, DUPLICATA...) -// call this method first -function watermark( $text, $positions, $rotate = array('45','50','180') ) -{ - $this->SetFont('Arial','B',50); - $this->SetTextColor(230,230,230); - $this->Rotate($rotate[0],$rotate[1],$rotate[2]); - $this->Text($positions[0],$positions[1],$text); - $this->Rotate(0); - $this->SetTextColor(0,0,0); -} - -} - -function StripLastZero($string) -{ - $count=strlen($string); - $ret=substr($string,0,($count-1)); - return $ret; -} - // **************** BEGIN POPULATE DATA ******************** - - // populate data -$quote_name = getQuoteName($focus->column_fields["quote_id"]); +if($focus->column_fields["quote_id"] != '') + $quote_name = getQuoteName($focus->column_fields["quote_id"]); +else + $quote_name = ''; $po_name = $focus->column_fields["purchaseorder"]; $subject = $focus->column_fields["subject"]; @@ -535,7 +136,7 @@ $pdf->AddPage(); include("pdf_templates/header.php"); - include("pdf_templates/body.php"); + include("include/fpdf/templates/body.php"); include("pdf_templates/footer.php"); $page_num++; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 10:59:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Mar 2006 15:59:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4611 - in /vtigercrm/trunk/modules: Invoice/pdf_templates/body.php PurchaseOrder/pdf_templates/body.php Quotes/pdf_templates/body.php SalesOrder/pdf_templates/body.php Message-ID: <20060328155908.C34C350A607@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 08:58:59 2006 New Revision: 4611 Log: common files removed as body.php moved include/fpdf/templates/body.php Removed: vtigercrm/trunk/modules/Invoice/pdf_templates/body.php vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/body.php vtigercrm/trunk/modules/Quotes/pdf_templates/body.php vtigercrm/trunk/modules/SalesOrder/pdf_templates/body.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 28 23:33:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 04:33:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4612 - /vtigercrm/trunk/include/js/dtlviewajax.js Message-ID: <20060329043335.2AA5550D19D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 21:33:30 2006 New Revision: 4612 Log: junk code removed Modified: vtigercrm/trunk/include/js/dtlviewajax.js Modified: vtigercrm/trunk/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/trunk/include/js/dtlviewajax.js (original) +++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Mar 28 21:33:30 2006 @@ -22,8 +22,6 @@ { showHide(valuespanid,textareapanid); - //fieldLabelObj = getObj(fieldlabel); - //fieldLabelObj.className="label"; itsonview=false; return false; } @@ -39,13 +37,9 @@ } show("crmspanid"); - //globalfieldlabel=fieldLabel; globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid; - //globalsubvaluespanid="subvalue_"+ fieldLabel;//subvaluespanid; globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid; - //globaluitype=uitype; globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid; - //globalismandatory=ismandatory; divObj = getObj('crmspanid'); crmy = findPosY(getObj(mouseArea)); crmx = findPosX(getObj(mouseArea)); @@ -63,25 +57,18 @@ function handleEdit() { - //setValue(globalvaluespanid,globaltextboxpanid,globalsubvaluespanid,globaluitype,globalfieldlabel); - //setValue(globalvaluespanid,globaltextboxpanid,globalsubvaluespanid,globaluitype,globalfieldlabel,globalismandatory); show(globaleditareaspanid) ; hide(globaldtlviewspanid); getObj(globaltxtboxid).focus(); hide('crmspanid'); itsonview=true; - //if(dhtmlHistory.currentLocation!="start") - //{ - // window.historyStorage.put("start",getObj('show').innerHTML); - //} return false; } function dtlViewAjaxResponse(response) { var item = response.responseText; - alert(response.responseText) - if(item.indexOf(":#:FAILURE")>-1) + if(item.indexOf(":#:FAILURE")>-1) { alert("Error while Editing"); } @@ -114,7 +101,6 @@ var ajaxObj = new Ajax(dtlViewAjaxResponse); ajaxObj.process("index.php?",data); - //alert(getObj(popupTxt)); if(uitype == '13') { getObj(dtlView).innerHTML = "    "+tagValue+" "; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:47:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:47:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4613 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060329054731.81CA050D458@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:47:26 2006 New Revision: 4613 Log: alert removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Tue Mar 28 22:47:26 2006 @@ -210,12 +210,10 @@ } } if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) - { + { show("status"); - alert("in fn") var ajaxObj = new Ajax(ajaxSaveResponse); var urlstring ="module=Users&action=massdelete&return_module=PriceBooks&viewname="+viewid+"&idlist="+idstring; - alert(urlstring) ajaxObj.process("index.php?",urlstring); } else From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:50:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:50:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4614 - in /vtigercrm/trunk/include/Ajax: ./ CommonAjax.php Message-ID: <20060329055026.D7F9450D4BD@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:50:22 2006 New Revision: 4614 Log: new commonfile added for ajax operations Added: vtigercrm/trunk/include/Ajax/ vtigercrm/trunk/include/Ajax/CommonAjax.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 00:52:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 05:52:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4615 - in /vtigercrm/trunk/modules: Accounts/ Activities/ Campaigns/ Contacts/ Emails/ Faq/ HelpDesk/ Invoice/ Leads/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060329055255.8DF6550D32C@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 28 22:52:31 2006 New Revision: 4615 Log: duplicate code moved to include/Ajax/CommonAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Contacts/ContactsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Leads/LeadsAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original) +++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,19 +17,14 @@ $local_log =& LoggerManager::getLogger('AccountsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/Accounts/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { + { $acntObj = new Account(); $acntObj->retrieve_entity_info($crmid,"Accounts"); $acntObj->column_fields[$fieldname] = $fieldvalue; @@ -46,51 +41,10 @@ }else { echo ":#:FAILURE"; - } + } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - + require_once('include/Ajax/CommonAjax.php'); } -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } -} - ?> Modified: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ActivitiesAjax.php (original) +++ vtigercrm/trunk/modules/Activities/ActivitiesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('ActivitiesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Activities/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $actObj = new Activity(); - $actObj->retrieve_entity_info($crmid,"Activities"); - $actObj->column_fields[$fieldname] = $fieldvalue; - $actObj->id = $crmid; - $actObj->mode = "edit"; - $actObj->save("Activities"); - if($actObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else + { + $actObj = new Activity(); + $actObj->retrieve_entity_info($crmid,"Activities"); + $actObj->column_fields[$fieldname] = $fieldvalue; + $actObj->id = $crmid; + $actObj->mode = "edit"; + $actObj->save("Activities"); + if($actObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else { echo ":#:FAILURE"; } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } + require_once('include/Ajax/CommonAjax.php'); } ?> Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original) +++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('CampaignsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Campaigns/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Campaign(); - $modObj->retrieve_entity_info($crmid,"Campaigns"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Campaigns"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Campaign(); + $modObj->retrieve_entity_info($crmid,"Campaigns"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Campaigns"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original) +++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Tue Mar 28 22:52:31 2006 @@ -18,81 +18,34 @@ $local_log =& LoggerManager::getLogger('ContactsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Contacts/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") +if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $cntObj = new Contact(); - $cntObj->retrieve_entity_info($crmid,"Contacts"); - $cntObj->column_fields[$fieldname] = $fieldvalue; - $cntObj->id = $crmid; - $cntObj->mode = "edit"; - $cntObj->save("Contacts"); - if($cntObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } + { + $cntObj = new Contact(); + $cntObj->retrieve_entity_info($crmid,"Contacts"); + $cntObj->column_fields[$fieldname] = $fieldvalue; + $cntObj->id = $crmid; + $cntObj->mode = "edit"; + $cntObj->save("Contacts"); + if($cntObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else + { + echo ":#:FAILURE"; + } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - + require_once('include/Ajax/CommonAjax.php'); } -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } -} - ?> Modified: vtigercrm/trunk/modules/Emails/EmailsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Emails/EmailsAjax.php (original) +++ vtigercrm/trunk/modules/Emails/EmailsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('EmailsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Emails/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Email(); - $modObj->retrieve_entity_info($crmid,"Emails"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Emails"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Email(); + $modObj->retrieve_entity_info($crmid,"Emails"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Emails"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Faq/FaqAjax.php ============================================================================== --- vtigercrm/trunk/modules/Faq/FaqAjax.php (original) +++ vtigercrm/trunk/modules/Faq/FaqAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('FaqAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Faq/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Faq(); - $modObj->retrieve_entity_info($crmid,"Faq"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Faq"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Faq(); + $modObj->retrieve_entity_info($crmid,"Faq"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Faq"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original) +++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,35 @@ $local_log =& LoggerManager::getLogger('HelpDeskAjax'); $ajaxaction = $_REQUEST["ajxaction"]; +if($ajaxaction == "DETAILVIEW") +{ + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/HelpDesk/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new HelpDesk(); - $modObj->retrieve_entity_info($crmid,"HelpDesk"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("HelpDesk"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new HelpDesk(); + $modObj->retrieve_entity_info($crmid,"HelpDesk"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("HelpDesk"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Invoice/InvoiceAjax.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (original) +++ vtigercrm/trunk/modules/Invoice/InvoiceAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,35 @@ $local_log =& LoggerManager::getLogger('InvoiceAjax'); $ajaxaction = $_REQUEST["ajxaction"]; +if($ajaxaction == "DETAILVIEW") +{ + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; -if($_REQUEST['file'] != '') -{ - require_once('modules/Invoice/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Invoice(); - $modObj->retrieve_entity_info($crmid,"Invoice"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Invoice"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Invoice(); + $modObj->retrieve_entity_info($crmid,"Invoice"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Invoice"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Leads/LeadsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Leads/LeadsAjax.php (original) +++ vtigercrm/trunk/modules/Leads/LeadsAjax.php Tue Mar 28 22:52:31 2006 @@ -15,29 +15,22 @@ global $adb; $local_log =& LoggerManager::getLogger('LeadsAjax'); - $ajaxaction = $_REQUEST["ajxaction"]; -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Leads/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - //$columname = $_REQUEST["clmnName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") + $crmid = $_REQUEST["recordid"]; + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $leadObj = new Lead(); - $leadObj->retrieve_entity_info($crmid,"Leads"); - $leadObj->column_fields[$fieldname] = $fieldvalue; - $leadObj->id = $crmid; - $leadObj->mode = "edit"; - $leadObj->save("Leads"); - if($leadObj->id != "") + $leadObj = new Lead(); + $leadObj->retrieve_entity_info($crmid,"Leads"); + $leadObj->column_fields[$fieldname] = $fieldvalue; + $leadObj->id = $crmid; + $leadObj->mode = "edit"; + $leadObj->save("Leads"); + if($leadObj->id != "") { echo ":#:SUCCESS"; }else @@ -46,52 +39,11 @@ } }else { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; + echo ":#:FAILURE"; } } - +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Notes/NotesAjax.php (original) +++ vtigercrm/trunk/modules/Notes/NotesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('NotesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') -{ - require_once('modules/Notes/'.$_REQUEST['file'].'.php'); -} if($ajaxaction == "DETAILVIEW") { $crmid = $_REQUEST["recordid"]; $tablename = $_REQUEST["tableName"]; $fieldname = $_REQUEST["fldName"]; $fieldvalue = $_REQUEST["fieldValue"]; - if($crmid != "") - { - $modObj = new Note(); - $modObj->retrieve_entity_info($crmid,"Notes"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Notes"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else + { + $modObj = new Note(); + $modObj->retrieve_entity_info($crmid,"Notes"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Notes"); + if($modObj->id != "") + { + echo ":#:SUCCESS"; + }else + { + echo ":#:FAILURE"; + } + }else { echo ":#:FAILURE"; } } -elseif($ajaxaction == "SAVETAG") +else { - - require_once('include/freetag/freetag.class.php'); - global $current_user; - $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") - { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") - { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - }else - { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else - { - echo ''; - } + require_once('include/Ajax/CommonAjax.php'); } ?> Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original) +++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,81 +17,34 @@ $local_log =& LoggerManager::getLogger('PotentialsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Potentials/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Potential(); - $modObj->retrieve_entity_info($crmid,"Potentials"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Potentials"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Potential(); + $modObj->retrieve_entity_info($crmid,"Potentials"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Potentials"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } - +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('PriceBooksAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/PriceBooks/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new PriceBook(); - $modObj->retrieve_entity_info($crmid,"PriceBooks"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("PriceBooks"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new PriceBook(); + $modObj->retrieve_entity_info($crmid,"PriceBooks"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("PriceBooks"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Products/ProductsAjax.php (original) +++ vtigercrm/trunk/modules/Products/ProductsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('ProductsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Products/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Product(); - $modObj->retrieve_entity_info($crmid,"Products"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Products"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Product(); + $modObj->retrieve_entity_info($crmid,"Products"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Products"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('PurchaseOrderAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/PurchaseOrder/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Order(); - $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("PurchaseOrder"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Order(); + $modObj->retrieve_entity_info($crmid,"PurchaseOrder"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("PurchaseOrder"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Quotes/QuotesAjax.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/QuotesAjax.php (original) +++ vtigercrm/trunk/modules/Quotes/QuotesAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('QuotesAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Quotes/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Quote(); - $modObj->retrieve_entity_info($crmid,"Quotes"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Quotes"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Quote(); + $modObj->retrieve_entity_info($crmid,"Quotes"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Quotes"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('SalesOrderAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/SalesOrder/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new SalesOrder(); - $modObj->retrieve_entity_info($crmid,"SalesOrder"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("SalesOrder"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new SalesOrder(); + $modObj->retrieve_entity_info($crmid,"SalesOrder"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("SalesOrder"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> Modified: vtigercrm/trunk/modules/Vendors/VendorsAjax.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/VendorsAjax.php (original) +++ vtigercrm/trunk/modules/Vendors/VendorsAjax.php Tue Mar 28 22:52:31 2006 @@ -17,80 +17,34 @@ $local_log =& LoggerManager::getLogger('VendorsAjax'); $ajaxaction = $_REQUEST["ajxaction"]; - -if($_REQUEST['file'] != '') +if($ajaxaction == "DETAILVIEW") { - require_once('modules/Vendors/'.$_REQUEST['file'].'.php'); -} -elseif($ajaxaction == "DETAILVIEW") -{ - $crmid = $_REQUEST["recordid"]; - $tablename = $_REQUEST["tableName"]; - $fieldname = $_REQUEST["fldName"]; - $fieldvalue = $_REQUEST["fieldValue"]; - - if($crmid != "") - { - $modObj = new Vendor(); - $modObj->retrieve_entity_info($crmid,"Vendors"); - $modObj->column_fields[$fieldname] = $fieldvalue; - $modObj->id = $crmid; - $modObj->mode = "edit"; - $modObj->save("Vendors"); - if($modObj->id != "") - { - echo ":#:SUCCESS"; - }else - { - echo ":#:FAILURE"; - } - }else - { - echo ":#:FAILURE"; - } -} -elseif($ajaxaction == "SAVETAG") -{ - - require_once('include/freetag/freetag.class.php'); - global $current_user; $crmid = $_REQUEST["recordid"]; - $module = $_REQUEST["module"]; - $tagfields = $_REQUEST["tagfields"]; - $userid = $current_user->id; - $freetag = new freetag(); - if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "") + $tablename = $_REQUEST["tableName"]; + $fieldname = $_REQUEST["fldName"]; + $fieldvalue = $_REQUEST["fieldValue"]; + if($crmid != "") { - $freetag->tag_object($userid,$crmid,$tagfields,$module); - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; - } - -} -elseif($ajaxaction == 'GETTAGCLOUD') -{ - require_once('include/freetag/freetag.class.php'); - $freetag = new freetag(); - $module = $_REQUEST["module"]; - $useid = $current_user->id; - global $adb; - $query='select * from freetagged_objects where module = "'.$module .'"'; - $result=$adb->query($query); - if($adb->num_rows($result) > 0) - { - if(trim($module) != "") + $modObj = new Vendor(); + $modObj->retrieve_entity_info($crmid,"Vendors"); + $modObj->column_fields[$fieldname] = $fieldvalue; + $modObj->id = $crmid; + $modObj->mode = "edit"; + $modObj->save("Vendors"); + if($modObj->id != "") { - $tagcloud = $freetag->get_tag_cloud_html($module); - echo $tagcloud; + echo ":#:SUCCESS"; }else { - $tagcloud = $freetag->get_tag_cloud_html(); - echo $tagcloud; - } - } - else + echo ":#:FAILURE"; + } + }else { - echo ''; + echo ":#:FAILURE"; } } +else +{ + require_once('include/Ajax/CommonAjax.php'); +} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:05:14 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:05:14 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4616 - /vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Message-ID: <20060329070514.2AEDD50D55D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:05:09 2006 New Revision: 4616 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Wed Mar 29 00:05:09 2006 @@ -114,15 +114,6 @@ $this->log =LoggerManager::getLogger('SalesOrder'); $this->db = new PearDatabase(); $this->column_fields = getColumnFields('SalesOrder'); - } - - -/** Function to get summary text - * This function returns name property(ie.,summary text) of the SalesOrder class. -*/ - function get_summary_text() - { - return $this->name; } /** Function to get activities associated with the id From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:08:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:08:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4617 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060329070834.C9D0650D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:08:28 2006 New Revision: 4617 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Mar 29 00:08:28 2006 @@ -257,7 +257,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE","SalesOrder"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:10:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:10:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4618 - /vtigercrm/trunk/modules/SalesOrder/Forms.php Message-ID: <20060329071000.89ED650D4A5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:09:54 2006 New Revision: 4618 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/Forms.php Modified: vtigercrm/trunk/modules/SalesOrder/Forms.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Forms.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Forms.php Wed Mar 29 00:09:54 2006 @@ -1,178 +1,2 @@ - - - -EOQ; - -return $the_script; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:11:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:11:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4619 - /vtigercrm/trunk/modules/SalesOrder/PopupSearchForm.html Message-ID: <20060329071118.D8E2550D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:11:14 2006 New Revision: 4619 Log: file has been removed Removed: vtigercrm/trunk/modules/SalesOrder/PopupSearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:13:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:13:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4620 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060329071332.8F36150D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:13:27 2006 New Revision: 4620 Log: junk code has been removed Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Mar 29 00:13:27 2006 @@ -24,7 +24,6 @@ require_once('data/Tracker.php'); require_once('modules/SalesOrder/SalesOrder.php'); require_once('modules/Quotes/Quote.php'); -require_once('modules/SalesOrder/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:14:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:14:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4621 - in /vtigercrm/trunk/smiletag: admin/ config/ data/ documentation/ images/ lib/ Message-ID: <20060329071423.704BF50D560@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:14:15 2006 New Revision: 4621 Log: Not in use Removed: vtigercrm/trunk/smiletag/admin/ vtigercrm/trunk/smiletag/config/ vtigercrm/trunk/smiletag/data/ vtigercrm/trunk/smiletag/documentation/ vtigercrm/trunk/smiletag/images/ vtigercrm/trunk/smiletag/lib/ From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:17:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:17:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4622 - /vtigercrm/trunk/smiletag/ Message-ID: <20060329071723.5513850D576@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:17:17 2006 New Revision: 4622 Log: not in use Removed: vtigercrm/trunk/smiletag/ From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:20:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:20:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4623 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060329072002.CC82650D576@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:19:52 2006 New Revision: 4623 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Mar 29 00:19:52 2006 @@ -23,7 +23,6 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/PurchaseOrder/PurchaseOrder.php'); -require_once('modules/PurchaseOrder/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -161,7 +160,6 @@ if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path); $smarty->assign("MODULE","PurchaseOrder"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:21:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:21:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4624 - /vtigercrm/trunk/modules/PurchaseOrder/Forms.php Message-ID: <20060329072115.E747D50D584@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:21:08 2006 New Revision: 4624 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/Forms.php Modified: vtigercrm/trunk/modules/PurchaseOrder/Forms.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Forms.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Forms.php Wed Mar 29 00:21:08 2006 @@ -1,179 +1,2 @@ - - - -EOQ; - -return $the_script; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:21:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:21:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4625 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329072125.D926A50D584@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:21:17 2006 New Revision: 4625 Log: Junk code removal done Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:24:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:24:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4626 - /vtigercrm/trunk/modules/Potentials/updateRelations.php Message-ID: <20060329072449.51AA150D584@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:24:39 2006 New Revision: 4626 Log: junk code removal done Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:25:43 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:25:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4627 - /vtigercrm/trunk/modules/Potentials/SearchForm.html Message-ID: <20060329072543.D4E1A50D594@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:25:35 2006 New Revision: 4627 Log: Deleted Search Form Removed: vtigercrm/trunk/modules/Potentials/SearchForm.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:26:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:26:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4628 - /vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Message-ID: <20060329072602.E36A250D594@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:25:56 2006 New Revision: 4628 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Wed Mar 29 00:25:56 2006 @@ -110,14 +110,6 @@ $this->column_fields = getColumnFields('PurchaseOrder'); } -/** Function to get summary text - * This function returns name property(ie.,summary text) of the Order class. -*/ - function get_summary_text() - { - return $this->name; - } - /** Function to get activities associated with the id * This function accepts the id as arguments and execute the MySQL query using the id * and sends the query and the id as arguments to renderRelatedActivities() method From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:37:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:37:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4629 - /vtigercrm/trunk/modules/Quotes/EditView.php Message-ID: <20060329073736.E6AEB50D5A6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:37:31 2006 New Revision: 4629 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/EditView.php Modified: vtigercrm/trunk/modules/Quotes/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/EditView.php (original) +++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Mar 29 00:37:31 2006 @@ -23,7 +23,6 @@ require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Quotes/Quote.php'); -require_once('modules/Accounts/Forms.php'); require_once('include/CustomFieldUtil.php'); require_once('include/ComboUtil.php'); require_once('include/utils/utils.php'); @@ -161,6 +160,13 @@ $smarty->assign("GRANDTOTAL", $InvTotal.".00"); } +else +{ + $smarty->assign("ROWCOUNT", '1'); + $smarty->assign("TAXVALUE", '0'); + $smarty->assign("ADJUSTMENTVALUE", '0'); +} + if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); else $smarty->assign("RETURN_MODULE","Quotes"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:39:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:39:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4630 - /vtigercrm/trunk/modules/Users/TabMenu.php Message-ID: <20060329073958.6D65050D530@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:39:52 2006 New Revision: 4630 Log: junk code removed Modified: vtigercrm/trunk/modules/Users/TabMenu.php Modified: vtigercrm/trunk/modules/Users/TabMenu.php ============================================================================== --- vtigercrm/trunk/modules/Users/TabMenu.php (original) +++ vtigercrm/trunk/modules/Users/TabMenu.php Wed Mar 29 00:39:52 2006 @@ -30,7 +30,6 @@ else { $sql="SELECT name from tab where tabid in (" .$permittedModuleList .") and presence = 0 order by tabsequence"; - //echo $sql; } $tabrow=$conn->query($sql); @@ -47,62 +46,5 @@ } -// TabMenu shown in the header page. -class Tab extends CRMEntity { - var $log; - var $db; - // Stored fields - var $tabid; - var $name; - var $presence; - var $tabsequence; - var $label; - var $modifiedby; - var $modifiedtime; - var $customized; - - //var $default_task_name_values = array('Assemble catalogs', 'Make travel arrangements', 'Send a letter', 'Send contract', 'Send fax', 'Send a follow-up letter', 'Send literature', 'Send proposal', 'Send quote'); - - var $table_name = "tab"; - - var $object_name = "Tab"; - - var $column_fields = Array("tabid" - , "name" - , "presence" - , "tabsequence" - , "label" - , "modifiedby" - , "modifiedtime" - , "customized" - ); - - // This is used to retrieve related fields from form posts. - //var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contact_name', 'contact_phone', 'contact_email', 'parent_name'); - - // This is the list of fields that are in the lists. - //var $list_fields = Array('id', 'status', 'name', 'parent_type', 'parent_name', 'parent_id', 'date_due', 'contact_id', 'contact_name', 'assigned_user_name', 'assigned_user_id'); - - function Tab() { - $this->log = LoggerManager::getLogger('tab'); - $this->db = new PearDatabase(); - } - - var $new_schema = true; - - function create_tables () { - global $app_strings; - } - - function drop_tables () { - - - } - - function get_summary_text() - { - return "$this->name"; - } -} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:40:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:40:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4631 - /vtigercrm/trunk/modules/Quotes/Quote.php Message-ID: <20060329074023.60D5A50D5C3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:40:16 2006 New Revision: 4631 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Quotes/Quote.php Modified: vtigercrm/trunk/modules/Quotes/Quote.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.php (original) +++ vtigercrm/trunk/modules/Quotes/Quote.php Wed Mar 29 00:40:16 2006 @@ -114,11 +114,6 @@ $this->column_fields = getColumnFields('Quotes'); } - function get_summary_text() - { - return $this->name; - } - function get_salesorder($id) { require_once('modules/SalesOrder/SalesOrder.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:40:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:40:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4632 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060329074024.97EC550D5B0@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:40:17 2006 New Revision: 4632 Log: Removed Junk Code Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Wed Mar 29 00:40:17 2006 @@ -194,11 +194,6 @@ } - function get_summary_text() - { - return "$this->first_name $this->last_name"; - } - /** * @return string encrypted password for storage in DB and comparison against DB password. * @param string $user_name - Must be non null and at least 2 characters @@ -375,7 +370,6 @@ $this->loadPreferencesFromDB($row['user_preferences']); - $this->fill_in_additional_detail_fields(); if ($this->status != "Inactive") $this->authenticated = true; unset($_SESSION['loginattempts']); @@ -437,29 +431,6 @@ return $this->authenticated; } - function fill_in_additional_list_fields() - { - $this->fill_in_additional_detail_fields(); - } - - function fill_in_additional_detail_fields() - { - //$query = "SELECT u1.first_name, u1.last_name from users as u1, users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0"; - $query = "SELECT u1.first_name, u1.last_name from users u1, users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0"; - $result =$this->db->query($query, true, "Error filling in additional detail fields") ; - - $row = $this->db->fetchByAssoc($result); - $this->log->debug("additional detail query results: $row"); - - if($row != null) - { - $this->reports_to_name = stripslashes($row['first_name'].' '.$row['last_name']); - } - else - { - $this->reports_to_name = ''; - } - } function retrieve_user_id($user_name) { @@ -512,15 +483,7 @@ if ($this->is_admin == 'on') $user_fields['IS_ADMIN'] = 'X'; return $user_fields; } - function list_view_parse_additional_sections(&$list_form, $xTemplateSection){ - - if($list_form->exists($xTemplateSection.".row.yahoo_id") && isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse($xTemplateSection.".row.yahoo_id"); - elseif ($list_form->exists($xTemplateSection.".row.no_yahoo_id")) - $list_form->parse($xTemplateSection.".row.no_yahoo_id"); - return $list_form; - - } + function getColumnNames_User() { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:42:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:42:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4633 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060329074221.C337050D5B0@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 00:42:14 2006 New Revision: 4633 Log: Junk code remvoed Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Wed Mar 29 00:42:14 2006 @@ -2091,14 +2091,5 @@ } - - - function drop_tables () { - } - - function get_summary_text() - { - return "$this->name"; - } } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:43:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:43:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4634 - /vtigercrm/trunk/modules/PriceBooks/DetailView.php Message-ID: <20060329074352.95D1550D5B4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:43:45 2006 New Revision: 4634 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Mar 29 00:43:45 2006 @@ -10,7 +10,6 @@ ********************************************************************************/ require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); -require_once('include/utils/utils.php'); require_once('modules/PriceBooks/PriceBook.php'); require_once('include/utils/utils.php'); @@ -28,10 +27,8 @@ $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:46:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:46:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4635 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.php Message-ID: <20060329074619.CBB7850D5C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:46:13 2006 New Revision: 4635 Log: junk code has been removed Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Wed Mar 29 00:46:13 2006 @@ -64,12 +64,6 @@ $this->column_fields = getColumnFields('PriceBooks'); } - function get_summary_text() - { - return $this->name; - } - - function get_pricebook_products($id) { global $app_strings; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:50:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:50:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4636 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060329075005.D976150D5C4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:49:57 2006 New Revision: 4636 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Mar 29 00:49:57 2006 @@ -160,7 +160,6 @@ $listview_entries = getListViewEntries($focus,"Vendors",$list_result,$navigation_array,'','&return_module=Vendors&return_action=index','EditView','Delete',$oCustomView); $smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("SELECT_SCRIPT", $view_script); $smarty->assign("CUSTOMVIEW",$customviewstrings); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Vendors","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','vendorname','true','basic',"","","","",$viewid); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:54:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:54:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4637 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060329075423.121D6188ACF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:54:17 2006 New Revision: 4637 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Wed Mar 29 00:54:17 2006 @@ -70,10 +70,6 @@ $this->column_fields = getColumnFields('Vendors'); } - function get_summary_text() - { - return $this->name; - } function get_products($id) { global $app_strings; @@ -113,31 +109,4 @@ return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } - function get_related_contacts($id) - { - $query = 'SELECT vendorcontactrel.*, crmentity.crmid from vendorcontactrel inner join crmentity on crmentity.crmid = vendorcontactrel.contactid where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id; - $result = $this->db->query($query); - $cnt_id = array(); - $cnt_list = ''; - if($this->db->num_rows($result)!=0) - { - while($row = $this->db->fetch_array($result)) - { - $cnt_id[] = $row['contactid']; - } - for ($i = 0; $i < count($cnt_id); $i++) - { - $cnt_list .= $cnt_id[$i] . ','; - } - - if ($cnt_list) - { - $cnt_list = substr($cnt_list, 0, strlen($cnt_list) -1); - } - - } - return $cnt_list; - } - -} ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:56:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:56:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4638 - /vtigercrm/trunk/modules/Users/LoginHistory.php Message-ID: <20060329075621.E2E242B7B51@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:56:14 2006 New Revision: 4638 Log: junk code removed Modified: vtigercrm/trunk/modules/Users/LoginHistory.php Modified: vtigercrm/trunk/modules/Users/LoginHistory.php ============================================================================== --- vtigercrm/trunk/modules/Users/LoginHistory.php (original) +++ vtigercrm/trunk/modules/Users/LoginHistory.php Wed Mar 29 00:56:14 2006 @@ -13,8 +13,6 @@ include_once('config.php'); require_once('include/logging.php'); require_once('data/SugarBean.php'); -#require_once('data/CRMEntity.php'); -#require_once('include/utils/utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); require_once('include/database/PearDatabase.php'); @@ -58,46 +56,10 @@ var $default_order_by = "login_id"; - function create_tables () { - /*$query = 'CREATE TABLE '.$this->table_name.' ( '; - $query .='login_id int(11) NOT NULL auto_increment'; - $query .=', user_name varchar(25) NOT NULL'; - $query .=', user_ip varchar(25) NOT NULL'; - $query .=', login_time datetime NOT NULL default 0'; - $query .=', logout_time datetime NOT NULL default 0'; - $query .=', status enum(\'Signedin\',\'Signedoff\') default \'Signedin\''; - $query .=', PRIMARY KEY ( login_id ) )'; - - $this->log->info($query); - - mysql_query($query) or die("Error creating table: ".mysql_error());*/ - - //TODO Clint 4/27 - add exception handling logic here if the table can't be created. - - } - - function drop_tables () { - /* - $query = 'DROP TABLE IF EXISTS '.$this->table_name; - - $this->log->info($query); - - mysql_query($query); - - //TODO Clint 4/27 - add exception handling logic here if the table can't be dropped. - */ - - } - - function get_summary_text() - { - return "$this->first_name $this->last_name"; - } /** Records the Login info */ function user_login(&$usname,&$usip,&$intime) { - //print("GS --> intime=".$intime); $query = "Insert into loginhistory values (null,'$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')"; $result = $this->db->query($query) or die("MySQL error: ".mysql_error()); @@ -109,7 +71,6 @@ { $logid_qry = "SELECT max(login_id) login_id from loginhistory where user_name='$usname' and user_ip='$usip'"; $result = $this->db->query($logid_qry); - //if($this->db->num_rows($result) !=1 ) return; $loginid = $this->db->query_result($result,0,"login_id"); if ($loginid == '') { @@ -124,7 +85,6 @@ function create_list_query(&$order_by, &$where) { // Determine if the account name is present in the where clause. - // $query = "SELECT * from loginhistory order by login_time"; global $current_user; $query = "SELECT user_name,user_ip,".$this->db->getDBDateString("login_time")." login_time,".$this->db->getDBDateString("logout_time")." logout_time,status FROM $this->table_name "; if($where != "") @@ -145,17 +105,6 @@ return $query; } - - - function list_view_pare_additional_sections(&$list_form){ - if(isset($this->yahoo_id) && $this->yahoo_id != '') - $list_form->parse("main.row.yahoo_id"); - else - $list_form->parse("main.row.no_yahoo_id"); - return $list_form; - - } - } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 02:58:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 07:58:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4639 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329075851.F1E712B7B52@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 00:58:44 2006 New Revision: 4639 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 00:58:44 2006 @@ -93,12 +93,6 @@ $this->column_fields = getColumnFields('Products'); } - function get_summary_text() - { - return $this->name; - } - - function get_attachments($id) { // Armando L?scher 18.10.2005 -> ?visibleDescription From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:04:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:04:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4640 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060329080450.8966A2B7B62@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:04:44 2006 New Revision: 4640 Log: junk code removed Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Wed Mar 29 01:04:44 2006 @@ -16,67 +16,36 @@ class PopulateComboValues { - - //var $table_name="lead_source"; var $app_list_strings; - function insertComboValues($values, $tableName) + function insertComboValues($values, $tableName) { - global $adb; -// global $log; -// $log->info("in insertComboValues ".$tableName); - $i=0; - foreach ($values as $val => $cal) - { - if($val != '') - { - $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); - } - else - { - $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); - } - $i++; - } + global $adb; + $i=0; + foreach ($values as $val => $cal) + { + if($val != '') + { + $adb->query("insert into ".$tableName. " values(null,'".$val."',".$i.",1)"); + } + else + { + $adb->query("insert into ".$tableName. " values(null,'--None--',".$i.",1)"); + } + $i++; + } } - function create_tables () { + function create_tables () + { global $app_list_strings,$adb; - global $combo_strings; + global $combo_strings; $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); foreach ($comboTables as $comTab) { - /*$result = mysql_query("show tables like '%".$comTab."%'"); - if(mysql_num_rows($result) == 0) - { - $query = 'CREATE TABLE '.$comTab.' ('; - $query .=$comTab.' varchar(200) NOT NULL'; - $query .=', PRIMARY KEY ('.$comTab.'))'; - - mysql_query($query) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - echo("Created table ".$comTab); - echo("
    "); - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); - } - else - { - echo("Table ".$comTab." already exists"); - echo("
    "); - $tableRows = mysql_query("select * from ".$comTab); - if(mysql_num_rows($tableRows) == 0) - { - - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); - } - }*/ - - $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); + $this->insertComboValues($combo_strings[$comTab."_dom"],$comTab); } - } - - - } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:08:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:08:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4641 - /vtigercrm/trunk/modules/Products/ProductDetailView.html Message-ID: <20060329080806.65CBF2B7BA3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:08:01 2006 New Revision: 4641 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductDetailView.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:10:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:10:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4642 - /vtigercrm/trunk/modules/Products/ProductsPopupList.html Message-ID: <20060329081018.F27332B7BB3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:10:12 2006 New Revision: 4642 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductsPopupList.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4643 - /vtigercrm/trunk/modules/Products/binaryfilelist.php Message-ID: <20060329081950.967862B7C6B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:19:44 2006 New Revision: 4643 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/binaryfilelist.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:24:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:24:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4644 - /vtigercrm/trunk/modules/Products/ProductsList.html Message-ID: <20060329082441.6B5032B7C82@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:24:34 2006 New Revision: 4644 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/ProductsList.html From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 03:28:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 08:28:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4645 - /vtigercrm/trunk/modules/Products/downloadfile.php Message-ID: <20060329082813.830792B7C87@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 01:28:05 2006 New Revision: 4645 Log: file has been removed Removed: vtigercrm/trunk/modules/Products/downloadfile.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:09:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:09:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4646 - /vtigercrm/trunk/include/RelatedTicketListUtil.php Message-ID: <20060329090911.C517E2B7BA3@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:09:02 2006 New Revision: 4646 Log: file has been removed Removed: vtigercrm/trunk/include/RelatedTicketListUtil.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:12:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:12:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4647 - /vtigercrm/trunk/modules/Campaigns/Campaign.php Message-ID: <20060329091248.A51C92B7D11@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:12:39 2006 New Revision: 4647 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Campaign.php (original) +++ vtigercrm/trunk/modules/Campaigns/Campaign.php Wed Mar 29 02:12:39 2006 @@ -64,10 +64,6 @@ $focus = new Contact(); $button = ''; - if(isPermitted("Contacts",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted=0 and contactdetails.campaignid = '.$id; @@ -81,10 +77,6 @@ $focus = new Lead(); $button = ''; - if(isPermitted("Leads",1,"") == 'yes') - { - $button .= ' '; - } $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id; $query = 'SELECT leaddetails.*, crmentity.crmid, crmentity.smownerid from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted=0 and leaddetails.campaignid = '.$id; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:16:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:16:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4648 - /vtigercrm/trunk/modules/Campaigns/DetailView.php Message-ID: <20060329091628.D0DBB2B7D35@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:16:24 2006 New Revision: 4648 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/DetailView.php (original) +++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Mar 29 02:16:24 2006 @@ -11,7 +11,6 @@ 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('include/utils/utils.php'); @@ -27,10 +26,8 @@ { $focus->id = ""; } -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$theme,$profile_id;; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); @@ -62,7 +59,6 @@ $smarty->assign("MODULE","Campaigns"); $smarty->display("DetailView.tpl"); //Security check for related list -global $profile_id; $tab_per_Data = getAllTabsPermission($profile_id); $permissionData = $_SESSION['action_permission_set']; $focus->id = $_REQUEST['record']; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:20:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:20:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4649 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060329092030.8ECB951048B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:20:23 2006 New Revision: 4649 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Mar 29 02:20:23 2006 @@ -14,11 +14,7 @@ require_once('modules/Campaigns/Campaign.php'); require_once('include/FormValidationUtil.php'); -global $app_strings; -global $app_list_strings; -global $mod_strings; -global $current_user; -global $currentModule; +global $app_strings,$mod_strings,$currentModule,$theme; $focus = new Campaign(); $smarty = new vtigerCRM_Smarty(); @@ -36,7 +32,6 @@ $focus->mode = ''; } -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:36:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:36:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4650 - /vtigercrm/trunk/modules/CustomView/CustomView.php Message-ID: <20060329093623.9F0EB5158F6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:35:54 2006 New Revision: 4650 Log: function getParentId removed Modified: vtigercrm/trunk/modules/CustomView/CustomView.php Modified: vtigercrm/trunk/modules/CustomView/CustomView.php ============================================================================== --- vtigercrm/trunk/modules/CustomView/CustomView.php (original) +++ vtigercrm/trunk/modules/CustomView/CustomView.php Wed Mar 29 02:35:54 2006 @@ -1204,16 +1204,5 @@ return $calist; } - function getParentId($fields,$values) - { - global $adb; - - if($fields = 'crmentity.smownerid') - { - $sSQL = " left join users on users".$value; - $result = $adb->query($sSQL); - } - } - } ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 04:41:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 09:41:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4651 - /vtigercrm/trunk/modules/Settings/CustomFieldList.php Message-ID: <20060329094105.06C852B7D4D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 02:40:51 2006 New Revision: 4651 Log: action has been changed for custom field mapping Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original) +++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Wed Mar 29 02:40:51 2006 @@ -28,7 +28,7 @@ if($_REQUEST['fld_module']=="Leads") { - echo ''; //button for custom field mapping + echo ''; //button for custom field mapping } echo ''; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:41:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:41:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4652 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329104152.2CBA22BF2CC@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:41:46 2006 New Revision: 4652 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 03:41:46 2006 @@ -255,28 +255,6 @@ return $response; } - - -function save_relationship_changes($is_update) - { - - $query = "UPDATE tasks set contact_id=null where id='". $this->id ."' and deleted=0"; - $this->db->query($query,true,"Error clearing contact to task relationship: "); - - // echo "\n Quwry is " .$query; - // echo "\ncontact_id is " .$this->contact_id; - - - if($this->contact_id != "") - { - $query = "UPDATE tasks set contact_id='" .$this->contact_id ."' where id='" .$this->id ."' and deleted=0"; - //echo $query; - $this->db->query($query,true,"Error setting contact to task relationship: "."
    $query"); - } - - } - - function get_list_view_data(){ global $action, $currentModule, $focus, $app_list_strings; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:45:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:45:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4653 - /vtigercrm/trunk/modules/Activities/SendReminder.php Message-ID: <20060329104557.1B1B553C4FC@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:45:53 2006 New Revision: 4653 Log: file has been removed Removed: vtigercrm/trunk/modules/Activities/SendReminder.php From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:48:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:48:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4654 - /vtigercrm/trunk/SendReminder.php Message-ID: <20060329104815.538E653CBEA@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:48:08 2006 New Revision: 4654 Log: junk code has been removed Modified: vtigercrm/trunk/SendReminder.php Modified: vtigercrm/trunk/SendReminder.php ============================================================================== --- vtigercrm/trunk/SendReminder.php (original) +++ vtigercrm/trunk/SendReminder.php Wed Mar 29 03:48:08 2006 @@ -87,22 +87,7 @@ } } - // Selecting contacts to send reminder /*commented as the customer need not receive the mail - /* - $query_cnt="SELECT contactdetails.email,cntactivityrel.contactid,crmentity.crmid FROM cntactivityrel inner join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=cntactivityrel.contactid where cntactivityrel.activityid =".$activity_id." and crmentity.deleted=0"; - $cnt_result = $adb->query($query_cnt); - if($adb->num_rows($cnt_result)>=1) - { - while($cnt_result_row = $adb->fetch_array($cnt_result)) - { - if($cnt_result_row['email']!='' || $cnt_result_row['email'] !=NULL) - { - $to_addr[] = $cnt_result_row['email']; - } - } - } - */ //Comments ends - // Set the preferred email id + // Set the preferred email id $from ="reminders at localserver.com"; // Retriving the Subject and message from reminder table @@ -160,7 +145,6 @@ $mail->IsSMTP(); // set mailer to use SMTP - //$mail->Host = "smtp1.example.com;smtp2.example.com"; // specify main and backup server if($mail_server=='') { @@ -188,7 +172,6 @@ $log->info("Mail sending process : To Email id = '".$addr."' (set in the mail object)"); } - //$mail->AddReplyTo($from); $mail->WordWrap = 50; // set word wrap to 50 characters $mail->IsHTML(true); // set email format to HTML From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:51:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:51:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4655 - /vtigercrm/trunk/data/SugarBean.php Message-ID: <20060329105112.C3347544AA5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:50:47 2006 New Revision: 4655 Log: Unwanted functions removed Modified: vtigercrm/trunk/data/SugarBean.php Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 05:58:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 10:58:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4656 - /vtigercrm/trunk/modules/Contacts/Forms.php Message-ID: <20060329105842.BE75154C7E1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 03:58:37 2006 New Revision: 4656 Log: Removed function trim() from Forms.php Ahmed Modified: vtigercrm/trunk/modules/Contacts/Forms.php Modified: vtigercrm/trunk/modules/Contacts/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:01:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:01:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4657 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060329110126.7781B54C7ED@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:01:22 2006 New Revision: 4657 Log: Removed function trim() from Forms.php Ahmed Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Wed Mar 29 04:01:22 2006 @@ -44,17 +44,6 @@ - - {$JAVASCRIPT} {include file='SettingsSubMenu.tpl'} From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:33:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:33:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4671 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060329113325.7243F55B40F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:33:17 2006 New Revision: 4671 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Mar 29 04:33:17 2006 @@ -131,7 +131,7 @@ } $customviewstrings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:39:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:39:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4672 - /vtigercrm/trunk/modules/Settings/CurrencyInfo.php Message-ID: <20060329113948.985A52CA1A1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:39:40 2006 New Revision: 4672 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/CurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/CurrencyInfo.php Wed Mar 29 04:39:40 2006 @@ -10,15 +10,11 @@ ********************************************************************************/ require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; +global $mod_strings,$app_strings,$adb,$theme; echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_CURRENCY_CONFIG'], true); echo '

    '; -global $adb; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:40:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:40:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4673 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060329114005.939702CA1A8@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:40:00 2006 New Revision: 4673 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Wed Mar 29 04:40:00 2006 @@ -131,7 +131,7 @@ } $customviewstrings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:41:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:41:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4674 - /vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Message-ID: <20060329114126.65B6C2CA1B4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:41:16 2006 New Revision: 4674 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCurrencyInfo.php Wed Mar 29 04:41:16 2006 @@ -10,15 +10,11 @@ ********************************************************************************/ require_once('XTemplate/xtpl.php'); -global $mod_strings; -global $app_strings; -global $app_list_strings; +global $mod_strings,$app_strings,$adb,$theme; echo get_module_title($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_MODULE_NAME'].' : '.$mod_strings['LBL_CURRENCY_CONFIG'], true); echo '

    '; -global $adb; -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:45:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:45:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4675 - /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Message-ID: <20060329114525.578F454E499@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:45:15 2006 New Revision: 4675 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php ============================================================================== --- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original) +++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Wed Mar 29 04:45:15 2006 @@ -18,12 +18,6 @@ $conversion_rate= $_REQUEST['conversion_rate']; $currency_status= $_REQUEST['currency_status']; - -//$sql1 = "delete from currency_info"; -//$adb->query($sql1); - -//$sql2 = "insert into currency_info values('".$currency_name."','".$currency_code."','".$currency_symbol."')"; -//$adb->query($sql2); if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { $sql = "update currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record']; @@ -32,7 +26,6 @@ { $sql = "insert into currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')"; } -//echo $sql; $adb->query($sql); $loc = "Location: index.php?module=Settings&action=CurrencyListView"; header($loc); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:46:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:46:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4676 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060329114623.C87E851F228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:46:14 2006 New Revision: 4676 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Wed Mar 29 04:46:14 2006 @@ -112,7 +112,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:46:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:46:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4677 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329114634.8707B54E8EB@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:46:28 2006 New Revision: 4677 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:52:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:52:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4678 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060329115254.BB1BD560BEF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:52:45 2006 New Revision: 4678 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Wed Mar 29 04:52:45 2006 @@ -137,7 +137,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:54:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:54:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4679 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060329115433.9AAC3560BEF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:54:28 2006 New Revision: 4679 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Wed Mar 29 04:54:28 2006 @@ -158,7 +158,7 @@ $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:57:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:57:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4680 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060329115723.F23472CA1D1@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:57:16 2006 New Revision: 4680 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Wed Mar 29 04:57:16 2006 @@ -110,7 +110,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 06:59:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 11:59:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4681 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060329115921.41BFD2CA1D2@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 04:59:14 2006 New Revision: 4681 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Wed Mar 29 04:59:14 2006 @@ -94,7 +94,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:00:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:00:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4682 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060329120035.84D9156140B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:00:21 2006 New Revision: 4682 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Wed Mar 29 05:00:21 2006 @@ -168,7 +168,7 @@ } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:01:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:01:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4683 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060329120153.97395563A36@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:01:29 2006 New Revision: 4683 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Wed Mar 29 05:01:29 2006 @@ -109,7 +109,7 @@ $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:03:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4684 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060329120330.1950D567466@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:03:23 2006 New Revision: 4684 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Wed Mar 29 05:03:23 2006 @@ -130,7 +130,7 @@ $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:04:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:04:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4685 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060329120440.CC97655B40F@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:04:35 2006 New Revision: 4685 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Wed Mar 29 05:04:35 2006 @@ -88,7 +88,7 @@ $customviewstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:05:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:05:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4686 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060329120538.6844056746E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:05:33 2006 New Revision: 4686 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Wed Mar 29 05:05:33 2006 @@ -108,7 +108,7 @@ $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } $customstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:06:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:06:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4687 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060329120642.8894356746E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:06:37 2006 New Revision: 4687 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Wed Mar 29 05:06:37 2006 @@ -98,7 +98,7 @@ } $custom_view_strings=''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:08:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:08:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4688 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060329120807.F3087567918@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:07:50 2006 New Revision: 4688 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Wed Mar 29 05:07:50 2006 @@ -101,7 +101,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:10:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:10:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4689 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060329121019.CC76A56886B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:10:00 2006 New Revision: 4689 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Wed Mar 29 05:10:00 2006 @@ -125,7 +125,7 @@ '.$app_strings['LNK_CV_DELETE'].''; } $customstrings = ''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:11:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:11:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4690 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329121132.38EC356B7BB@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:11:15 2006 New Revision: 4690 Log: unwanted functions removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 05:11:15 2006 @@ -96,99 +96,6 @@ } - function fill_in_additional_list_fields() - { - $this->fill_in_additional_detail_fields(); - } - - function fill_in_additional_detail_fields() - { - // Fill in the assigned_user_name - $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id); - - global $app_strings; - - if (isset($this->contact_id)) { - require_once("modules/Contacts/Contact.php"); - $contact = new Contact(); - $query = "SELECT firstname, lastname, phone, email from $contact->table_name where contactid = '$this->contact_id'"; - - $result =$this->db->query($query,true,$app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - $this->contact_name = return_name($row, 'first_name', 'last_name'); - if ($row['phone_work'] != '') $this->contact_phone = $row['phone_work']; - if ($row['email1'] != '') $this->contact_email = $row['email1']; - } - } - if ($this->parent_type == "Potentials") { - require_once("modules/Potentials/Opportunity.php"); - $parent = new Potential(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true, $app_strings['ERR_CREATING_FIELDS']); - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - if ($this->parent_type == "Cases") { - require_once("modules/Cases/Case.php"); - $parent = new aCase(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true,$app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - if ($this->parent_type == "Accounts") { - require_once("modules/Accounts/Account.php"); - $parent = new Account(); - $query = "SELECT name from $parent->table_name where id = '$this->parent_id'"; - - $result =$this->db->query($query,true, $app_strings['ERR_CREATING_FIELDS']); - - - // Get the id and the name. - - $row = $this->db->fetchByAssoc($result); - - - if($row != null) - { - if ($row['name'] != '') $this->parent_name = stripslashes($row['name']); - } - } - } - - function delete($id) - { - - $this->db->query("update tasks set deleted=1 where id = '" . $id . "'"); - } - function getCount($user_name) { $query = "select count(*) from tasks inner join users on users.id=tasks.assigned_user_id where user_name='" .$user_name ."' and tasks.deleted=0"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:13:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:13:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4691 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060329121316.36C4456B7E0@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:13:08 2006 New Revision: 4691 Log: Added the 2nd argument - modulename in the showDefaultCustomView function Ahmed Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Wed Mar 29 05:13:08 2006 @@ -93,7 +93,7 @@ } $customviewstrings =''.$app_strings[LBL_VIEW].' - '.$customviewcombo_html.' '.$cvHTML; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:20:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:20:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4692 - in /vtigercrm/trunk/modules/Import: ImportMap.php UsersLastImport.php Message-ID: <20060329122007.70D3C2CA1ED@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:19:52 2006 New Revision: 4692 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Import/ImportMap.php vtigercrm/trunk/modules/Import/UsersLastImport.php Modified: vtigercrm/trunk/modules/Import/ImportMap.php ============================================================================== --- vtigercrm/trunk/modules/Import/ImportMap.php (original) +++ vtigercrm/trunk/modules/Import/ImportMap.php Wed Mar 29 05:19:52 2006 @@ -148,7 +148,6 @@ $focus->$field = $row[$field]; } } - $focus->fill_in_additional_detail_fields(); array_push($obj_arr,$focus); } return $obj_arr; Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php ============================================================================== --- vtigercrm/trunk/modules/Import/UsersLastImport.php (original) +++ vtigercrm/trunk/modules/Import/UsersLastImport.php Wed Mar 29 05:19:52 2006 @@ -61,11 +61,6 @@ $this->db = new PearDatabase(); } - function fill_in_additional_detail_fields() - { - - } - function mark_deleted_by_user_id($user_id) { $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'"; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:24:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:24:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4693 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329122455.372C751F216@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:24:48 2006 New Revision: 4693 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 05:24:48 2006 @@ -373,27 +373,6 @@ return GetRelatedList('Leads','Products',$focus,$query,$button,$returnset); } - - - - // This method is used to provide backward compatibility with old data that was prefixed with http:// - // We now automatically prefix http:// - function remove_redundant_http() - { - if(eregi("http://", $this->website)) - { - $this->website = substr($this->website, 7); - } - } - - function fill_in_additional_list_fields() - { - // Fill in the assigned_user_name - $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id); - - $this->remove_redundant_http(); - } - function get_lead_field_options($list_option) { $comboFieldArray = getComboArray($this->combofieldNames); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:42:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:42:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4694 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060329124229.1D62A5850DF@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:42:14 2006 New Revision: 4694 Log: Removed Unused functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:48:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:48:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4695 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060329124822.600102CA228@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:48:16 2006 New Revision: 4695 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Mar 29 05:48:16 2006 @@ -236,26 +236,6 @@ $smarty->assign("ROWCOUNT", '1'); $smarty->assign("TAXVALUE", '0'); $smarty->assign("ADJUSTMENTVALUE", '0'); - $output =''; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= '
     '; - $output .= ''; - $output .= ''; - $output .=''; - $output .= '
     '; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= '
    '; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $smarty->assign("ROW1", $output); } if(isset($cust_fld)) @@ -271,7 +251,6 @@ else $smarty->assign("RETURN_ACTION","index"); if(isset($_REQUEST['return_id'])) $smarty->assign("RETURN_ID", $_REQUEST['return_id']); if (isset($_REQUEST['return_viewname'])) $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']); -$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); $smarty->assign("THEME", $theme); $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); $smarty->assign("ID", $focus->id); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:49:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:49:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4696 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329124904.251462CA229@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:48:58 2006 New Revision: 4696 Log: unwanted functions removed Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4697 - /vtigercrm/trunk/modules/Invoice/Forms.php Message-ID: <20060329125105.574F52CA29B@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:51:00 2006 New Revision: 4697 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Invoice/Forms.php Modified: vtigercrm/trunk/modules/Invoice/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Forms.php (original) +++ vtigercrm/trunk/modules/Invoice/Forms.php Wed Mar 29 05:51:00 2006 @@ -1,163 +1,2 @@ - - - -EOQ; - -return $the_script; -} - ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:55:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:55:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4698 - /vtigercrm/trunk/modules/Notes/Note.php Message-ID: <20060329125507.47D5750DC96@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:54:57 2006 New Revision: 4698 Log: Removed Unused functions Modified: vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 07:57:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 12:57:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4699 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329125737.02FA350DCA4@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 05:57:29 2006 New Revision: 4699 Log: Unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 05:57:29 2006 @@ -109,60 +109,6 @@ return $row["count(*)"]; } - function get_tasks($user_name,$from_index,$offset) - { - $query = "select tasks.*, contacts.first_name cfn, contacts.last_name cln from tasks inner join users on users.id=tasks.assigned_user_id left join contacts on contacts.id=tasks.contact_id where user_name='" .$user_name ."' and tasks.deleted=0 limit " .$from_index ."," .$offset; - - return $this->process_list_query1($query); - - } - - - function process_list_query1($query) - { - $result =& $this->db->query($query,true,"Error retrieving $this->object_name list: "); - $list = Array(); - $rows_found = $this->db->getRowCount($result); - if($rows_found != 0) - { - for($index = 0 , $row = $this->db->fetchByAssoc($result, $index); $row && $index <$rows_found;$index++, $row = $this->db->fetchByAssoc($result, $index)) - - { - foreach($this->list_fields as $field) - { - if (isset($row[$field])) { - $this->$field = $row[$field]; - } - else - { - $this->$field = ""; - } - } - - // TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every contacts and hence - // account query goes for ecery single account row - - // $this->fill_in_additional_list_fields(); - //$this->account_name = $row['accountname']; - //$this->account_id = $row['accountid']; - $this->contact_name = return_name($row, 'cfn', 'cln'); - - - $list[] = $this; - } - } - - $response = Array(); - $response['list'] = $list; - $response['row_count'] = $rows_found; - $response['next_offset'] = $next_offset; - $response['previous_offset'] = $previous_offset; - - - - return $response; - } - function get_list_view_data(){ global $action, $currentModule, $focus, $app_list_strings; $today = date("Y-m-d", time()); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 08:21:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 13:21:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4700 - /vtigercrm/trunk/modules/Settings/CreateCustomField.php Message-ID: <20060329132158.14A5C50D31C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 06:21:48 2006 New Revision: 4700 Log: changes made for multiselectcombo box Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php ============================================================================== --- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original) +++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Wed Mar 29 06:21:48 2006 @@ -74,10 +74,11 @@ 'Email'=>'5', 'Phone'=>'6', 'Picklist'=>'7', - 'URL'=>'8'); + 'URL'=>'8', + 'MultiSelectCombo'=>'11'); $xtpl->assign("FLDTYPEVALUE", $typeVal[$_REQUEST["fldType"]]); } -else +elseif($fieldid == '') { $xtpl->assign("FLDTYPEVALUE", "0"); } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:04:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:04:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4701 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329140455.678B958BB1D@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:04:47 2006 New Revision: 4701 Log: Added function checkIfCustomTableExists() Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:07:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:07:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4702 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329140750.44D4A58BB2D@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:07:44 2006 New Revision: 4702 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:09:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:09:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4703 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060329140920.C65A62B7B60@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:09:16 2006 New Revision: 4703 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Mar 29 07:09:16 2006 @@ -454,26 +454,12 @@ return $sql3; } -//check if the custom table exists or not in the first place -function checkIfCustomTableExists() -{ - $result = $this->db->query("select * from contactscf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } -return $exists; -} + function create_export_query(&$order_by, &$where) { global $log; - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('contactscf')) { $query = $this->constructCustomQueryAddendum() .", contactdetails.*, contactaddress.*, From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:10:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:10:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4704 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329141032.AEF242CA229@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:10:28 2006 New Revision: 4704 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 07:10:28 2006 @@ -265,28 +265,10 @@ } - - //check if the custom table exists or not in the first place - function checkIfCustomTableExists() - { - $result = $this->db->query("select * from productcf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } - return $exists; - } - - function create_export_query(&$order_by, &$where) { - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('productcf')) { $query = $this->constructCustomQueryAddendum() . From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:12:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:12:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4705 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329141210.40E3150D20F@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:12:05 2006 New Revision: 4705 Log: Duplicate code removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 07:12:05 2006 @@ -183,26 +183,12 @@ } -//check if the custom table exists or not in the first place -function checkIfCustomTableExists() -{ - $result = $this->db->query("select * from leadscf"); - $testrow = $this->db->num_fields($result); - if($testrow > 1) - { - $exists=true; - } - else - { - $exists=false; - } -return $exists; -} + function create_export_query(&$order_by, &$where) { - if($this->checkIfCustomTableExists()) + if($this->checkIfCustomTableExists('leadscf')) { $query = $this->constructCustomQueryAddendum() . " From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 09:15:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 14:15:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4706 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329141548.D47D95858F8@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 07:15:35 2006 New Revision: 4706 Log: code clean up in security module Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:16:04 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:16:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4707 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060329151604.6A2AC50D328@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 08:16:00 2006 New Revision: 4707 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Wed Mar 29 08:16:00 2006 @@ -83,18 +83,6 @@ var $new_schema = true; - function create_tables () { - global $app_strings; - } - - function drop_tables () { - } - - function get_summary_text() - { - return "$this->name"; - } - function getCount($user_name) { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:26:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:26:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4708 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060329152630.0DD5250D3AC@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:26:26 2006 New Revision: 4708 Log: added module constructCustomQueryAddendum Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:30:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:30:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4709 - /vtigercrm/trunk/modules/Accounts/Account.php Message-ID: <20060329153042.0C70F50D3FA@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:30:38 2006 New Revision: 4709 Log: code duplication removed Modified: vtigercrm/trunk/modules/Accounts/Account.php Modified: vtigercrm/trunk/modules/Accounts/Account.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:33:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:33:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4710 - /vtigercrm/trunk/modules/Contacts/Contact.php Message-ID: <20060329153320.78B1550D421@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:33:16 2006 New Revision: 4710 Log: code duplication removed Modified: vtigercrm/trunk/modules/Contacts/Contact.php Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Mar 29 08:33:16 2006 @@ -424,44 +424,13 @@ -//method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - - global $log; - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=4"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "contactscf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", contactscf.".$columnName. " '" .$fieldlable."'"; - } - - } - $log->info("Custom Query successfully Constructed in constructCustomQueryAddendum()"); - return $sql3; - } - - function create_export_query(&$order_by, &$where) { global $log; if($this->checkIfCustomTableExists('contactscf')) { - $query = $this->constructCustomQueryAddendum() .", + $query = $this->constructCustomQueryAddendum('contactscf','Contacts') .", contactdetails.*, contactaddress.*, account.accountname account_name, users.user_name assigned_user_name From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:33:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:33:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4711 - /vtigercrm/trunk/modules/Products/Product.php Message-ID: <20060329153358.63DFD50D474@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:33:54 2006 New Revision: 4711 Log: code duplication removed Modified: vtigercrm/trunk/modules/Products/Product.php Modified: vtigercrm/trunk/modules/Products/Product.php ============================================================================== --- vtigercrm/trunk/modules/Products/Product.php (original) +++ vtigercrm/trunk/modules/Products/Product.php Wed Mar 29 08:33:54 2006 @@ -229,6 +229,7 @@ $query = 'select crmentity.crmid, pricebook.*,pricebookproductrel.productid as prodid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id; return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset); } + function product_novendor() { $query = "SELECT products.productname,crmentity.deleted from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and products.vendor_id=''"; @@ -236,42 +237,13 @@ return $this->db->num_rows($result); } - //method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=14"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "productcf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", productcf.".$columnName. " '" .$fieldlable."'"; - } - - } - return $sql3; - - } - function create_export_query(&$order_by, &$where) { if($this->checkIfCustomTableExists('productcf')) { - $query = $this->constructCustomQueryAddendum() . + $query = $this->constructCustomQueryAddendum('productcf','Products') . ", products.productid productid, products.productname productname, From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:34:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:34:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4712 - /vtigercrm/trunk/modules/Leads/Lead.php Message-ID: <20060329153450.A17E050D483@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:34:46 2006 New Revision: 4712 Log: code duplication removed Modified: vtigercrm/trunk/modules/Leads/Lead.php Modified: vtigercrm/trunk/modules/Leads/Lead.php ============================================================================== --- vtigercrm/trunk/modules/Leads/Lead.php (original) +++ vtigercrm/trunk/modules/Leads/Lead.php Wed Mar 29 08:34:46 2006 @@ -150,89 +150,56 @@ $this->column_fields = getColumnFields('Leads'); } - //method added to construct the query to fetch the custom fields - function constructCustomQueryAddendum() - { - global $adb; - //get all the custom fields created - $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=7"; - $result = $adb->query($sql1); - $numRows = $adb->num_rows($result); - //select accountscf.columnname fieldlabel,accountscf.columnname fieldlabel - $sql3 = "select "; - for($i=0; $i < $numRows;$i++) - { - $columnName = $adb->query_result($result,$i,"columnname"); - $fieldlable = $adb->query_result($result,$i,"fieldlabel"); - //construct query as below - if($i == 0) - { - $sql3 .= "leadscf.".$columnName. " '" .$fieldlable."'"; - } - else - { - $sql3 .= ", leadscf.".$columnName. " '" .$fieldlable."'"; - } - - } - if ($numRows > 0) - { - $sql3=$sql3.','; - } - return $sql3; - - } - - + function create_export_query(&$order_by, &$where) - { + { if($this->checkIfCustomTableExists('leadscf')) { - - $query = $this->constructCustomQueryAddendum() . " - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status - FROM ".$this->entity_table." - INNER JOIN leaddetails - ON crmentity.crmid=leaddetails.leadid - LEFT JOIN leadaddress - ON leaddetails.leadid=leadaddress.leadaddressid - LEFT JOIN leadsubdetails - ON leaddetails.leadid=leadsubdetails.leadsubscriptionid - LEFT JOIN leadscf - ON leadscf.leadid=leaddetails.leadid - LEFT JOIN users - ON crmentity.smownerid = users.id "; + + $query = $this->constructCustomQueryAddendum('leadscf','Leads') . " + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status + FROM ".$this->entity_table." + INNER JOIN leaddetails + ON crmentity.crmid=leaddetails.leadid + LEFT JOIN leadaddress + ON leaddetails.leadid=leadaddress.leadaddressid + LEFT JOIN leadsubdetails + ON leaddetails.leadid=leadsubdetails.leadsubscriptionid + LEFT JOIN leadscf + ON leadscf.leadid=leaddetails.leadid + LEFT JOIN users + ON crmentity.smownerid = users.id "; } else { - $query = "SELECT - leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." - INNER JOIN leaddetails - ON crmentity.crmid=leaddetails.leadid - LEFT JOIN leadsubdetails - ON leaddetails.leadid = leadsubdetails.leadsubscriptionid - LEFT JOIN leadaddress - ON leaddetails.leadid=leadaddress.leadaddressid - LEFT JOIN users - ON crmentity.smownerid = users.id "; + $query = "SELECT + leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table." + INNER JOIN leaddetails + ON crmentity.crmid=leaddetails.leadid + LEFT JOIN leadsubdetails + ON leaddetails.leadid = leadsubdetails.leadsubscriptionid + LEFT JOIN leadaddress + ON leaddetails.leadid=leadaddress.leadaddressid + LEFT JOIN users + ON crmentity.smownerid = users.id "; } - $where_auto = " users.status='Active' - AND crmentity.deleted=0 AND leaddetails.converted =0"; - - if($where != "") - $query .= "where ($where) AND ".$where_auto; - else - $query .= "where ".$where_auto; - - if(!empty($order_by)) - $query .= " ORDER BY $order_by"; - - return $query; - } + $where_auto = " users.status='Active' + AND crmentity.deleted=0 AND leaddetails.converted =0"; + + if($where != "") + $query .= "where ($where) AND ".$where_auto; + else + $query .= "where ".$where_auto; + + if(!empty($order_by)) + $query .= " ORDER BY $order_by"; + + return $query; + } From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:36:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:36:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4713 - /vtigercrm/trunk/modules/Potentials/Opportunity.php Message-ID: <20060329153600.286C150D3FA@vtiger.fosslabs.com> Author: don Date: Wed Mar 29 08:35:55 2006 New Revision: 4713 Log: code duplication removed Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 10:36:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 29 Mar 2006 15:36:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4714 - in /vtigercrm/trunk/modules: Accounts/Account.js Contacts/Contact.js HelpDesk/HelpDesk.js Leads/Lead.js SalesOrder/SalesOrder.js Message-ID: <20060329153646.A772950D43E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 08:36:37 2006 New Revision: 4714 Log: mass mail fns moved to Mail.js and massmerge fns moved to Merge.js Modified: vtigercrm/trunk/modules/Accounts/Account.js vtigercrm/trunk/modules/Contacts/Contact.js vtigercrm/trunk/modules/HelpDesk/HelpDesk.js vtigercrm/trunk/modules/Leads/Lead.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/Accounts/Account.js ============================================================================== --- vtigercrm/trunk/modules/Accounts/Account.js (original) +++ vtigercrm/trunk/modules/Accounts/Account.js Wed Mar 29 08:36:37 2006 @@ -10,163 +10,9 @@ document.write(" + {if $MODULE eq 'Contacts'}
    @@ -272,11 +273,11 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} - + {elseif $button_check eq 's_cmail'} - + {elseif $button_check eq 'c_owner'} {elseif $button_check eq 'c_status'} @@ -321,11 +322,11 @@ {foreach key=button_check item=button_label from=$BUTTONS} {if $button_check eq 'del'} - + {elseif $button_check eq 's_mail'} - + {elseif $button_check eq 's_cmail'} - + {elseif $button_check eq 'c_owner'} {elseif $button_check eq 'c_status'} From vtiger-tickets at vtiger.fosslabs.com Wed Mar 29 15:27:30 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Wed, 29 Mar 2006 20:27:30 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2373=3A_D?= =?utf-8?q?isplay_a_blank_date_custom_field=2E?= Message-ID: <076.2b2db2198c1a9f6e4698fd7863871479@vtiger.fosslabs.com> #73: Display a blank date custom field. --------------------------+------------------------------------------------- Reporter: bluebird972 | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.3 Keywords: custom field | --------------------------+------------------------------------------------- It's look like not possible to display a blank date custom field. How i can do? Cause some of my custom Date field not need to be set in the same time or day (ex : if i want to set a return's date for a product. Thanks a lot!! Regards -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 29 22:38:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 03:38:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4720 - /vtigercrm/trunk/modules/Vendors/Vendor.php Message-ID: <20060330033805.D7BF450D5A5@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 20:38:01 2006 New Revision: 4720 Log: missed } has been included Modified: vtigercrm/trunk/modules/Vendors/Vendor.php Modified: vtigercrm/trunk/modules/Vendors/Vendor.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.php (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.php Wed Mar 29 20:38:01 2006 @@ -109,4 +109,5 @@ return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset); } +} ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:26:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:26:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4721 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060330052633.C765557A3FD@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:26:27 2006 New Revision: 4721 Log: function split_validationdataArray() has been defined Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Mar 29 22:26:27 2006 @@ -737,7 +737,6 @@ { $mycrmid=$adb->query_result($myresult,$i,'crmid'); $parent_module = getSalesEntityType($mycrmid); - //echo $mycrmid.'id
    '.$parent_module; if($parent_module == "Leads") { $sql = "select firstname,lastname,email from leaddetails where leadid=".$mycrmid; @@ -1184,12 +1183,7 @@ function getBlockInformation($module, $block, $mode, $col_fields,$tabid,$info_type='') { - //echo '*******************************
    '; - //echo '
    ';print_r($col_fields);echo '
    '; - //echo '*******************************
    '; - //retreive the tabid global $adb; - //$tabid = getTabid($module); $editview_arr = Array(); global $current_user; @@ -1226,7 +1220,6 @@ $result = $adb->query($sql); $noofrows = $adb->num_rows($result); - //$output=''; if (($module == 'Accounts' || $module == 'Contacts' || $module == 'Quotes' || $module == 'PurchaseOrder' || $module == 'SalesOrder'|| $module == 'Invoice') && $block == 2) { global $log; @@ -1248,12 +1241,9 @@ $maxlength = $adb->query_result($result,$i,"maximumlength"); $generatedtype = $adb->query_result($result,$i,"generatedtype"); - //$output .= ''; $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); - //$output .= $custfld; $editview_arr[]=$custfld; if ($mvAdd_flag == true) - //$output .= $moveAddress; $mvAdd_flag = false; $i++; if($i<$noofrows) @@ -1265,18 +1255,10 @@ $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); $maxlength = $adb->query_result($result,$i,"maximumlength"); $generatedtype = $adb->query_result($result,$i,"generatedtype"); - //$output .= ''; $custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module); - //$output .= $custfld; - //echo '
    ';print_r($custfld);echo '
    '; - //die; $editview_arr[]=$custfld; } - //$output .= ''; - //echo '
    ';print_r($editview_arr);echo '
    '; - - } - //return $output; + } for ($i=0,$j=0;$i $key1,1 => $key2); } return $return_data; - //return $editview_arr; - } +function split_validationdataArray($validationData) +{ + $fieldName = ''; + $fieldLabel = ''; + $fldDataType = ''; + $rows = count($validationData); + foreach($validationData as $fldName => $fldLabel_array) + { + if($fieldName == '') + { + $fieldName="'".$fldName."'"; + } + else + { + $fieldName .= ",'".$fldName ."'"; + } + foreach($fldLabel_array as $fldLabel => $datatype) + { + if($fieldLabel == '') + { + $fieldLabel = "'".$fldLabel ."'"; + } + else + { + $fieldLabel .= ",'".$fldLabel ."'"; + } + if($fldDataType == '') + { + $fldDataType = "'".$datatype ."'"; + } + else + { + $fldDataType .= ",'".$datatype ."'"; + } + } + } + $data['fieldname'] = $fieldName; + $data['fieldlabel'] = $fieldLabel; + $data['datatype'] = $fldDataType; + return $data; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:32:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:32:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4722 - in /vtigercrm/trunk/modules: Campaigns/Save.php Faq/Save.php HelpDesk/Save.php Invoice/Save.php Potentials/Save.php PriceBooks/Save.php PurchaseOrder/Save.php SalesOrder/Save.php Vendors/Save.php Message-ID: <20060330053221.8574758C8B6@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:31:55 2006 New Revision: 4722 Log: * Removed the lines which are used to assign the REQUEST values to focus->column_fileds and make it as a common function call Modified: vtigercrm/trunk/modules/Campaigns/Save.php vtigercrm/trunk/modules/Faq/Save.php vtigercrm/trunk/modules/HelpDesk/Save.php vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Potentials/Save.php vtigercrm/trunk/modules/PriceBooks/Save.php vtigercrm/trunk/modules/PurchaseOrder/Save.php vtigercrm/trunk/modules/SalesOrder/Save.php vtigercrm/trunk/modules/Vendors/Save.php Modified: vtigercrm/trunk/modules/Campaigns/Save.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/Save.php (original) +++ vtigercrm/trunk/modules/Campaigns/Save.php Wed Mar 29 22:31:55 2006 @@ -26,24 +26,8 @@ require_once('include/database/PearDatabase.php'); $focus = new Campaign(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); $focus->save("Campaigns"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/Faq/Save.php ============================================================================== --- vtigercrm/trunk/modules/Faq/Save.php (original) +++ vtigercrm/trunk/modules/Faq/Save.php Wed Mar 29 22:31:55 2006 @@ -28,23 +28,8 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Faq(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } -} +setObjectValuesFromRequest(&$focus); $focus->save("Faq"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/HelpDesk/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Wed Mar 29 22:31:55 2006 @@ -29,24 +29,8 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Invoice(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} - -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} + +setObjectValuesFromRequest(&$focus); $focus->save("Invoice"); Modified: vtigercrm/trunk/modules/Potentials/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/PriceBooks/Save.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/Save.php (original) +++ vtigercrm/trunk/modules/PriceBooks/Save.php Wed Mar 29 22:31:55 2006 @@ -26,25 +26,9 @@ require_once('include/database/PearDatabase.php'); $focus = new PriceBook(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} -//$focus->saveentity("PriceBooks"); +setObjectValuesFromRequest(&$focus); + $focus->save("PriceBooks"); $return_id = $focus->id; Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Mar 29 22:31:55 2006 @@ -28,25 +28,9 @@ $local_log =& LoggerManager::getLogger('index'); $focus = new Order(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} +setObjectValuesFromRequest(&$focus); -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} //Added code for auto product stock updation on receiving goods $update_prod_stock=''; if($focus->column_fields['postatus'] == 'Received Shipment' && $focus->mode == 'edit') @@ -103,8 +87,9 @@ $local_log->debug("Saved record with id of ".$return_id); - //code added for returning back to the current view after edit from list view - if($_REQUEST['return_viewname'] == '') $return_viewname='0'; - if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; +//code added for returning back to the current view after edit from list view +if($_REQUEST['return_viewname'] == '') $return_viewname='0'; +if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; + header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname"); ?> Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Wed Mar 29 22:31:55 2006 @@ -30,27 +30,10 @@ $focus = new SalesOrder(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} - -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} - +setObjectValuesFromRequest(&$focus); $focus->save("SalesOrder"); + //Checking if quote_id is present and updating the quote status if($focus->column_fields["quote_id"] != '') { @@ -58,7 +41,6 @@ $query1 = "update quotes set quotestage='Accepted' where quoteid=".$qt_id; $adb->query($query1); } - $ext_prod_arr = Array(); if($focus->mode == 'edit') Modified: vtigercrm/trunk/modules/Vendors/Save.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/Save.php (original) +++ vtigercrm/trunk/modules/Vendors/Save.php Wed Mar 29 22:31:55 2006 @@ -26,25 +26,8 @@ require_once('include/database/PearDatabase.php'); $focus = new Vendor(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); -//$focus->saveentity("Vendors"); $focus->save("Vendors"); $return_id = $focus->id; @@ -53,6 +36,7 @@ if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action']; else $return_action = "DetailView"; if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id']; + //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:50:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:50:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4723 - /vtigercrm/trunk/modules/Accounts/EditView.php Message-ID: <20060330055059.1D15958E83C@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:50:48 2006 New Revision: 4723 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Accounts/EditView.php Modified: vtigercrm/trunk/modules/Accounts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:51:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:51:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4724 - /vtigercrm/trunk/modules/Activities/EditView.php Message-ID: <20060330055158.5FFA558FE95@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:51:54 2006 New Revision: 4724 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Activities/EditView.php Modified: vtigercrm/trunk/modules/Activities/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 00:54:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 05:54:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4725 - /vtigercrm/trunk/modules/Campaigns/EditView.php Message-ID: <20060330055439.9173F49A816@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 22:54:35 2006 New Revision: 4725 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Campaigns/EditView.php Modified: vtigercrm/trunk/modules/Campaigns/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/EditView.php (original) +++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Mar 29 22:54:35 2006 @@ -91,47 +91,11 @@ $campaign_tables = Array('campaign','crmentity'); $tabid = getTabid("Campaigns"); $validationData = getDBValidationData($campaign_tables,$tabid); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; +$data = split_validationdataArray($validationData); -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:01:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:01:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4726 - /vtigercrm/trunk/modules/Contacts/EditView.php Message-ID: <20060330060137.24C3F586640@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:01:29 2006 New Revision: 4726 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Contacts/EditView.php Modified: vtigercrm/trunk/modules/Contacts/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:06:01 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:06:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4727 - /vtigercrm/trunk/modules/Emails/EditView.php Message-ID: <20060330060601.C36EC590011@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:05:57 2006 New Revision: 4727 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Emails/EditView.php Modified: vtigercrm/trunk/modules/Emails/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:07:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:07:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4728 - /vtigercrm/trunk/modules/Faq/EditView.php Message-ID: <20060330060753.6B2D2590011@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:07:44 2006 New Revision: 4728 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Faq/EditView.php Modified: vtigercrm/trunk/modules/Faq/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/EditView.php (original) +++ vtigercrm/trunk/modules/Faq/EditView.php Wed Mar 29 23:07:44 2006 @@ -97,47 +97,11 @@ $faq_tables = Array('faq'); $validationData = getDBValidationData($faq_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; + $data = split_validationdataArray($validationData); -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); else From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:13:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:13:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4729 - /vtigercrm/trunk/modules/HelpDesk/EditView.php Message-ID: <20060330061313.C59CF5886C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:13:08 2006 New Revision: 4729 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:13:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:13:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4730 - /vtigercrm/trunk/modules/HelpDesk/Forms.php Message-ID: <20060330061354.E82475886C9@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:13:50 2006 New Revision: 4730 Log: junk code has been removed Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:16:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:16:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4731 - /vtigercrm/trunk/modules/Invoice/EditView.php Message-ID: <20060330061658.8037A590025@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:16:52 2006 New Revision: 4731 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Invoice/EditView.php Modified: vtigercrm/trunk/modules/Invoice/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/EditView.php (original) +++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Mar 29 23:16:52 2006 @@ -266,48 +266,13 @@ $invoice_tables = Array('invoice','invoicebillads','invoiceshipads'); $tabid = getTabid("Invoice"); $validationData = getDBValidationData($invoice_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } + $data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:19:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:19:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4732 - /vtigercrm/trunk/modules/Leads/EditView.php Message-ID: <20060330061950.5FD25590025@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:19:46 2006 New Revision: 4732 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Leads/EditView.php Modified: vtigercrm/trunk/modules/Leads/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/EditView.php (original) +++ vtigercrm/trunk/modules/Leads/EditView.php Wed Mar 29 23:19:46 2006 @@ -22,10 +22,7 @@ require_once('include/utils/utils.php'); require_once('include/FormValidationUtil.php'); -global $mod_strings; -global $app_list_strings; -global $app_strings; -global $current_user; +global $mod_strings,$app_strings,$theme; $focus = new Lead(); $smarty = new vtigerCRM_Smarty; @@ -53,7 +50,6 @@ $smarty->assign("OP_MODE",$disp_view); -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; //retreiving the combo values array @@ -107,46 +103,11 @@ $lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf'); $tabid = getTabid("Leads"); $validationData = getDBValidationData($lead_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; + $data = split_validationdataArray($validationData); - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 01:23:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 06:23:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4733 - /vtigercrm/trunk/modules/Notes/EditView.php Message-ID: <20060330062356.19B30590070@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 29 23:23:52 2006 New Revision: 4733 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Notes/EditView.php Modified: vtigercrm/trunk/modules/Notes/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:17:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:17:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4734 - /vtigercrm/trunk/modules/Potentials/EditView.php Message-ID: <20060330071717.4E9285900D5@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:17:13 2006 New Revision: 4734 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Potentials/EditView.php Modified: vtigercrm/trunk/modules/Potentials/EditView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:18:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:18:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4735 - /vtigercrm/trunk/modules/PriceBooks/EditView.php Message-ID: <20060330071852.036C75900D5@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:18:49 2006 New Revision: 4735 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/EditView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/EditView.php Thu Mar 30 00:18:49 2006 @@ -77,51 +77,13 @@ $pb_tables = Array('pricebook'); $validationData = getDBValidationData($pb_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; - -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - - +$data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:20:26 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:20:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4736 - /vtigercrm/trunk/modules/Products/EditView.php Message-ID: <20060330072026.312C054EB62@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:20:21 2006 New Revision: 4736 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Products/EditView.php Modified: vtigercrm/trunk/modules/Products/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Products/EditView.php (original) +++ vtigercrm/trunk/modules/Products/EditView.php Thu Mar 30 00:20:21 2006 @@ -127,43 +127,7 @@ $product_tables = Array('products','productcf','productcollaterals'); $validationData = getDBValidationData($product_tables); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - + $data = split_validationdataArray($validationData); if($errormessage==2) { $msg =$mod_strings['LBL_MAXIMUM_LIMIT_ERROR']; @@ -194,10 +158,9 @@ $smarty->assign("ERROR_MESSAGE",$errormessage); } -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:21:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:21:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4737 - /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Message-ID: <20060330072136.AD8505901A3@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 00:21:31 2006 New Revision: 4737 Log: Removed Junk Code Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php ============================================================================== --- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original) +++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Thu Mar 30 00:21:31 2006 @@ -43,7 +43,6 @@ $user_role_info=getRoleInformation($user_role); $user_role_parent=$user_role_info[$user_role][1]; $userGroupFocus=new GetUserGroups(); - //$userGroupFocus->userRole=$user_role; $userGroupFocus->getAllUserGroups($userid); $subRoles=getRoleSubordinates($user_role); $subRoleAndUsers=getSubordinateRoleAndUsers($user_role); @@ -336,7 +335,7 @@ } } } -//print_r(getCombinedUserGlobalPermissions($userid)); + function getUserModuleSharingObjects($module,$userid,$def_org_share,$current_user_roles,$parent_roles,$current_user_groups) { global $adb; @@ -696,11 +695,7 @@ } $mod_share_read_permission['ROLE']=$role_read_per; $mod_share_write_permission['ROLE']=$role_write_per; - //echo '
    //////////////////////////
    '; - //print_r($mod_share_read_permission); - //echo '
    //////////////////////////
    '; - //print_r($mod_share_write_permission); - + //Retreiving from the grp2role sharing $query="select datashare_grp2role.* from datashare_grp2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2role.to_roleid='".$current_user_roles."'"; $result=$adb->query($query); @@ -901,9 +896,7 @@ { foreach($shareEntArr as $key=>$shareEntId) { - //echo '

    '; - //print_r($shareEntId); - //echo '

    '; + if($shareType == 'ROLE') { if($share_permission == 1) @@ -1235,7 +1228,6 @@ global $adb; require('user_privileges/sharing_privileges_'.$userid.'.php'); $tabid=getTabid($module); - //echo $module.' '.$enttype.' '.$pertype.'
    '; if($enttype=='USER') { if($pertype =='read') @@ -1252,10 +1244,6 @@ $user_arr=Array(); if(sizeof($var_name_arr['ROLE']) > 0) { - //echo '
    '; - //print_r('
    ');
-			//print_r($var_name_arr['ROLE']);
-			//print_r('
    '); foreach($var_name_arr['ROLE'] as $roleid=>$roleusers) { @@ -1344,10 +1332,6 @@ $user_arr=Array(); if(sizeof($var_name_arr['ROLE']) > 0) { - //echo '
    '; - //print_r('
    ');
-			//print_r($var_name_arr['ROLE']);
-			//print_r('
    '); foreach($var_name_arr['ROLE'] as $roleid=>$roleusers) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:23:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:23:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4738 - /vtigercrm/trunk/modules/PurchaseOrder/EditView.php Message-ID: <20060330072305.F215E5901A3@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:23:01 2006 New Revision: 4738 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Thu Mar 30 00:23:01 2006 @@ -177,46 +177,11 @@ $po_tables = Array('purchaseorder','pobillads','poshipads'); $tabid = getTabid("PurchaseOrder"); $validationData = getDBValidationData($po_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; + $data = split_validationdataArray($validationData); - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:24:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:24:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4739 - /vtigercrm/trunk/modules/SalesOrder/EditView.php Message-ID: <20060330072442.452F15901A3@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:24:38 2006 New Revision: 4739 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/EditView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Mar 30 00:24:38 2006 @@ -273,46 +273,11 @@ $so_tables = Array('salesorder','sobillads','soshipads'); $tabid = getTabid("SalesOrder"); $validationData = getDBValidationData($so_tables,$tabid); - $fieldName = ''; - $fieldLabel = ''; - $fldDataType = ''; - - $rows = count($validationData); - foreach($validationData as $fldName => $fldLabel_array) - { - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } - } - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); + $data = split_validationdataArray($validationData); + + $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); + $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); + $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display("salesEditView.tpl"); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:27:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:27:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4740 - /vtigercrm/trunk/modules/Vendors/EditView.php Message-ID: <20060330072744.640BD5901B8@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:27:39 2006 New Revision: 4740 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Vendors/EditView.php Modified: vtigercrm/trunk/modules/Vendors/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/EditView.php (original) +++ vtigercrm/trunk/modules/Vendors/EditView.php Thu Mar 30 00:27:39 2006 @@ -79,51 +79,12 @@ $vendor_tables = Array('vendor'); $validationData = getDBValidationData($vendor_tables); -$fieldName = ''; -$fieldLabel = ''; -$fldDataType = ''; - -$rows = count($validationData); -foreach($validationData as $fldName => $fldLabel_array) -{ - if($fieldName == '') - { - $fieldName="'".$fldName."'"; - } - else - { - $fieldName .= ",'".$fldName ."'"; - } - foreach($fldLabel_array as $fldLabel => $datatype) - { - if($fieldLabel == '') - { - - $fieldLabel = "'".$fldLabel ."'"; - } - else - { - $fieldLabel .= ",'".$fldLabel ."'"; - } - if($fldDataType == '') - { - $fldDataType = "'".$datatype ."'"; - } - else - { - $fldDataType .= ",'".$datatype ."'"; - } - } -} - - +$data = split_validationdataArray($validationData); $category = getParentTab(); $smarty->assign("CATEGORY",$category); - -$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName); -$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType); -$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel); - +$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']); +$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']); +$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']); if($focus->mode == 'edit') $smarty->display('salesEditView.tpl'); else From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:35:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:35:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4741 - /vtigercrm/trunk/config.template.php Message-ID: <20060330073540.E065A5901D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:35:36 2006 New Revision: 4741 Log: page navigation parameter added Modified: vtigercrm/trunk/config.template.php Modified: vtigercrm/trunk/config.template.php ============================================================================== --- vtigercrm/trunk/config.template.php (original) +++ vtigercrm/trunk/config.template.php Thu Mar 30 00:35:36 2006 @@ -120,6 +120,9 @@ // list_max_entries_per_page default value = 20 $list_max_entries_per_page = '20'; +// limitpage_navigation default value = 5 +$limitpage_navigation = '5'; + // history_max_viewed default value = 5 $history_max_viewed = '5'; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 02:54:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 07:54:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4742 - /vtigercrm/trunk/modules/Activities/Activity.php Message-ID: <20060330075422.29B9F59018F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 00:54:17 2006 New Revision: 4742 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Activity.php Modified: vtigercrm/trunk/modules/Activities/Activity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 03:00:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 08:00:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4743 - /vtigercrm/trunk/modules/Activities/Event.php Message-ID: <20060330080017.6B8205901F0@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 01:00:13 2006 New Revision: 4743 Log: unwanted function removed Modified: vtigercrm/trunk/modules/Activities/Event.php Modified: vtigercrm/trunk/modules/Activities/Event.php ============================================================================== --- vtigercrm/trunk/modules/Activities/Event.php (original) +++ vtigercrm/trunk/modules/Activities/Event.php Thu Mar 30 01:00:13 2006 @@ -97,22 +97,6 @@ return $row["count(*)"]; } - function get_list_view_data(){ - global $action, $currentModule, $focus, $app_list_strings; - $today = date("Y-m-d", time()); - $task_fields =$this->get_list_view_array(); - if (isset($this->parent_type)) - $task_fields['PARENT_MODULE'] = $this->parent_type; - if ($this->status != "Completed" && $this->status != "Deferred" ) { - $task_fields['SET_COMPLETE'] = "X"; - } - - - if ($this->duedate < $toDAy) { - $task_fields['DATE_DUE'] = "".$task_fields['DATE_DUE'].""; - } - return $task_fields; - } - + } ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:25:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:25:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4744 - in /vtigercrm/trunk: data/CRMEntity.php data/SugarBean.php modules/Contacts/Contact.php modules/Notes/Note.php Message-ID: <20060330092551.95C62590275@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:25:42 2006 New Revision: 4744 Log: Unwanted functions removed Modified: vtigercrm/trunk/data/CRMEntity.php vtigercrm/trunk/data/SugarBean.php vtigercrm/trunk/modules/Contacts/Contact.php vtigercrm/trunk/modules/Notes/Note.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/data/SugarBean.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Contacts/Contact.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/Contact.php (original) +++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Mar 30 02:25:42 2006 @@ -461,14 +461,6 @@ } - function get_list_view_data(){ - $temp_array = $this->get_list_view_array(); - $temp_array["ENCODED_NAME"]=htmlspecialchars($this->first_name.' '.$this->last_name, ENT_QUOTES); - return $temp_array; - - } - - //Used By vtigerCRM Word Add-In function getColumnNames() { Modified: vtigercrm/trunk/modules/Notes/Note.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:30:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:30:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4745 - /vtigercrm/trunk/class_http/example.php Message-ID: <20060330093034.371CD590283@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:30:30 2006 New Revision: 4745 Log: file has been removed Removed: vtigercrm/trunk/class_http/example.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:31:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:31:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4746 - /vtigercrm/trunk/class_http/index.htm Message-ID: <20060330093107.EA96C590285@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:31:04 2006 New Revision: 4746 Log: file has been removed Removed: vtigercrm/trunk/class_http/index.htm From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:33:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:33:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4747 - /vtigercrm/trunk/cron/syntax.txt Message-ID: <20060330093308.3C7A4590285@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:33:03 2006 New Revision: 4747 Log: file has been removed Removed: vtigercrm/trunk/cron/syntax.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:34:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:34:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4748 - /vtigercrm/trunk/cron/examples.txt Message-ID: <20060330093446.6FA4F590288@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:34:42 2006 New Revision: 4748 Log: file has been removed Removed: vtigercrm/trunk/cron/examples.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 04:47:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 09:47:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4749 - /vtigercrm/trunk/data/CRMEntity.php Message-ID: <20060330094757.BFC91590258@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 02:47:53 2006 New Revision: 4749 Log: * Modified the functions insertIntoAttachment1 and insertIntoAttachment Modified: vtigercrm/trunk/data/CRMEntity.php Modified: vtigercrm/trunk/data/CRMEntity.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:09:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:09:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4750 - /vtigercrm/trunk/include/utils/utils.php Message-ID: <20060330100928.C3C745901C6@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:09:22 2006 New Revision: 4750 Log: made facility to take data from file instead of db from the second instance onwards Modified: vtigercrm/trunk/include/utils/utils.php Modified: vtigercrm/trunk/include/utils/utils.php ============================================================================== --- vtigercrm/trunk/include/utils/utils.php (original) +++ vtigercrm/trunk/include/utils/utils.php Thu Mar 30 03:09:22 2006 @@ -742,12 +742,22 @@ function getTabModuleName($tabid) { + if (file_exists('tabdata.php')) + { + global $log; + $log->info("the file exists"); + include('tabdata.php'); + $tabname = array_search($tabid,$tab_info_array); + } + else + { global $log; $log->info("tab id is ".$tabid); global $adb; $sql = "select name from tab where tabid='".$tabid."'"; $result = $adb->query($sql); $tabname= $adb->query_result($result,0,"name"); + } return $tabname; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:10:52 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:10:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4751 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060330101052.68BBB59026F@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:10:46 2006 New Revision: 4751 Log: method added to create tabdata in file also made facility to read data from file the second time onwards Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Mar 30 03:10:46 2006 @@ -255,12 +255,24 @@ function getTabid($module) { + + if (file_exists('tabdata.php')) + { + global $log; + $log->info("the file exists"); + include('tabdata.php'); + $tabid= $tab_info_array[$module]; + } + else + { + global $log; $log->info("module is ".$module); global $adb; $sql = "select tabid from tab where name='".$module."'"; $result = $adb->query($sql); $tabid= $adb->query_result($result,0,"tabid"); + } return $tabid; } @@ -1247,4 +1259,77 @@ } + + + + /** + * Function to write the tabid and name to a flat file tabdata.txt so that the data + * is obtained from the file instead of repeated queries + * returns null + */ + +function create_tab_data_file() +{ + global $log; + $log->info("creating tabdata file"); + global $adb; + $sql = "select * from tab"; + $result = $adb->query($sql); + $num_rows=$adb->num_rows($result); + $result_array=Array(); + for($i=0;$i<$num_rows;$i++) + { + $tabid=$adb->query_result($result,$i,'tabid'); + $tabname=$adb->query_result($result,$i,'name'); + $result_array[$tabname]=$tabid; + + } + echo '
    ****************
    '; + print_r($result_array); + echo '
    ****************
    '; + + $filename = 'tabdata.php'; + + +if (file_exists($filename)) { + + if (is_writable($filename)) + { + + if (!$handle = fopen($filename, 'w+')) { + echo "Cannot open file ($filename)"; + exit; + } + require_once('modules/Users/CreateUserPrivilegeFile.php'); + $newbuf=''; + $newbuf .=""; + fputs($handle, $newbuf); + fclose($handle); + + } + else + { + echo "The file $filename is not writable"; + } + + } + else + { + echo "The file $filename does not exist"; + return; + } +} + + + + + + + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 05:29:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 10:29:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4752 - /vtigercrm/trunk/include/database/PearDatabase.php Message-ID: <20060330102948.2D1925902D6@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 03:29:43 2006 New Revision: 4752 Log: commented out the getRowCount print Modified: vtigercrm/trunk/include/database/PearDatabase.php Modified: vtigercrm/trunk/include/database/PearDatabase.php ============================================================================== --- vtigercrm/trunk/include/database/PearDatabase.php (original) +++ vtigercrm/trunk/include/database/PearDatabase.php Thu Mar 30 03:29:43 2006 @@ -400,7 +400,7 @@ if(isset($result) && !empty($result)) $rows= $result->RecordCount(); //$this->println("ADODB getRowCount rows=".$rows); - $log->debug('getRowCount rows= '.$rows); + //$log->debug('getRowCount rows= '.$rows); return $rows; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 06:48:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:48:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4753 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060330114842.2394059030F@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:48:37 2006 New Revision: 4753 Log: check added for tabdata.php file Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 06:49:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:49:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4754 - /vtigercrm/trunk/tabdata.php Message-ID: <20060330114911.468D059032E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:49:07 2006 New Revision: 4754 Log: init version Added: vtigercrm/trunk/tabdata.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 06:49:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:49:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4755 - /vtigercrm/trunk/parent_tabdata.php Message-ID: <20060330114959.B790B59032E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:49:55 2006 New Revision: 4755 Log: init version Added: vtigercrm/trunk/parent_tabdata.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 06:51:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:51:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4756 - /vtigercrm/trunk/install/1checkSystem.php Message-ID: <20060330115105.CD348590372@vtiger.fosslabs.com> Author: richie Date: Thu Mar 30 04:51:01 2006 New Revision: 4756 Log: check added for parent_tabdata.php file Modified: vtigercrm/trunk/install/1checkSystem.php Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 06:58:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 11:58:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4757 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060330115854.F278C59037F@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 04:58:50 2006 New Revision: 4757 Log: primary key for contact id removed Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Mar 30 04:58:50 2006 @@ -820,7 +820,6 @@ - @@ -7336,26 +7335,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -7381,9 +7360,6 @@
    - - - @@ -7409,14 +7385,81 @@
    - - - - - - - - + + + + + + + + + + + + + + + + + + + Type=InnoDB + + expectedrevenue + + + +
    + + + + + + + + + + + + + + + + + + + Type=InnoDB + + actualcost + + + +
    + + + + + + + + + + + + + + + + + + + Type=InnoDB + + expectedresponse + + + +
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:07:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:07:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4758 - /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Message-ID: <20060330120727.8B85059038D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:07:23 2006 New Revision: 4758 Log: Removed 3 functions - getRenderRelated --Contacts, --Products, --Users as part of removal of duplicate & unused cod Ahmed Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:23:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:23:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4759 - /vtigercrm/trunk/include/utils/UserInfoUtil.php Message-ID: <20060330122357.ACDC95903A6@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:23:53 2006 New Revision: 4759 Log: getFieldModuleAccessArray Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php ============================================================================== --- vtigercrm/trunk/include/utils/UserInfoUtil.php (original) +++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Mar 30 05:23:53 2006 @@ -4006,4 +4006,32 @@ } } +/** Function to get the field access module array + * @returns The field Access module Array :: Type Array + * + */ +function getFieldModuleAccessArray() +{ + + $fldModArr=Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', + 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', + 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', + 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', + 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', + 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', + 'Notes'=>'LBL_NOTE_FIELD_ACCESS', + 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', + 'Activities'=>'LBL_TASK_FIELD_ACCESS', + 'Events'=>'LBL_EVENT_FIELD_ACCESS', + 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', + 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', + 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', + 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', + 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', + 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' + ); + + return $fldModArr; +} + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:25:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:25:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4760 - /vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php Message-ID: <20060330122553.4BA965903B3@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:25:49 2006 New Revision: 4760 Log: Removed junk code Modified: vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php Modified: vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:30:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:30:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4761 - in /vtigercrm/trunk/modules/Users: SaveProfile.php UpdateProfileChanges.php profilePrivileges.php Message-ID: <20060330123012.061695903B6@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:30:05 2006 New Revision: 4761 Log: Duplicate code removal done Modified: vtigercrm/trunk/modules/Users/SaveProfile.php vtigercrm/trunk/modules/Users/UpdateProfileChanges.php vtigercrm/trunk/modules/Users/profilePrivileges.php Modified: vtigercrm/trunk/modules/Users/SaveProfile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php ============================================================================== --- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original) +++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Thu Mar 30 05:30:05 2006 @@ -98,8 +98,6 @@ $permission_value = 1; } $update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid; - //echo $update_query; - //echo '
    '; $adb->query($update_query); if($tab_id ==9) { @@ -141,23 +139,7 @@ - $modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); + $modArr=getFieldModuleAccessArray(); foreach($modArr as $fld_module => $fld_label) { Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php ============================================================================== --- vtigercrm/trunk/modules/Users/profilePrivileges.php (original) +++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Mar 30 05:30:05 2006 @@ -197,7 +197,6 @@ $stand[]=$tab_view_per; $privileges_stand[]=$stand; } - $act_perr_arry = getTabsActionPermission($parentProfileId); } } @@ -366,23 +365,9 @@ $smarty->assign("UTILITIES_PRIV",$privilege_util); //Field privileges -$modArr= Array('Leads'=>'LBL_LEAD_FIELD_ACCESS', - 'Accounts'=>'LBL_ACCOUNT_FIELD_ACCESS', - 'Contacts'=>'LBL_CONTACT_FIELD_ACCESS', - 'Potentials'=>'LBL_OPPORTUNITY_FIELD_ACCESS', - 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS', - 'Products'=>'LBL_PRODUCT_FIELD_ACCESS', - 'Notes'=>'LBL_NOTE_FIELD_ACCESS', - 'Emails'=>'LBL_EMAIL_FIELD_ACCESS', - 'Activities'=>'LBL_TASK_FIELD_ACCESS', - 'Events'=>'LBL_EVENT_FIELD_ACCESS', - 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS', - 'PriceBooks'=>'LBL_PB_FIELD_ACCESS', - 'Quotes'=>'LBL_QUOTE_FIELD_ACCESS', - 'PurchaseOrder'=>'LBL_PO_FIELD_ACCESS', - 'SalesOrder'=>'LBL_SO_FIELD_ACCESS', - 'Invoice'=>'LBL_INVOICE_FIELD_ACCESS' - ); +$modArr=getFieldModuleAccessArray(); + + $no_of_mod=sizeof($modArr); for($i=0;$i<$no_of_mod; $i++) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:30:23 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:30:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4762 - /vtigercrm/trunk/modules/Accounts/ListView.php Message-ID: <20060330123023.559755903C1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:30:18 2006 New Revision: 4762 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Accounts/ListView.php Modified: vtigercrm/trunk/modules/Accounts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Accounts/ListView.php (original) +++ vtigercrm/trunk/modules/Accounts/ListView.php Thu Mar 30 05:30:18 2006 @@ -100,10 +100,6 @@ { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); } -//Modified by Raju -//$other_text=' '; - - //Raju if(isPermitted('Accounts',2,'') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; @@ -116,25 +112,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML='    '; -}else -{ -$cvHTML=''; -} - $customviewstrings=' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} global $theme; $theme_path="themes/".$theme."/"; @@ -142,7 +121,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS",$other_text); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Account'); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:34:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:34:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4763 - /vtigercrm/trunk/modules/Activities/ListView.php Message-ID: <20060330123409.CF7385903C1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:34:05 2006 New Revision: 4763 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Activities/ListView.php Modified: vtigercrm/trunk/modules/Activities/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Activities/ListView.php (original) +++ vtigercrm/trunk/modules/Activities/ListView.php Thu Mar 30 05:34:05 2006 @@ -34,13 +34,7 @@ $log = LoggerManager::getLogger('task_list'); -global $currentModule; - -global $image_path; -global $theme; -global $adb; -// focus_list is the means of passing data to a ListView. -global $focus_list; +global $currentModule,$image_path,$theme,$adb; if (isset($_REQUEST['current_user_only'])) $current_user_only = $_REQUEST['current_user_only']; @@ -81,33 +75,13 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -} -else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - $customviewstrings=' - - '.$cvHTML; -// - global $task_title; $title_display = $current_module_strings['LBL_LIST_FORM_TITLE']; if ($task_title) $title_display= $task_title; @@ -142,8 +116,8 @@ $list_result = $adb->query($list_query); //Constructing the list view - -$smarty->assign("CUSTOMVIEW", $customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:42:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:42:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4764 - /vtigercrm/trunk/modules/Campaigns/ListView.php Message-ID: <20060330124249.36E80590370@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:42:45 2006 New Revision: 4764 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Campaigns/ListView.php Modified: vtigercrm/trunk/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Campaigns/ListView.php (original) +++ vtigercrm/trunk/modules/Campaigns/ListView.php Thu Mar 30 05:42:45 2006 @@ -8,11 +8,6 @@ * All Rights Reserved. * ********************************************************************************/ - -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; - require_once('modules/Campaigns/Campaign.php'); require_once('include/database/PearDatabase.php'); require_once('Smarty_setup.php'); @@ -23,9 +18,7 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; -global $current_language; +global $app_strings,$mod_strings,$current_language; $current_module_strings = return_module_language($current_language, 'Campaigns'); $comboFieldNames = Array('campaigntype'=>'campaigntype_dom' @@ -82,7 +75,7 @@ //<<<<>>>> - +$smarty = new vtigerCRM_Smarty; if($viewid != 0) { $CActionDtls = $oCustomView->getCustomActionDetails($viewid); @@ -95,31 +88,12 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings =' - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} $customview= get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false); -$smarty = new vtigerCRM_Smarty; -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:45:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:45:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4765 - /vtigercrm/trunk/modules/Contacts/ListView.php Message-ID: <20060330124550.45A0C5903D2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:45:46 2006 New Revision: 4765 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Contacts/ListView.php Modified: vtigercrm/trunk/modules/Contacts/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Contacts/ListView.php (original) +++ vtigercrm/trunk/modules/Contacts/ListView.php Thu Mar 30 05:45:46 2006 @@ -121,28 +121,8 @@ } if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - - $customstrings =' - - '.$cvHTML; - -// + $smarty->assign("ALL", 'All'); +} //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -184,10 +164,11 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customstrings); $smarty->assign("BUTTONS",$other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); //Retreiving the no of rows $noofrows = $adb->num_rows($list_result); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:48:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:48:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4766 - /vtigercrm/trunk/modules/Emails/ListView.php Message-ID: <20060330124859.802E35903D1@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:48:55 2006 New Revision: 4766 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Emails/ListView.php Modified: vtigercrm/trunk/modules/Emails/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Emails/ListView.php (original) +++ vtigercrm/trunk/modules/Emails/ListView.php Thu Mar 30 05:48:55 2006 @@ -141,28 +141,8 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings = ' - - '.$cvHTML; - + $smarty->assign("ALL", 'All'); +} if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true') { @@ -209,8 +189,8 @@ $list_result = $adb->query($list_query); //Constructing the list view - -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:51:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:51:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4767 - /vtigercrm/trunk/modules/Faq/ListView.php Message-ID: <20060330125140.9C0B15903E2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:51:36 2006 New Revision: 4767 Log: junk code has been removed Modified: vtigercrm/trunk/modules/Faq/ListView.php Modified: vtigercrm/trunk/modules/Faq/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Faq/ListView.php (original) +++ vtigercrm/trunk/modules/Faq/ListView.php Thu Mar 30 05:51:36 2006 @@ -24,14 +24,10 @@ require_once('modules/CustomView/CustomView.php'); global $app_strings; -global $mod_strings; $current_module_strings = return_module_language($current_language, 'Faq'); -global $theme; global $currentModule; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; require_once($theme_path.'layout_utils.php'); if(isset($_REQUEST['category']) && $_REQUEST['category'] !='') @@ -70,8 +66,6 @@ if(isPermitted('Faq',2,'') == 'yes') $other_text ['del'] = $app_strings[LBL_MASS_DELETE]; -//$other_text =' -// '; //Retreive the list from Database $list_query = getListQuery("Faq"); @@ -97,11 +91,6 @@ //Constructing the list view -//$customstrings = ''; $smarty = new vtigerCRM_Smarty; $smarty->assign("MOD", $mod_strings); @@ -110,7 +99,6 @@ $smarty->assign("MODULE",$currentModule); $smarty->assign("BUTTONS",$other_text); $smarty->assign("CATEGORY",$category); -//$smarty->assign("CUSTOMVIEW",$customstrings); $smarty->assign("SINGLE_MOD",'Note'); //Retreiving the no of rows $noofrows = $adb->num_rows($list_result); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:54:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:54:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4768 - /vtigercrm/trunk/modules/HelpDesk/ListView.php Message-ID: <20060330125427.520465903E2@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:54:23 2006 New Revision: 4768 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php ============================================================================== --- vtigercrm/trunk/modules/HelpDesk/ListView.php (original) +++ vtigercrm/trunk/modules/HelpDesk/ListView.php Thu Mar 30 05:54:23 2006 @@ -32,9 +32,6 @@ $comboFieldArray = getComboArray($comboFieldNames); global $currentModule; -global $theme; -$theme_path="themes/".$theme."/"; -$image_path=$theme_path."images/"; $focus = new HelpDesk(); $smarty = new vtigerCRM_Smarty; @@ -93,29 +90,10 @@ if($viewnamedesc['viewname'] == 'All') { - $cvHTML = ''; -} -else -{ - $cvHTML = ''; -} - -$customstrings =' - - '.$cvHTML; - -$smarty->assign("CUSTOMVIEW",$customstrings); + $smarty->assign("ALL", 'All'); +} +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:56:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:56:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4769 - in /vtigercrm/trunk/modules/Users: EditFieldLevelAccess.php ListFieldPermissions.php ListFldProfiles.php UpdateFieldLevelAccess.php profilePrivileges.html Message-ID: <20060330125640.12716590403@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:56:33 2006 New Revision: 4769 Log: Unwanted files Removed: vtigercrm/trunk/modules/Users/EditFieldLevelAccess.php vtigercrm/trunk/modules/Users/ListFieldPermissions.php vtigercrm/trunk/modules/Users/ListFldProfiles.php vtigercrm/trunk/modules/Users/UpdateFieldLevelAccess.php vtigercrm/trunk/modules/Users/profilePrivileges.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:56:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:56:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4770 - /vtigercrm/trunk/modules/Invoice/ListView.php Message-ID: <20060330125642.58F5C5903E9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 05:56:36 2006 New Revision: 4770 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Invoice/ListView.php Modified: vtigercrm/trunk/modules/Invoice/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/ListView.php (original) +++ vtigercrm/trunk/modules/Invoice/ListView.php Thu Mar 30 05:56:36 2006 @@ -80,26 +80,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customstrings = ' - - '.$cvHTML; - - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -108,7 +90,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Invoice'); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS",$other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 07:58:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 12:58:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4771 - /vtigercrm/trunk/modules/Settings/index.html Message-ID: <20060330125842.29A565903E9@vtiger.fosslabs.com> Author: don Date: Thu Mar 30 05:58:37 2006 New Revision: 4771 Log: unwanted file Removed: vtigercrm/trunk/modules/Settings/index.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:00:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:00:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4772 - /vtigercrm/trunk/modules/Leads/ListView.php Message-ID: <20060330130047.A84CE590403@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:00:41 2006 New Revision: 4772 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Leads/ListView.php Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Mar 30 06:00:41 2006 @@ -153,25 +153,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - $customstrings = ' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} $custom= get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false); @@ -181,7 +164,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Lead'); $smarty->assign("BUTTONS",$other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:03:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4773 - /vtigercrm/trunk/index.php Message-ID: <20060330130306.A48C1590400@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:02 2006 New Revision: 4773 Log: Unwanted code removed Modified: vtigercrm/trunk/index.php Modified: vtigercrm/trunk/index.php ============================================================================== --- vtigercrm/trunk/index.php (original) +++ vtigercrm/trunk/index.php Thu Mar 30 06:03:02 2006 @@ -23,11 +23,10 @@ global $display; global $category; require_once('include/utils/utils.php'); -//$phpbb_root_path='./modules/MessageBoard/'; -if (substr(phpversion(), 0, 1) == "5") { +//if (substr(phpversion(), 0, 1) == "5") { // while using php5, in graphs we get illegal exception // ini_set("zend.ze1_compatibility_mode", "1"); -} +//} if (version_compare(phpversion(), '5.0') < 0) { eval(' @@ -38,10 +37,6 @@ } global $currentModule; -//if(!isset($category)) - // $category=getParentTabName(1); -//else - // $category=getParentTabName($currentModule); function fetchPermissionDataForTabList() { $permittedTabs = $_SESSION['tab_permission_set']; @@ -74,12 +69,7 @@ require_once('include/utils/UserInfoUtil.php'); $tabid = getTabid($module); - //echo 'tab id isss '.$tabid; - //echo '
    '; - $actionid = getActionid($action); - //echo 'action idd isss '.$actionid; - //echo '
    '; $profile_id = $_SESSION['authenticated_user_profileid']; $tab_per_Data = getAllTabsPermission($profile_id); @@ -87,92 +77,6 @@ $defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set']; $others_permission_id = $defSharingPermissionData[$tabid]; -/* - $i=0; - - - - $accessFlag = false; - if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $module != 'Notes' && $module != 'Products' && $module != 'Faq') - { - $rec_owner_id = getUserId($_REQUEST['record']); - } - if($tab_per_Data[$tabid] !=0) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - - if($permissionData[$tabid][$actionid] !=0) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - elseif(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $others_permission_id != '' && $module != 'Notes' && $module != 'Products' && $module != 'Faq' && $rec_owner_id != 0) - { - //$rec_owner_id = getUserId($_REQUEST['record']); - if($rec_owner_id != $current_user->id) - { - if($others_permission_id == 0) - { - if($action == 'EditView' || $action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - elseif($others_permission_id == 1) - { - if($action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - elseif($others_permission_id == 2) - { - - return; - } - elseif($others_permission_id == 3) - { - if($action == 'DetailView' || $action == 'EditView' || $action == 'Delete') - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } - else - { - return; - } - } - - - } - else - { - return; - } - } - else - { - return; - } - - if(!$accessFlag) - { - echo "You are not permitted to execute this operation"; - $display = "No"; - } -*/ } //we have to do this as there is no UI page for Delete. Hence, when the user clicks delete, it gets stuck halfway and the page looks ugly because the theme is not set @@ -216,47 +120,6 @@ $_GET = array_map("stripslashes_checkstrings", $_GET); } - -// Simulating the login process of forums here -//This needs to be called only once. This check has been put so that common.php does not get invoked time and again - if(isset($HTTP_POST_VARS['Login']) || isset($HTTP_GET_VARS['Login']) || isset($HTTP_POST_VARS['Logout']) || isset($HTTP_GET_VARS['Logout'])) - { - /* - if((isset($HTTP_POST_VARS['Login']) || isset($HTTP_GET_VARS['Login'])) && !$userdata['session_logged_in']) - { - //now log in to the Forums for the current user - /* - include($phpbb_root_path . 'common.php'); - - //$sql = "SELECT user_id, username, user_password, user_active, user_level - // FROM " . USERS_TABLE . " - // WHERE username = '" . $HTTP_POST_VARS['user_name'] . "'"; - if ( !($result = $db->sql_query($sql)) ) - { - message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql); - } - $password=$HTTP_POST_VARS['user_password']; - $username=$HTTP_POST_VARS['user_name']; - if( $row = $db->sql_fetchrow($result) ) - { - if( $row['user_level'] != ADMIN && $board_config['board_disable'] ) - { - } - else - { - if( md5($password) == $row['user_password'] && $row['user_active'] ) - { - $autologin = 0; - - $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); - } - } - } - - } - */ - } - // Allow for the session information to be passed via the URL for printing. if(isset($_REQUEST['PHPSESSID'])) @@ -539,10 +402,6 @@ $app_list_strings = return_app_list_strings_language($current_language); $mod_strings = return_module_language($current_language, $currentModule); -//TODO: Clint - this key map needs to be moved out of $app_list_strings since it never gets translated. -// best to just have an upgrade script that changes the parent_type column from Account to Accounts, etc. -$app_list_strings['record_type_module'] = array('Account' => 'Accounts','Potential' => 'Potentials', 'Case' => 'Cases'); - //If DetailView, set focus to record passed in if($action == "DetailView") { @@ -633,10 +492,6 @@ break; } - - //$focus->retrieve($_REQUEST['record']); - //$focus->track_view($current_user->id, $currentModule,$_REQUEST['record']); - if(isset($_REQUEST['record']) && $_REQUEST['record']!='') { // Only track a viewing if the record was retrieved. @@ -662,7 +517,6 @@ //skip headers for popups, deleting, saving, importing and other actions if(!$skipHeaders) { $log->debug("including headers"); - //include('themes/'.$theme.'/header.php'); if($use_current_login) { if(isset($_REQUEST['category']) && $_REQUEST['category'] !='') @@ -804,14 +658,12 @@ echo "
    '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LBL_VIEW'].' - '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -  '.$app_strings[LBL_VIEW].' -// -// '.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' - | - '.$app_strings['LNK_CV_EDIT'].' - | - '.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -
    \n"; echo "
    \n"; - //echo "Click Link to popup"; echo "© Click here for Copyright details.
    "; echo "
    \n"; echo "
    "; - // Under the Sugar Public License referenced above, you are required to leave in all copyright statements in both - // the code and end-user application. - //echo("
    © 2004 SugarCRM Inc. All Rights Reserved.
    "); + // Under the Sugar Public License referenced above, you are required to leave in all copyright statements + // in both the code and end-user application. if($calculate_response_time) { $endTime = microtime(); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:03:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4774 - /vtigercrm/trunk/modules/Import/ImportStep4.html Message-ID: <20060330130322.4E651590407@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:18 2006 New Revision: 4774 Log: * Removed the repeated hidden entry for return_id Modified: vtigercrm/trunk/modules/Import/ImportStep4.html Modified: vtigercrm/trunk/modules/Import/ImportStep4.html ============================================================================== --- vtigercrm/trunk/modules/Import/ImportStep4.html (original) +++ vtigercrm/trunk/modules/Import/ImportStep4.html Thu Mar 30 06:03:18 2006 @@ -40,7 +40,6 @@ - From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:03:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:03:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4775 - /vtigercrm/trunk/modules/Notes/ListView.php Message-ID: <20060330130356.E6BD4590400@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:03:52 2006 New Revision: 4775 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Notes/ListView.php Modified: vtigercrm/trunk/modules/Notes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Notes/ListView.php (original) +++ vtigercrm/trunk/modules/Notes/ListView.php Thu Mar 30 06:03:52 2006 @@ -30,21 +30,13 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $mod_strings; +global $app_strings,$mod_strings,$list_max_entries_per_page; -global $list_max_entries_per_page; $log = LoggerManager::getLogger('note_list'); -global $currentModule; +global $currentModule,$image_path,$theme; -global $image_path; -global $theme; $category = getParentTab(); - - -// focus_list is the means of passing data to a ListView. -global $focus_list; //<<<>>>>>> $oCustomView = new CustomView("Notes"); @@ -93,32 +85,13 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } -$customstrings = ' - - '.$cvHTML; - - -global $theme; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:05:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:05:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4776 - in /vtigercrm/trunk/modules: Emails/Save.php Notes/Save.php Message-ID: <20060330130532.C368C590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:05:26 2006 New Revision: 4776 Log: * Removed the fileupload code which was used to add the attachment contents in db when duplicate the record Modified: vtigercrm/trunk/modules/Emails/Save.php vtigercrm/trunk/modules/Notes/Save.php Modified: vtigercrm/trunk/modules/Emails/Save.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/Notes/Save.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:07:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:07:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4777 - /vtigercrm/trunk/modules/Potentials/ListView.php Message-ID: <20060330130709.A2B60590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:07:05 2006 New Revision: 4777 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Potentials/ListView.php Modified: vtigercrm/trunk/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Potentials/ListView.php (original) +++ vtigercrm/trunk/modules/Potentials/ListView.php Thu Mar 30 06:07:05 2006 @@ -16,7 +16,6 @@ require_once('Smarty_setup.php'); require_once("data/Tracker.php"); require_once('modules/Potentials/Opportunity.php'); -require_once('include/utils/utils.php'); require_once('themes/'.$theme.'/layout_utils.php'); require_once('include/logging.php'); require_once('include/ListView/ListView.php'); @@ -24,13 +23,11 @@ require_once('include/utils/utils.php'); require_once('modules/CustomView/CustomView.php'); -global $app_strings; -global $list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page; $log = LoggerManager::getLogger('potential_list'); -global $currentModule; -global $theme; +global $currentModule,$theme; // Get _dom arrays from Database $comboFieldNames = Array('leadsource'=>'leadsource_dom' @@ -114,27 +111,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - -$customstrings =' - - '.$cvHTML; - + $smarty->assign("ALL", 'All'); +} //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -176,7 +154,8 @@ $smarty->assign("MOD", $mod_strings); $smarty->assign("APP", $app_strings); $smarty->assign("IMAGE_PATH",$image_path); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Opportunity'); $smarty->assign("BUTTONS",$other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:08:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:08:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4778 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060330130818.AC565590418@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:08:14 2006 New Revision: 4778 Log: * Added functions to calculate Product Stock and send mail about the stock which was placed in Save.php file accross the modules SalesOrder, Quotes and Invoice Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Thu Mar 30 06:08:14 2006 @@ -49,4 +49,156 @@ } return $productBlock; } + +function updateStk($product_id,$qty,$mode,$ext_prod_arr,$module) +{ + global $adb; + global $current_user; + global $log; + + $log->debug("Inside updateStk function, module=".$module); + $log->debug("Product Id = $product_id & Qty = $qty"); + + $prod_name = getProductName($product_id); + $qtyinstk= getPrdQtyInStck($product_id); + $log->debug("Prd Qty in Stock ".$qtyinstk); + + if($mode == 'edit') + { + if(array_key_exists($product_id,$ext_prod_arr)) + { + $old_qty = $ext_prod_arr[$product_id]; + if($old_qty > $qty) + { + $diff_qty = $old_qty - $qty; + $upd_qty = $qtyinstk+$diff_qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + elseif($old_qty < $qty) + { + $diff_qty = $qty - $old_qty; + $upd_qty = $qtyinstk-$diff_qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + } + else + { + $upd_qty = $qtyinstk-$qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } + } + else + { + $upd_qty = $qtyinstk-$qty; + if($module == 'Invoice') + { + updateProductQty($product_id, $upd_qty); + sendPrdStckMail($product_id,$upd_qty,$prod_name,'','',$module); + } + else + sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module); + } +} + +function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty,$module) +{ + global $current_user; + global $adb; + global $log; + $reorderlevel = getPrdReOrderLevel($product_id); + $log->debug("Inside sendPrdStckMail function, module=".$module); + $log->debug("Prd reorder level ".$reorderlevel); + if($upd_qty < $reorderlevel) + { + //send mail to the handler + $handler=getPrdHandler($product_id); + $handler_name = getUserName($handler); + $to_address= getUserEmail($handler); + + //Get the email details from database; + if($module == 'SalesOrder') + { + $notification_table = 'SalesOrderNotification'; + $quan_name = '{SOQUANTITY}'; + } + if($module == 'Quotes') + { + $notification_table = 'QuoteNotification'; + $quan_name = '{QUOTEQUANTITY}'; + } + if($module == 'Invoice') + { + $notificationname = 'InvoiceNotification'; + } + $query = "select * from inventorynotification where notificationname='".$notification_table."'"; + $result = $adb->query($query); + + $subject = $adb->query_result($result,0,'notificationsubject'); + $body = $adb->query_result($result,0,'notificationbody'); + + $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); + $body = str_replace('{HANDLER}',$handler_name,$body); + $body = str_replace('{PRODUCTNAME}',$prod_name,$body); + if($module == 'Invoice') + { + $body = str_replace('{CURRENTSTOCK}',$upd_qty,$body); + $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); + } + else + { + $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); + $body = str_replace($quan_name,$qty,$body); + } + $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); + + $mail_status = send_mail($module,$to_address,$current_user->user_name,$current_user->email1,$subject,$body); + } +} + +function getPrdQtyInStck($product_id) +{ + global $adb; + $query1 = "select qtyinstock from products where productid=".$product_id; + $result=$adb->query($query1); + $qtyinstck= $adb->query_result($result,0,"qtyinstock"); + return $qtyinstck; +} + +function getPrdReOrderLevel($product_id) +{ + global $adb; + $query1 = "select reorderlevel from products where productid=".$product_id; + $result=$adb->query($query1); + $reorderlevel= $adb->query_result($result,0,"reorderlevel"); + return $reorderlevel; +} + +function getPrdHandler($product_id) +{ + global $adb; + $query1 = "select handler from products where productid=".$product_id; + $result=$adb->query($query1); + $handler= $adb->query_result($result,0,"handler"); + return $handler; +} + + ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:10:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:10:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4779 - /vtigercrm/trunk/modules/PriceBooks/ListView.php Message-ID: <20060330131044.5EE945903AE@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:10:37 2006 New Revision: 4779 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/ListView.php (original) +++ vtigercrm/trunk/modules/PriceBooks/ListView.php Thu Mar 30 06:10:37 2006 @@ -72,26 +72,8 @@ $other_text['del'] = $app_strings[LBL_MASS_DELETE]; if($viewnamedesc['viewname'] == 'All') { -$cvHTML=''; -}else -{ -$cvHTML=''; + $smarty->assign("ALL", 'All'); } - -$customviewstrings = ' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -160,7 +142,8 @@ $alphabetical = AlphabeticalSearch($currentModule,'index','bookname','true','basic',"","","","",$viewid); $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("RECORD_COUNTS", $record_string); $smarty->assign("SELECT_SCRIPT", $view_script); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:12:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:12:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4780 - in /vtigercrm/trunk/modules: Invoice/Save.php Quotes/Save.php SalesOrder/Save.php Message-ID: <20060330131221.F2DB65903BA@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:12:11 2006 New Revision: 4780 Log: * Removed the functions updateStk, sendMail about stock, getPrdQtyInStck, getPrdReOrderLevel and getPrdHandler because all these are common for SalesOrder, Quotes and Invoice and these function moved to InventoryUtils.php file Modified: vtigercrm/trunk/modules/Invoice/Save.php vtigercrm/trunk/modules/Quotes/Save.php vtigercrm/trunk/modules/SalesOrder/Save.php Modified: vtigercrm/trunk/modules/Invoice/Save.php ============================================================================== --- vtigercrm/trunk/modules/Invoice/Save.php (original) +++ vtigercrm/trunk/modules/Invoice/Save.php Thu Mar 30 06:12:11 2006 @@ -79,7 +79,7 @@ $query ="insert into invoiceproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); //Updating the Quantity in Stock in the Product Table - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice'); } } $return_id = $focus->id; @@ -92,114 +92,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $adb,$current_user; - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - //Updating the Product Quantity - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - updateProductQty($product_id, $upd_qty); - sendPrdStckMail($product_id,$upd_qty,$prod_name); - } - - //Check for reorder level and send mail - -} - -function sendPrdStckMail($product_id,$upd_qty,$prod_name) -{ - global $current_user,$adb; - $reorderlevel = getPrdReOrderLevel($product_id); - if($upd_qty < $reorderlevel) - { - //send mail to the handler - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $to_address= getUserEmail($handler); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='InvoiceNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$upd_qty,$body); - $body = str_replace('{REORDERLEVELVALUE}',$reorderlevel,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("Invoice",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } -} - - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; Modified: vtigercrm/trunk/modules/Quotes/Save.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/Save.php (original) +++ vtigercrm/trunk/modules/Quotes/Save.php Thu Mar 30 06:12:11 2006 @@ -33,26 +33,9 @@ $log->debug("Inside Quote Save"); $focus = new Quote(); -if(isset($_REQUEST['record'])) -{ - $focus->id = $_REQUEST['record']; - $log->debug("Quote ID ".$focus->id); -} -if(isset($_REQUEST['mode'])) -{ - $focus->mode = $_REQUEST['mode']; - $log->debug("Mode is ".$focus->mode); -} -foreach($focus->column_fields as $fieldname => $val) -{ - if(isset($_REQUEST[$fieldname])) - { - $value = $_REQUEST[$fieldname]; - $focus->column_fields[$fieldname] = $value; - } - -} +setObjectValuesFromRequest(&$focus); + $log->debug("The Field Value Array -----> ".$focus->column_fields); $focus->save("Quotes"); @@ -94,8 +77,8 @@ $query ="insert into quotesproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); //Checking the re-order level and sending mail - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); - } + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes'); + } } @@ -109,122 +92,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $log; - global $adb; - global $current_user; - $log->debug("Inside Quote updateStk function."); - $log->debug("Product Id is".$product_id); - $log->debug("Qty is".$qty); - - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - $log->debug("Prd Qty in Stock ".$qtyinstk); - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - } - -} - -function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty) -{ - global $current_user; - global $adb; - global $log; - $reorderlevel = getPrdReOrderLevel($product_id); - $log->debug("Prd reorder level ".$reorderlevel); - if($upd_qty < $reorderlevel) - { - - //send mail to the handler - $log->debug("Sending mail to handler "); - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $log->debug("Handler Name is ".$handler_name); - $to_address= getUserEmail($handler); - $log->debug("Handler Email is ".$to_address); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='QuoteNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); - $body = str_replace('{QUOTEQUANTITY}',$qty,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("Quotes",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } - -} - - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; Modified: vtigercrm/trunk/modules/SalesOrder/Save.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/Save.php (original) +++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Mar 30 06:12:11 2006 @@ -78,7 +78,7 @@ $query ="insert into soproductrel values(".$focus->id.",".$prod_id.",".$qty.",".$listprice.")"; $adb->query($query); - updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr); + updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder'); } } $return_id = $focus->id; @@ -91,111 +91,6 @@ $local_log->debug("Saved record with id of ".$return_id); -function updateStk($product_id,$qty,$mode,$ext_prod_arr) -{ - global $adb; - global $current_user; - $prod_name = getProductName($product_id); - $qtyinstk= getPrdQtyInStck($product_id); - - if($mode == 'edit') - { - if(array_key_exists($product_id,$ext_prod_arr)) - { - $old_qty = $ext_prod_arr[$product_id]; - if($old_qty > $qty) - { - - $diff_qty = $old_qty - $qty; - $upd_qty = $qtyinstk+$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - elseif($old_qty < $qty) - { - $diff_qty = $qty - $old_qty; - $upd_qty = $qtyinstk-$diff_qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - - } - } - else - { - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - - } - } - else - { - - $upd_qty = $qtyinstk-$qty; - sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty); - } - -} - - -function sendPrdStckMail($product_id,$upd_qty,$prod_name,$qtyinstk,$qty) -{ - global $current_user; - global $adb; - $reorderlevel = getPrdReOrderLevel($product_id); - if($upd_qty < $reorderlevel) - { - - //send mail to the handler - $handler=getPrdHandler($product_id); - $handler_name = getUserName($handler); - $to_address= getUserEmail($handler); - //Get the email details from database; - $query = "select * from inventorynotification where notificationname='SalesOrderNotification'"; - $result = $adb->query($query); - - $subject = $adb->query_result($result,0,'notificationsubject'); - $body = $adb->query_result($result,0,'notificationbody'); - - $subject = str_replace('{PRODUCTNAME}',$prod_name,$subject); - $body = str_replace('{HANDLER}',$handler_name,$body); - $body = str_replace('{PRODUCTNAME}',$prod_name,$body); - $body = str_replace('{CURRENTSTOCK}',$qtyinstk,$body); - $body = str_replace('{SOQUANTITY}',$qty,$body); - $body = str_replace('{CURRENTUSER}',$current_user->user_name,$body); - - $mail_status = send_mail("SalesOrder",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); - } -} - -function getPrdQtyInStck($product_id) -{ - global $adb; - $query1 = "select qtyinstock from products where productid=".$product_id; - $result=$adb->query($query1); - $qtyinstck= $adb->query_result($result,0,"qtyinstock"); - return $qtyinstck; - - -} -function getPrdReOrderLevel($product_id) -{ - global $adb; - $query1 = "select reorderlevel from products where productid=".$product_id; - $result=$adb->query($query1); - $reorderlevel= $adb->query_result($result,0,"reorderlevel"); - return $reorderlevel; - -} -function getPrdHandler($product_id) -{ - global $adb; - $query1 = "select handler from products where productid=".$product_id; - $result=$adb->query($query1); - $handler= $adb->query_result($result,0,"handler"); - return $handler; - -} - //code added for returning back to the current view after edit from list view if($_REQUEST['return_viewname'] == '') $return_viewname='0'; if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname']; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:13:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:13:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4781 - /vtigercrm/trunk/modules/Products/ListView.php Message-ID: <20060330131328.8627D5903BA@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:13:23 2006 New Revision: 4781 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Products/ListView.php Modified: vtigercrm/trunk/modules/Products/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Products/ListView.php (original) +++ vtigercrm/trunk/modules/Products/ListView.php Thu Mar 30 06:13:23 2006 @@ -89,29 +89,13 @@ //<<<<>>>> if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } if(isPermitted('Products',2,'') == 'yes') { $other_text['del'] = $app_strings[LBL_MASS_DELETE]; } - $customstrings =' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -188,7 +172,8 @@ $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:15:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:15:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4782 - /vtigercrm/trunk/modules/PurchaseOrder/ListView.php Message-ID: <20060330131556.0D3C9590424@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:15:52 2006 New Revision: 4782 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original) +++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Thu Mar 30 06:15:52 2006 @@ -83,26 +83,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $custom_view_strings=' - - '.$cvHTML; - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -111,7 +93,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'PurchaseOrder'); -$smarty->assign("CUSTOMVIEW",$custom_view_strings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $category = getParentTab(); $smarty->assign("CATEGORY",$category); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:18:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:18:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4783 - /vtigercrm/trunk/modules/Quotes/ListView.php Message-ID: <20060330131806.C24D2590423@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:18:02 2006 New Revision: 4783 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Quotes/ListView.php Modified: vtigercrm/trunk/modules/Quotes/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Quotes/ListView.php (original) +++ vtigercrm/trunk/modules/Quotes/ListView.php Thu Mar 30 06:18:02 2006 @@ -87,25 +87,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customstrings = ' - - '.$cvHTML; - $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -114,7 +97,8 @@ $smarty->assign("IMAGE_PATH",$image_path); $smarty->assign("MODULE",$currentModule); $smarty->assign("SINGLE_MOD",'Quote'); -$smarty->assign("CUSTOMVIEW",$customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); $category = getParentTab(); $smarty->assign("CATEGORY",$category); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:20:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:20:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4784 - /vtigercrm/trunk/modules/SalesOrder/ListView.php Message-ID: <20060330132038.58742590432@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:20:33 2006 New Revision: 4784 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/ListView.php (original) +++ vtigercrm/trunk/modules/SalesOrder/ListView.php Thu Mar 30 06:20:33 2006 @@ -111,24 +111,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; -} - $customstrings = ' - - '.$cvHTML; + $smarty->assign("ALL", 'All'); +} //<<<<<<<<>>>>>>>> if($viewid != "0") @@ -212,7 +196,8 @@ $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); -$smarty->assign("CUSTOMVIEW", $customstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $smarty->assign("BUTTONS", $other_text); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:22:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:22:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4785 - /vtigercrm/trunk/modules/Vendors/ListView.php Message-ID: <20060330132256.5450B590421@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:22:52 2006 New Revision: 4785 Log: changes made for duplicate code removal Modified: vtigercrm/trunk/modules/Vendors/ListView.php Modified: vtigercrm/trunk/modules/Vendors/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Vendors/ListView.php (original) +++ vtigercrm/trunk/modules/Vendors/ListView.php Thu Mar 30 06:22:52 2006 @@ -78,25 +78,8 @@ if($viewnamedesc['viewname'] == 'All') { -$cvHTML = ''; -}else -{ -$cvHTML = ''; + $smarty->assign("ALL", 'All'); } - $customviewstrings =' - - '.$cvHTML; //Retreive the list from Database //<<<<<<<<>>>>>>>> @@ -160,7 +143,8 @@ $listview_entries = getListViewEntries($focus,"Vendors",$list_result,$navigation_array,'','&return_module=Vendors&return_action=index','EditView','Delete',$oCustomView); $smarty->assign("LISTENTITY", $listview_entries); -$smarty->assign("CUSTOMVIEW",$customviewstrings); +$smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html); +$smarty->assign("VIEWID", $viewid); $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Vendors","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','vendorname','true','basic',"","","","",$viewid); $smarty->assign("ALPHABETICAL", $alphabetical); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 30 08:26:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 30 Mar 2006 13:26:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4786 - in /vtigercrm/trunk: include/js/Inventory.js modules/Invoice/Invoice.js modules/PurchaseOrder/PurchaseOrder.js modules/Quotes/Quote.js modules/SalesOrder/SalesOrder.js Message-ID: <20060330132650.2A7ED5865F4@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 30 06:26:31 2006 New Revision: 4786 Log: common fns moved to inventory.js Modified: vtigercrm/trunk/include/js/Inventory.js vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js vtigercrm/trunk/modules/Quotes/Quote.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Thu Mar 30 06:26:31 2006 @@ -44,3 +44,209 @@ } +function settotalnoofrows() { + document.EditView.totalProductCount.value = rowCnt; +} + +function productPickList(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=inventory_prod&curr_row="+rowId,"productWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200"); +} + +function priceBookPickList(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + window.open("index.php?module=PriceBooks&action=Popup&html=Popup_picker&form=EditView&popuptype=inventory_pb&fldname=txtListPrice"+rowId+"&productid="+getObj("hdnProductId"+rowId).value,"priceBookWin","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200"); +} + + +function getProdListBody() { + if (browser_ie) { + var prodListBody=getObj("productList").children[0].children[0] + } else if (browser_nn4 || browser_nn6) { + if (getObj("productList").childNodes.item(0).tagName=="TABLE") { + var prodListBody=getObj("productList").childNodes.item(0).childNodes.item(0) + } else { + var prodListBody=getObj("productList").childNodes.item(1).childNodes.item(1) + } + } + return prodListBody; +} + +function delRow(rowId) { + var rowId=parseInt(rowId.substr(rowId.indexOf("w")+1,rowId.length)) + //removing the corresponding row + var prodListBody=getProdListBody() + prodListBody.removeChild(getObj("row"+rowId)) + //assigning new innerHTML after deleting a row + var newInnerHTML=""+getObj("tablehead").innerHTML+"" + newInnerHTML+=""+getObj("tableheadline").innerHTML+""; + var rowArray=new Array(rowCnt-1); + if (browser_nn4 || browser_nn6) { + var product=new Array(rowCnt-1) + var qty=new Array(rowCnt-1) + var listPrice=new Array(rowCnt-1) + var productId=new Array(rowCnt-1) + var total=new Array(rowCnt-1) + var rowStatus=new Array(rowCnt-1) + } + for (var i=1,k=0;i<=rowId-1;i++,k++) { + if (i%2==0) var rowClass="evenListRow" + else var rowClass="oddListRow" + rowArray[k]=""+getObj("row"+i).innerHTML+"" + newInnerHTML+=rowArray[k] + if (browser_nn4 || browser_nn6) { + product[k]=getObj("txtProduct"+i).value + qty[k]=getObj("txtQty"+i).value + listPrice[k]=getObj("txtListPrice"+i).value + total[k]=getObj("hdnTotal"+i).value + productId[k]=getObj("hdnProductId"+i).value + rowStatus[k]=getObj("hdnRowStatus"+i).value + } + } + for (var i=rowId+1;i<=rowCnt;i++,k++) { + rowArray[k]=getObj("row"+i).innerHTML + var temp=rowArray[k] + temp=temp.replace("row"+i,"row"+(i-1)) + temp=temp.replace("txtProduct"+i,"txtProduct"+(i-1)) + temp=temp.replace("txtProduct"+i,"txtProduct"+(i-1)) + temp=temp.replace("qtyInStock"+i,"qtyInStock"+(i-1)) + temp=temp.replace("txtQty"+i,"txtQty"+(i-1)) + temp=temp.replace("txtQty"+i,"txtQty"+(i-1)) + temp=temp.replace("unitPrice"+i,"unitPrice"+(i-1)) + temp=temp.replace("txtListPrice"+i,"txtListPrice"+(i-1)) + temp=temp.replace("txtListPrice"+i,"txtListPrice"+(i-1)) + temp=temp.replace("total"+i,"total"+(i-1)) + temp=temp.replace("delRow"+i,"delRow"+(i-1)) + temp=temp.replace("hdnProductId"+i,"hdnProductId"+(i-1)) + temp=temp.replace("hdnProductId"+i,"hdnProductId"+(i-1)) + temp=temp.replace("hdnRowStatus"+i,"hdnRowStatus"+(i-1)) + temp=temp.replace("hdnRowStatus"+i,"hdnRowStatus"+(i-1)) + temp=temp.replace("hdnTotal"+i,"hdnTotal"+(i-1)) + temp=temp.replace("hdnTotal"+i,"hdnTotal"+(i-1)) + if ((i-1)%2==0) var rowClass="evenListRow" + else var rowClass="oddListRow" + rowArray[k]=""+temp+"" + newInnerHTML+=rowArray[k] + if (browser_nn4 || browser_nn6) { + product[k]=getObj("txtProduct"+i).value + qty[k]=getObj("txtQty"+i).value + listPrice[k]=getObj("txtListPrice"+i).value + total[k]=getObj("hdnTotal"+i).value + productId[k]=getObj("hdnProductId"+i).value + rowStatus[k]=getObj("hdnRowStatus"+i).value + } } + + var prodListBody=getProdListBody() + prodList.innerHTML=listTableStart+newInnerHTML+"
    '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' - '.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings['LNK_CV_CREATEVIEW'].' -| -'.$app_strings['LNK_CV_EDIT'].' -| -'.$app_strings['LNK_CV_DELETE'].''.$app_strings[LBL_VIEW].' -
    " + + rowCnt-- + + for (var i=1,k=0;i<=rowCnt;i++,k++) { + if (browser_nn4 || browser_nn6) { + getObj("txtProduct"+i).value=product[k] + getObj("txtQty"+i).value=qty[k] + getObj("txtListPrice"+i).value=listPrice[k] + getObj("hdnTotal"+i).value=total[k] + getObj("hdnProductId"+i).value=productId[k] + getObj("hdnRowStatus"+i).value=rowStatus[k] + } + } + + calcGrandTotal() +} + + +function calcTotal(currObj) { + var trObj=currObj.parentNode.parentNode + var rowId=parseInt(trObj.id.substr(trObj.id.indexOf("w")+1,trObj.id.length)) + var total=eval(getObj("txtQty"+rowId).value*getObj("txtListPrice"+rowId).value) + getObj("total"+rowId).innerHTML=getObj("hdnTotal"+rowId).value=roundValue(total.toString()) + calcGrandTotal() +} + +function calcGrandTotal() { + var subTotal=0,grandTotal=0; + for (var i=1;i<=rowCnt;i++) { + if (getObj("hdnTotal"+i).value=="") + getObj("hdnTotal"+i).value=0 + if (!isNaN(getObj("hdnTotal"+i).value)) + subTotal+=parseFloat(getObj("hdnTotal"+i).value) + } + + grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value) + + getObj("subTotal").innerHTML=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) + getObj("grandTotal").innerHTML=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) +} + +//Method changed as per advice by jon http://forums.vtiger.com/viewtopic.php?t=4162 +function roundValue(val) { + val = parseFloat(val); + val = Math.round(val*100)/100; + val = val.toString(); + + if (val.indexOf(".")<0) { + val+=".00" + } else { + var dec=val.substring(val.indexOf(".")+1,val.length) + if (dec.length>2) + val=val.substring(0,val.indexOf("."))+"."+dec.substring(0,2) + else if (dec.length==1) + val=val+"0" + } + + return val; +} + function validate() { + if(!formValidate()) + return false + if(!FindDuplicate()) + return false; + if(rowCnt == 0) + { + alert('No product is selected. Select atleast one Product'); + return false; + } + + + for (var i=1;i<=rowCnt;i++) { + if (!emptyCheck("txtProduct"+i,"Product","text")) return false + if (!emptyCheck("txtQty"+i,"Qty","text")) return false + if (!numValidate("txtQty"+i,"Qty","any")) return false + if (!numConstComp("txtQty"+i,"Qty","GE","1")) return false + if (!emptyCheck("txtListPrice"+i,"List Price","text")) return false + if (!numValidate("txtListPrice"+i,"List Price","any")) return false } + if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) + if (!numValidate("txtTax","Tax","any")) return false + if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) + if (!numValidate("txtAdjustment","Adjustment","any")) return false + + return true + } + +function FindDuplicate() +{ + var product_id = new Array(rowCnt-1); + var product_name = new Array(rowCnt-1); + product_id[1] = getObj("hdnProductId"+1).value; + product_name[1] = getObj("txtProduct"+1).value; + for (var i=1;i<=rowCnt;i++) + { + for(var j=i+1;j<=rowCnt;j++) + { + if(i == 1) + { + product_id[j] = getObj("hdnProductId"+j).value; + } + if(product_id[i] == product_id[j]) + { + alert("You have selected < "+getObj("txtProduct"+j).value+" > more than once in line items "+i+" & "+j+".\n Please select it once and change the Qty"); + return false; + } + } + } + return true; +} + Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Thu Mar 30 06:26:31 2006 @@ -10,218 +10,11 @@ document.write(" {* Begining of Slide Menu *} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:09:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:09:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4808 - /vtigercrm/trunk/include/ComboStrings.php Message-ID: <20060331080921.942CB595377@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:09:17 2006 New Revision: 4808 Log: array name has been changed Modified: vtigercrm/trunk/include/ComboStrings.php Modified: vtigercrm/trunk/include/ComboStrings.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:10:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:10:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4809 - /vtigercrm/trunk/schema/DatabaseSchema.xml Message-ID: <20060331081055.1B43B5958E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:10:50 2006 New Revision: 4809 Log: Campaign tables modified Modified: vtigercrm/trunk/schema/DatabaseSchema.xml Modified: vtigercrm/trunk/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/schema/DatabaseSchema.xml (original) +++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Mar 31 01:10:50 2006 @@ -1715,29 +1715,29 @@ - - - - + + + - + - + - + + Type=InnoDB - + campaignstatus @@ -7386,7 +7386,7 @@
    - +
    @@ -7411,8 +7411,8 @@
    - - +
    + @@ -7436,8 +7436,8 @@
    - - +
    + @@ -7732,14 +7732,6 @@
    - - - - - - - - ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:11:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:11:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4810 - /vtigercrm/trunk/include/PopulateComboValues.php Message-ID: <20060331081139.BA6C25958E2@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:11:34 2006 New Revision: 4810 Log: values in combotables array has been modified Modified: vtigercrm/trunk/include/PopulateComboValues.php Modified: vtigercrm/trunk/include/PopulateComboValues.php ============================================================================== --- vtigercrm/trunk/include/PopulateComboValues.php (original) +++ vtigercrm/trunk/include/PopulateComboValues.php Fri Mar 31 01:11:34 2006 @@ -40,7 +40,7 @@ { global $app_list_strings,$adb; global $combo_strings; - $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','cmpnexpectedrevenue','cmpnactualcost','cmpnexpectedresponse'); + $comboTables = Array('leadsource','accounttype','industry','leadstatus','rating','licencekeystatus','opportunity_type','salutationtype','sales_stage','ticketstatus','ticketpriorities','ticketseverities','ticketcategories','duration_minutes','eventstatus','taskstatus','taskpriority','manufacturer','productcategory','activitytype','currency','faqcategories','rsscategory','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedrevenue','actualcost','expectedresponse'); foreach ($comboTables as $comTab) { From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:12:55 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:12:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4811 - in /vtigercrm/trunk: include/RelatedListView.php include/utils/CommonUtils.php modules/uploads/downloadfile.php Message-ID: <20060331081256.2658C5958E0@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:12:48 2006 New Revision: 4811 Log: * Modified to make attachment work properly Modified: vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/uploads/downloadfile.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Mar 31 01:12:48 2006 @@ -1411,6 +1411,29 @@ } } +/** + * This function is used to get the File Storage Path in the server. + * @param int $attachmentid - file attachment id ie., crmid of the attachment + * @param string $filename - file name + * return string $filepath - filepath inwhere the file stored in the server will be return +*/ +function getFilePath($attachmentid,$filename) +{ + global $adb; + global $root_directory; + + $query = 'select crmid, setype, smownerid, users.user_name from crmentity inner join users on crmentity.smownerid=users.id where crmid='.$attachmentid; + $res = $adb->query($query); + + $user_name = $adb->query_result($res,0,'user_name'); + + if(is_file($root_directory.'storage/user_'.$user_name.'/attachments/'.$filename)) + $filepath = $root_directory.'storage/user_'.$user_name.'/attachments/'; + else + $filepath = $root_directory.'test/upload/'; + + return $filepath; +} Modified: vtigercrm/trunk/modules/uploads/downloadfile.php ============================================================================== --- vtigercrm/trunk/modules/uploads/downloadfile.php (original) +++ vtigercrm/trunk/modules/uploads/downloadfile.php Fri Mar 31 01:12:48 2006 @@ -15,34 +15,31 @@ global $adb; global $fileId; -$fileid = $_REQUEST['fileid']; - -//$dbQuery = "SELECT * from seattachmentsrel where crmid = '" .$fileid ."'"; -//$attachmentsid = $adb->query_result($adb->query($dbQuery),0,'attachmentsid'); -$attachmentsid = $fileid; +$attachmentsid = $_REQUEST['fileid']; +$entityid = $_REQUEST['entityid']; $returnmodule=$_REQUEST['return_module']; -if($_REQUEST['activity_type']=='Attachments') - $attachmentsid=$fileid; - -$dbQuery = "SELECT * FROM attachments "; -$dbQuery .= "WHERE attachmentsid = " .$attachmentsid ; +$dbQuery = "SELECT * FROM attachments WHERE attachmentsid = " .$attachmentsid ; $result = $adb->query($dbQuery) or die("Couldn't get file list"); if($adb->num_rows($result) == 1) { $fileType = @$adb->query_result($result, 0, "type"); $name = @$adb->query_result($result, 0, "name"); - $fileContent = @$adb->query_result($result, 0, "attachmentcontents"); - $size = @$adb->query_result($result, 0, "attachmentsize"); + + $filepath = getFilePath($attachmentsid,$name); + $filesize = filesize($filepath.$name); + $fileContent = fread(fopen($filepath.$name, "r"), $filesize); + + $org_filename = ltrim($name,$entityid.'_'); header("Content-type: $fileType"); - //header("Content-length: $size"); + header("Content-length: $filesize"); header("Cache-Control: private"); - header("Content-Disposition: attachment; filename=$name"); + header("Content-Disposition: attachment; filename=$org_filename"); header("Content-Description: PHP Generated Data"); - echo base64_decode($fileContent); + echo $fileContent; } else { From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:14:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:14:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4812 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060331081456.968F15958FC@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:14:51 2006 New Revision: 4812 Log: typeofdata has been modified Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Fri Mar 31 01:14:51 2006 @@ -355,8 +355,8 @@ $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'N~O',0,5,'BAS')"); - $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'N~O',0,5,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')"); + $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,3,76,1,'V~O',0,5,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','campaign',1,'15','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'V~O',1,null,'BAS')"); $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'V~O',1,null,'BAS')"); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:23:45 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:23:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4813 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060331082346.2E1165959D0@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:23:40 2006 New Revision: 4813 Log: release notes updated for alpha4 Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Mar 31 01:23:40 2006 @@ -18,6 +18,151 @@

    +

    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,

    +

    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. +
    2. Features
      3. +
    +

    1. Summary

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

    8

    +
    2 Product SizePlatform Independent - 8.3 MB
    +     Windows (EXE) - 28 MB
    + Linux (BIN) - 43 MB
    4 Database MigrationNot 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_ALPHA4
    +

    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 @@ -49,10 +194,10 @@ CRM 5.x category

    Table of Contents

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

    1. Summary

    +

    1. Summary

    @@ -97,7 +242,7 @@
    -

    2. Features

    +

    2. Features

    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:34:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:34:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4814 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060331083430.0FEE53DAA68@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:34:18 2006 New Revision: 4814 Log: * Modified to display the original file name in the detailview and removed the unwanted parameters passing to download link Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Fri Mar 31 01:34:18 2006 @@ -253,7 +253,10 @@ $attachquery = "select * from attachments where attachmentsid=".$attachmentid; $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name'); } - $custfldval = ''.$col_fields[$fieldname].''; + + //This is added to strip the crmid and _ from the file name and show the original filename + $org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_'); + $custfldval = ''.$org_filename.''; $label_fld[] =$mod_strings[$fieldlabel]; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:35:53 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:35:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4815 - /vtigercrm/trunk/include/RelatedListView.php Message-ID: <20060331083553.99A085959FB@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:35:34 2006 New Revision: 4815 Log: * Removed the unwanted parameter passing to file download link Modified: vtigercrm/trunk/include/RelatedListView.php Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 03:36:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 08:36:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4816 - /vtigercrm/trunk/install/populateSeedData.php Message-ID: <20060331083636.221285959FF@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 01:36:27 2006 New Revision: 4816 Log: id has been set for campaign Modified: vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 04:16:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:16:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4817 - /vtigercrm/trunk/modules/Users/Login.php Message-ID: <20060331091618.DF13F595A0D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:16:13 2006 New Revision: 4817 Log: version number changed Modified: vtigercrm/trunk/modules/Users/Login.php Modified: vtigercrm/trunk/modules/Users/Login.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 04:30:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:30:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4818 - in /vtigercrm/trunk/install: 0welcome.php 1checkSystem.php 2setConfig.php 3confirmConfig.php 4createConfigFile.php 5createTables.php populateSeedData.php Message-ID: <20060331093003.EC6144CB0F3@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:29:54 2006 New Revision: 4818 Log: vigercrm 5 alpha version changed Modified: vtigercrm/trunk/install/0welcome.php vtigercrm/trunk/install/1checkSystem.php vtigercrm/trunk/install/2setConfig.php vtigercrm/trunk/install/3confirmConfig.php vtigercrm/trunk/install/4createConfigFile.php vtigercrm/trunk/install/5createTables.php vtigercrm/trunk/install/populateSeedData.php Modified: vtigercrm/trunk/install/0welcome.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/1checkSystem.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/2setConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/3confirmConfig.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/4createConfigFile.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/install/populateSeedData.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 04:50:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 09:50:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4819 - in /vtigercrm/trunk: include/images/loginAlpha.gif themes/blue/images/loginAlpha.gif Message-ID: <20060331095011.119965857BE@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 02:50:02 2006 New Revision: 4819 Log: alpha version changed Modified: vtigercrm/trunk/include/images/loginAlpha.gif vtigercrm/trunk/themes/blue/images/loginAlpha.gif Modified: vtigercrm/trunk/include/images/loginAlpha.gif ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/themes/blue/images/loginAlpha.gif ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 05:23:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:23:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4820 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060331102311.B25BC587E47@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 03:23:07 2006 New Revision: 4820 Log: issue in create view has been fixed Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Fri Mar 31 03:23:07 2006 @@ -44,7 +44,7 @@ } else { - $productBlock[] = Array('Product Details' => 'Product Details'); + $productBlock[] = Array(Array()); } return $productBlock; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 05:35:33 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:35:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4821 - /vtigercrm/trunk/include/js/Inventory.js Message-ID: <20060331103533.79A1659623E@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 03:35:27 2006 New Revision: 4821 Log: javascript issue fixed to calc total Modified: vtigercrm/trunk/include/js/Inventory.js Modified: vtigercrm/trunk/include/js/Inventory.js ============================================================================== --- vtigercrm/trunk/include/js/Inventory.js (original) +++ vtigercrm/trunk/include/js/Inventory.js Fri Mar 31 03:35:27 2006 @@ -177,8 +177,8 @@ grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value) - getObj("subTotal").innerHTML=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) - getObj("grandTotal").innerHTML=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) + getObj("subTotal").value=getObj("hdnSubTotal").value=roundValue(subTotal.toString()) + getObj("grandTotal").value=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString()) } //Method changed as per advice by jon http://forums.vtiger.com/viewtopic.php?t=4162 From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 05:47:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 10:47:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4822 - in /vtigercrm/trunk/pkg/apache/conf: lin_httpd.conf win_httpd.conf Message-ID: <20060331104703.B61A2595ACA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 31 03:46:57 2006 New Revision: 4822 Log: apache parameters changed to enhance performance Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Modified: vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/lin_httpd.conf Fri Mar 31 03:46:57 2006 @@ -48,6 +48,13 @@ # Do NOT add a slash at the end of the directory path. # ServerRoot "VTIGERCRM/vtigerCRM5_beta/apache" +#refer http://www.faqs.org/docs/securing/chap29sec245.html +MinSpareServers 16 +MaxSpareServers 64 +StartServers 16 +MaxClients 512 +MaxRequestsPerChild 100000 + # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. @@ -119,7 +126,7 @@ MinSpareServers 10 MaxSpareServers 15 MaxClients 150 -MaxRequestsPerChild 0 +MaxRequestsPerChild 100000 # worker MPM Modified: vtigercrm/trunk/pkg/apache/conf/win_httpd.conf ============================================================================== --- vtigercrm/trunk/pkg/apache/conf/win_httpd.conf (original) +++ vtigercrm/trunk/pkg/apache/conf/win_httpd.conf Fri Mar 31 03:46:57 2006 @@ -55,6 +55,12 @@ # Do NOT add a slash at the end of the directory path. # ServerRoot "VTIGER_HOME/apache" +#reference http://www.faqs.org/docs/securing/chap29sec245.html +MinSpareServers 16 +MaxSpareServers 64 +StartServers 16 +MaxClients 512 +MaxRequestsPerChild 100000 # # ScoreBoardFile: File used to store internal server process information. @@ -88,7 +94,7 @@ # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. # referred http://www.ece.concordia.ca/~daniel/tips/apache_tuning.html -MaxKeepAliveRequests 100 +MaxKeepAliveRequests 300 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. @@ -104,7 +110,7 @@ # MaxRequestsPerChild: maximum number of requests a server process serves ThreadsPerChild 250 -MaxRequestsPerChild 0 +MaxRequestsPerChild 100000 # From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 06:09:02 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 11:09:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4823 - /vtigercrm/trunk/Release_Notes.html Message-ID: <20060331110902.7B4594E492D@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 04:08:57 2006 New Revision: 4823 Log: Removed source code label Modified: vtigercrm/trunk/Release_Notes.html Modified: vtigercrm/trunk/Release_Notes.html ============================================================================== --- vtigercrm/trunk/Release_Notes.html (original) +++ vtigercrm/trunk/Release_Notes.html Fri Mar 31 04:08:57 2006 @@ -72,25 +72,20 @@ Linux (BIN) - 43 MB - + - + - + - - - - -
    4 3 Database Migration Not Available
    5 4 vtiger CRM - PHP Documentation Download from vtigercrm project in SF.net. URL: Click Here
    6 5 Product Documentation Available at the Wiki
    8 Source Code LabelVTIGERCRM_5_ALPHA4
    From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 07:39:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 31 Mar 2006 12:39:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4824 - /vtigercrm/trunk/modules/Contacts/Save.php Message-ID: <20060331123922.A813D587E60@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 31 05:39:17 2006 New Revision: 4824 Log: * Removed the unwanted lines and moved the function makeRandoPassword to top of the file Modified: vtigercrm/trunk/modules/Contacts/Save.php Modified: vtigercrm/trunk/modules/Contacts/Save.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 15:15:01 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Fri, 31 Mar 2006 20:15:01 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2374=3A_I?= =?utf-8?q?nstallation_Pb_step_4?= Message-ID: <076.348c601258368d89f9a0a19c3d89c524@vtiger.fosslabs.com> #74: Installation Pb step 4 -----------------------+---------------------------------------------------- Reporter: oitsuki | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 5.0.0 Keywords: | -----------------------+---------------------------------------------------- Hello, When I want install vtiger 5 alpha 4, I have this pb : Creating Core tables: Table 'vtiger5.quotegrouprelation' doesn't existError: Tables partially created. Table creation failed. My configuration is : windows xp Version de Apache: Apache/1.3.33 (Win32) Version de PHP: 4.3.11 Version de MySQL: 4.1.18-nt-log - extension : mysql I changed the time out at 300, the memory at 16 I tried several time to install de pb but I have always the same pb. Is it to have a sql.txt inside de program for implement manual the database. I know it 's big ! But it's interesting, I think. Regards Oitsuki -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 20:34:22 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:34:22 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= Message-ID: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function -----------------------+---------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Keywords: postgres | -----------------------+---------------------------------------------------- Using the mysql DATE_FORMAT function doesn't work with other database types. All instances should be replaced with the adodb function SQLDate. Blocks #17. -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 20:34:38 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:34:38 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= In-Reply-To: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> References: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> Message-ID: <085.0df6e716c9cc09aa8e7c3f84aa7eb564@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: postgres ------------------------+--------------------------------------------------- -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 20:40:57 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:40:57 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2375=3A_D?= =?utf-8?q?ATE=5FFORMAT_isn=27t_a_portable_sql_function?= In-Reply-To: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> References: <076.c3d5c138f305e35b20cb94a8f7e04daf@vtiger.fosslabs.com> Message-ID: <085.cfc68f5a82d535dbffa25ad00b54d858@vtiger.fosslabs.com> #75: DATE_FORMAT isn't a portable sql function ------------------------+--------------------------------------------------- Reporter: allanbush | Owner: allanbush Type: defect | Status: closed Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc3 Resolution: fixed | Keywords: postgres ------------------------+--------------------------------------------------- Changes (by allanbush): * resolution: => fixed * status: new => closed Comment: (In [4825]) Modified getDBDateString function to be a wrapper for adodb's SQLDate function with a default formatting and used it where needed to replace DATE_FORMAT. Closes #75. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 20:40:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 01:40:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4825 - in /vtigercrm/branches/4.2_postgresql_integration: include/database/PearDatabase.php modules/Products/Product.php sendreminder.php Message-ID: <20060401014058.5952C58576A@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 18:40:54 2006 New Revision: 4825 Log: Modified getDBDateString function to be a wrapper for adodb's SQLDate function with a default formatting and used it where needed to replace DATE_FORMAT. Closes #75. Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php vtigercrm/branches/4.2_postgresql_integration/sendreminder.php Modified: vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/include/database/PearDatabase.php Fri Mar 31 18:40:54 2006 @@ -930,11 +930,11 @@ return $date; } -function getDBDateString($datecolname) +function getDBDateString($datecolname, $format='Y-m-d, H:i:s') { $this->checkConnection(); $db = &$this->database; - $datestr = $db->SQLDate("Y-m-d, H:i:s" ,$datecolname); + $datestr = $db->SQLDate($format ,$datecolname); return $datestr; } Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Products/Product.php Fri Mar 31 18:40:54 2006 @@ -215,27 +215,29 @@ function create_export_query(&$order_by, &$where) { + global $adb; + if($this->checkIfCustomTableExists()) { $query = $this->constructCustomQueryAddendum() . ", products.productid productid, - products.productname productname, - products.productcode productcode, - products.productcategory productcategory, - products.manufacturer manufacturer, - products.product_description product_description, - products.qty_per_unit qty_per_unit, - products.unit_price unit_price, - products.weight weight, - products.pack_size pack_size, - DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date, - DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date, - products.cost_factor cost_factor, - products.commissionrate commissionrate, - products.commissionmethod commissionmethod, - products.discontinued discontinued, + products.productname AS productname, + products.productcode AS productcode, + products.productcategory AS productcategory, + products.manufacturer AS manufacturer, + products.product_description AS product_description, + products.qty_per_unit AS qty_per_unit, + products.unit_price AS unit_price, + products.weight AS weight, + products.pack_size AS pack_size, " + .$adb->getDBDateString('products.start_date', 'Y-M-D')." AS start_date, " + .$adb->getDBDateString('products.expiry_date', 'Y-M-D')." AS expiry_date, + products.cost_factor AS cost_factor, + products.commissionrate AS commissionrate, + products.commissionmethod AS commissionmethod, + products.discontinued AS discontinued, products.sales_start_date AS sales_start_date, products.sales_end_date AS sales_end_date, products.usageunit AS usageunit, @@ -260,22 +262,22 @@ else { $query = "SELECT - products.productid productid, - products.productname productname, - products.productcode productcode, - products.productcategory productcategory, - products.manufacturer manufacturer, - products.product_description product_description, - products.qty_per_unit qty_per_unit, - products.unit_price unit_price, - products.weight weight, - products.pack_size pack_size, - DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date, - DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date, - products.cost_factor cost_factor, - products.commissionrate commissionrate, - products.commissionmethod commissionmethod, - products.discontinued discontinued, + products.productid AS productid, + products.productname AS productname, + products.productcode AS productcode, + products.productcategory AS productcategory, + products.manufacturer AS manufacturer, + products.product_description AS product_description, + products.qty_per_unit AS qty_per_unit, + products.unit_price AS unit_price, + products.weight AS weight, + products.pack_size AS pack_size, " + .$adb->getDBDateString('products.start_date', 'Y-M-D')." AS start_date, " + .$adb->getDBDateString('products.expiry_date', 'Y-M-D')." AS expiry_date, + products.cost_factor AS cost_factor, + products.commissionrate AS commissionrate, + products.commissionmethod AS commissionmethod, + products.discontinued AS discontinued, products.sales_start_date AS sales_start_date, products.sales_end_date AS sales_end_date, products.usageunit AS usageunit, Modified: vtigercrm/branches/4.2_postgresql_integration/sendreminder.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/sendreminder.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/sendreminder.php Fri Mar 31 18:40:54 2006 @@ -33,7 +33,7 @@ $vtlog->logthis(" invoked sendreminder ",'debug'); //modified query for recurring events -Jag - $query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where DATE_FORMAT(activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; +$query="select crmentity.crmid,activity.*,activity_reminder.reminder_time,activity_reminder.reminder_sent,activity_reminder.recurringid,recurringevents.recurringdate from activity inner join crmentity on crmentity.crmid=activity.activityid inner join activity_reminder on activity.activityid=activity_reminder.activity_id left outer join recurringevents on activity.activityid=recurringevents.activityid where ".$adb->getDBDateString('activity.date_start', 'Y-m-d, H:i:s')." >= '".date('Y-m-d')."' and crmentity.crmid != 0 and activity.eventstatus = 'Planned' and activity_reminder.reminder_sent = 0 group by activity.activityid,recurringevents.recurringid ;"; $result = $adb->query($query); From vtiger-tickets at vtiger.fosslabs.com Fri Mar 31 20:48:28 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Sat, 01 Apr 2006 01:48:28 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2317=3A_A?= =?utf-8?q?dd_postgresql_support_to_4=2E2_branch?= In-Reply-To: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> References: <076.17abc2dd12fb21108fb5762ef20878f3@vtiger.fosslabs.com> Message-ID: <085.1749b9ad82ed3a9c7f46d622c06a907c@vtiger.fosslabs.com> #17: Add postgresql support to 4.2 branch ------------------------+--------------------------------------------------- Reporter: jeffk | Owner: developer Type: defect | Status: new Priority: major | Milestone: 4.2.5 Component: vtigercrm | Version: Resolution: | Keywords: database postgresql ------------------------+--------------------------------------------------- Comment (by allanbush): (In [4826]) Added more select aliases for export links. Refs #17. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 20:48:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 01:48:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4826 - /vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Message-ID: <20060401014829.5AD2859668E@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 18:48:18 2006 New Revision: 4826 Log: Added more select aliases for export links. Refs #17. Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Opportunity.php Fri Mar 31 18:48:18 2006 @@ -312,8 +312,8 @@ if($this->checkIfCustomTableExists()) { $query = $this->constructCustomQueryAddendum() .", potential.*, - account.accountname account_name, - users.user_name assigned_user_name + account.accountname AS account_name, + users.user_name AS assigned_user_name FROM potential INNER JOIN crmentity ON crmentity.crmid=potential.potentialid @@ -325,8 +325,8 @@ { $query = "SELECT potential.*, - account.accountname account_name, - users.user_name assigned_user_name + account.accountname AS account_name, + users.user_name AS assigned_user_name FROM potential inner join crmentity on crmentity.crmid=potential.potentialid LEFT JOIN users ON crmentity.smcreatorid=users.id LEFT JOIN account on potential.accountid=account.accountid LEFT JOIN potentialscf on potentialscf.potentialid=potential.potentialid where crmentity.deleted=0 "; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 31 21:24:51 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 01 Apr 2006 02:24:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r4827 - /vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Message-ID: <20060401022451.979AF5966BA@vtiger.fosslabs.com> Author: allanbush Date: Fri Mar 31 19:24:49 2006 New Revision: 4827 Log: Moved adb call to after it's declaration. Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php ============================================================================== --- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original) +++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Fri Mar 31 19:24:49 2006 @@ -176,12 +176,12 @@ function insertIntoAttachment($id,$module) { - $date_var = $adb->database->DBTimeStamp(date('YmdHis')); global $current_user; global $adb; global $root_directory; global $upload_badext; + $date_var = $adb->database->DBTimeStamp(date('YmdHis')); $ownerid = $this->column_fields['assigned_user_id']; $adb->println("insertattach ownerid=".$ownerid." mod=".$module); $adb->println($this->column_fields);