[Vtigercrm-commits] [vtiger-commits] r10856 - in /vtigercrm/branches/5.0.3: include/language/ modules/CustomView/ modules/Invoice/ modules/Invoice/language/ modules/PurchaseOrder/ modules/PurchaseOrder/language/ modules/Quotes/ modules/Quotes/language/ modules/SalesOrder/ modules/SalesOrder/language/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 11 04:55:47 EDT 2007
Author: saraj
Date: Fri May 11 02:54:57 2007
New Revision: 10856
Log:
Id changed to No. in inventory
Modified:
vtigercrm/branches/5.0.3/include/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php
vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php
vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
vtigercrm/branches/5.0.3/modules/SalesOrder/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri May 11 02:54:57 2007
@@ -467,10 +467,10 @@
'LBL_PORDER_BUTTON' => 'New Purchase Order',
'LBL_PORDER_BUTTON_KEY' => 'O',
'Tracking Number' => 'Tracking Number',
-'Order Id' => 'Order Id',
+'Order No' => 'Order No',
'Quote Name' => 'Quote Name',
-'Invoice Id' => 'Invoice Id',
-'Quote Id' => 'Quote Id',
+'Invoice No' => 'Invoice No',
+'Quote Id' => 'Quote No',
'Sales Order' => 'Sales Order',
'COMBO_QUOTES' => 'Quotes',
'End Date' => 'End Date',
@@ -875,7 +875,7 @@
'FAQ Id'=>'FAQ Id',
'Lead Status'=>'Lead Status',
'Lead Source'=>'Lead Source',
-'Quote ID'=>'Quote Id',
+'Quote No'=>'Quote No',
'Yahoo Id'=>'Yahoo Id',
);
Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.php Fri May 11 02:54:57 2007
@@ -182,7 +182,7 @@
function getColumnsListbyBlock($module,$block)
{
- global $adb;
+ global $adb,$mod_strings,$app_strings;
$tabid = getTabid($module);
if($tabid == 9)
$tabid ="9,16";
@@ -231,6 +231,15 @@
{
$module_columnlist['vtiger_activity:activitytype:activitytype:Calendar_Activity_Type:C'] = 'Activity Type';
}
+
+ if($module == 'SalesOrder' && $block == 63)
+ $module_columnlist['vtiger_crmentity:crmid::SalesOrder_Order_No:I'] = $app_strings['Order No'];
+
+ if($module == 'PurchaseOrder' && $block == 57)
+ $module_columnlist['vtiger_crmentity:crmid::PurchaseOrder_Order_No:I'] = $app_strings['Order No'];
+
+ if($module == 'Quotes' && $block == 51)
+ $module_columnlist['vtiger_crmentity:crmid::Quotes_Quote_No:I'] = $app_strings['Quote No'];
for($i=0; $i<$noofrows; $i++)
{
Modified: vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php (original)
+++ vtigercrm/branches/5.0.3/modules/CustomView/PopulateCustomView.php Fri May 11 02:54:57 2007
@@ -263,7 +263,7 @@
'vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
- Array('vtiger_crmentity:crmid::Quotes_Quote_ID:I',
+ Array('vtiger_crmentity:crmid::Quotes_Quote_No:I',
'vtiger_quotes:subject:subject:Quotes_Subject:V',
'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
@@ -293,10 +293,10 @@
'vtiger_crmentity:smownerid:assigned_user_id:Calendar_Assigned_To:V'),
Array('vtiger_activity:subject:subject:Emails_Subject:V',
- 'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V',
- 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'),
+ 'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V',
+ 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'),
- Array('vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V',
+ Array('vtiger_invoice:invoice_no:invoice_no:Invoice_Invoice_No:V',
'vtiger_invoice:subject:subject:Invoice_Subject:V',
'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I',
'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V',
@@ -319,13 +319,13 @@
'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V',
'vtiger_products:unit_price:unit_price:Products_Unit_Price:V'),
- Array('vtiger_crmentity:crmid::PurchaseOrder_Order_Id:I',
+ Array('vtiger_crmentity:crmid::PurchaseOrder_Order_No:I',
'vtiger_purchaseorder:subject:subject:PurchaseOrder_Subject:V',
'vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I',
'vtiger_purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V',
'vtiger_crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V'),
- Array('vtiger_crmentity:crmid::SalesOrder_Order_Id:I',
+ Array('vtiger_crmentity:crmid::SalesOrder_Order_No:I',
'vtiger_salesorder:subject:subject:SalesOrder_Subject:V',
'vtiger_account:accountname:accountname:SalesOrder_Account_Name:V',
'vtiger_quotes:quoteid:quote_id:SalesOrder_Quote_Name:I',
@@ -386,7 +386,7 @@
'vtiger_purchaseorder:carrier:carrier:PurchaseOrder_Carrier:V',
'vtiger_poshipads:ship_street:ship_street:PurchaseOrder_Shipping_Address:V'),
- Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V',
+ Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_Invoice_No:V',
'vtiger_invoice:subject:subject:Invoice_Subject:V',
'vtiger_account:accountname:accountname:Invoice_Account_Name:V',
'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I',
@@ -394,7 +394,7 @@
'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V',
'vtiger_crmentity:createdtime:createdtime:Invoice_Created_Time:T'),
- Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_invoice_no:V',
+ Array( 'vtiger_invoice:invoice_no:invoice_no:Invoice_Invoice_No:V',
'vtiger_invoice:subject:subject:Invoice_Subject:V',
'vtiger_account:accountname:accountname:Invoice_Account_Name:V',
'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I',
Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Fri May 11 02:54:57 2007
@@ -41,14 +41,14 @@
var $column_fields = Array();
- var $sortby_fields = Array('subject','crmid','invoicestatus','smownerid','accountname');
+ var $sortby_fields = Array('subject','invoice_no','invoicestatus','smownerid','accountname');
// This is used to retrieve related vtiger_fields from form posts.
var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
// This is the list of vtiger_fields that are in the lists.
var $list_fields = Array(
- 'Invoice Id'=>Array('crmentity'=>'crmid'),
+ 'Invoice No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('invoice'=>'subject'),
'Sales Order'=>Array('invoice'=>'salesorderid'),
'Status'=>Array('invoice'=>'invoicestatus'),
@@ -57,7 +57,7 @@
);
var $list_fields_name = Array(
- 'Invoice Id'=>'',
+ 'Invoice No'=>'',
'Subject'=>'subject',
'Sales Order'=>'salesorder_id',
'Status'=>'invoicestatus',
@@ -67,12 +67,12 @@
var $list_link_field= 'subject';
var $search_fields = Array(
- 'Invoice Id'=>Array('crmentity'=>'crmid'),
+ 'Invoice No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('purchaseorder'=>'subject'),
);
var $search_fields_name = Array(
- 'Invoice Id'=>'',
+ 'Invoice No'=>'',
'Subject'=>'subject',
);
@@ -114,7 +114,7 @@
if($_REQUEST['action'] != 'InvoiceAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW')
{
//Based on the total Number of rows we will save the product relationship with this entity
- saveInventoryProductDetails($this, 'Invoice');
+ saveInventoryProductDetails(&$this, 'Invoice');
}
//Added For Custom Invoice Number
//Here we Incrementing the new InvoiceNumber
@@ -276,7 +276,7 @@
$result=$adb->query($query);
$noofrows = $adb->num_rows($result);
- $header[] = $app_strings['Invoice Id'];
+ $header[] = $app_strings['Invoice No'];
$header[] = $app_strings['LBL_ACCOUNT_NAME'];
$header[] = $app_strings['LBL_AMOUNT'];
$header[] = $app_strings['LBL_INVOICE_STATUS'];
Modified: vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/language/en_us.lang.php Fri May 11 02:54:57 2007
@@ -183,7 +183,7 @@
'Credit Invoice'=>'Credit Invoice',
'Paid'=>'Paid',
//Added to Custom Invoice Number
-'invoice_no'=>'Invoice No',
+'Invoice No'=>'Invoice No',
);
?>
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php Fri May 11 02:54:57 2007
@@ -53,7 +53,7 @@
// This is the list of vtiger_fields that are in the lists.
var $list_fields = Array(
- 'Order Id'=>Array('crmentity'=>'crmid'),
+ 'Order No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('purchaseorder'=>'subject'),
'Vendor Name'=>Array('purchaseorder'=>'vendorid'),
'Tracking Number'=>Array('purchaseorder'=> 'tracking_no'),
@@ -61,7 +61,7 @@
);
var $list_fields_name = Array(
- 'Order Id'=>'',
+ 'Order No'=>'',
'Subject'=>'subject',
'Vendor Name'=>'vendor_id',
'Tracking Number'=>'tracking_no',
@@ -70,12 +70,12 @@
var $list_link_field= 'subject';
var $search_fields = Array(
- 'Order Id'=>Array('crmentity'=>'crmid'),
+ 'Order No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('purchaseorder'=>'subject'),
);
var $search_fields_name = Array(
- 'Order Id'=>'',
+ 'Order No'=>'',
'Subject'=>'subject',
);
@@ -104,7 +104,7 @@
if($_REQUEST['action'] != 'PurchaseOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW')
{
//Based on the total Number of rows we will save the product relationship with this entity
- saveInventoryProductDetails($this, 'PurchaseOrder', $this->update_prod_stock);
+ saveInventoryProductDetails(&$this, 'PurchaseOrder', $this->update_prod_stock);
}
}
@@ -247,7 +247,7 @@
$result=$adb->query($query);
$noofrows = $adb->num_rows($result);
- $header[] = $app_strings['Order Id'];
+ $header[] = $app_strings['Order No'];
$header[] = $app_strings['Vendor Name'];
$header[] = $app_strings['LBL_AMOUNT'];
$header[] = $app_strings['LBL_PO_STATUS'];
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/language/en_us.lang.php Fri May 11 02:54:57 2007
@@ -167,7 +167,7 @@
'LBL_PO_SEARCH_TITLE'=>'Purchase Order Search',
'LBL_SO_SEARCH_TITLE'=>'Sales Order Search',
'LBL_QUOTE_NAME_TITLE'=>'Quote Name',
-'Order Id'=>'Order Id',
+'Order No'=>'Order No',
'Status'=>'Status',
'PurchaseOrder'=>'Purchase Order',
'LBL_MY_TOP_PO'=>'My Top Open Purchase Orders',
Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Fri May 11 02:54:57 2007
@@ -58,7 +58,7 @@
// This is the list of vtiger_fields that are in the lists.
var $list_fields = Array(
- 'Quote Id'=>Array('crmentity'=>'crmid'),
+ 'Quote No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('quotes'=>'subject'),
'Quote Stage'=>Array('quotes'=>'quotestage'),
'Potential Name'=>Array('quotes'=>'potentialid'),
@@ -68,7 +68,7 @@
);
var $list_fields_name = Array(
- 'Quote Id'=>'',
+ 'Quote No'=>'',
'Subject'=>'subject',
'Quote Stage'=>'quotestage',
'Potential Name'=>'potential_id',
@@ -79,14 +79,14 @@
var $list_link_field= 'subject';
var $search_fields = Array(
- 'Quote Id'=>Array('crmentity'=>'crmid'),
+ 'Quote No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('quotes'=>'subject'),
'Account Name'=>Array('quotes'=>'accountid'),
'Quote Stage'=>Array('quotes'=>'quotestage'),
);
var $search_fields_name = Array(
- 'Quote Id'=>'',
+ 'Quote No'=>'',
'Subject'=>'subject',
'Account Name'=>'account_id',
'Quote Stage'=>'quotestage',
@@ -294,7 +294,7 @@
$result=$adb->query($query);
$noofrows = $adb->num_rows($result);
- $header[] = $app_strings['Quote Id'];
+ $header[] = $app_strings['Quote No'];
$header[] = $app_strings['LBL_ACCOUNT_NAME'];
$header[] = $app_strings['LBL_AMOUNT'];
$header[] = $app_strings['Quote Stage'];
Modified: vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/language/en_us.lang.php Fri May 11 02:54:57 2007
@@ -155,7 +155,7 @@
'LBL_ACCOUNT_NAME'=>'Account Name:',
'LBL_QUOTE_STAGE'=>'Quote Stage:',
'LBL_MY_TOP_QUOTE'=>'My Top Open Quotes',
-'Quote ID'=>'Quote Id',
+//'Quote ID'=>'Quote Id',
'Quote'=>'Quote',
//Added for existing Picklist Entries
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Fri May 11 02:54:57 2007
@@ -57,7 +57,7 @@
// This is the list of vtiger_fields that are in the lists.
var $list_fields = Array(
- 'Order Id'=>Array('crmentity'=>'crmid'),
+ 'Order No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('salesorder'=>'subject'),
'Account Name'=>Array('account'=>'accountid'),
'Quote Name'=>Array('quotes'=>'quoteid'),
@@ -66,7 +66,7 @@
);
var $list_fields_name = Array(
- 'Order Id'=>'',
+ 'Order No'=>'',
'Subject'=>'subject',
'Account Name'=>'account_id',
'Quote Name'=>'quote_id',
@@ -76,14 +76,14 @@
var $list_link_field= 'subject';
var $search_fields = Array(
- 'Order Id'=>Array('crmentity'=>'crmid'),
+ 'Order No'=>Array('crmentity'=>'crmid'),
'Subject'=>Array('salesorder'=>'subject'),
'Account Name'=>Array('account'=>'accountid'),
'Quote Name'=>Array('salesorder'=>'quoteid')
);
var $search_fields_name = Array(
- 'Order Id'=>'',
+ 'Order No'=>'',
'Subject'=>'subject',
'Account Name'=>'account_id',
'Quote Name'=>'quote_id'
@@ -123,7 +123,7 @@
if($_REQUEST['action'] != 'SalesOrderAjax' && $_REQUEST['ajxaction'] != 'DETAILVIEW')
{
//Based on the total Number of rows we will save the product relationship with this entity
- saveInventoryProductDetails($this, 'SalesOrder');
+ saveInventoryProductDetails(&$this, 'SalesOrder');
}
}
@@ -297,7 +297,7 @@
$result=$adb->query($query);
$noofrows = $adb->num_rows($result);
- $header[] = $app_strings['Order Id'];
+ $header[] = $app_strings['Order No'];
$header[] = $app_strings['LBL_ACCOUNT_NAME'];
$header[] = $app_strings['LBL_AMOUNT'];
$header[] = $app_strings['LBL_SO_STATUS'];
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/language/en_us.lang.php Fri May 11 02:54:57 2007
@@ -166,7 +166,7 @@
'LBL_TRACKING_NO_TITLE'=>'Tracking No:',
'LBL_SO_SEARCH_TITLE'=>'Sales Order Search',
'LBL_QUOTE_NAME_TITLE'=>'Quote Name',
-'Order Id'=>'Order Id',
+'Order No'=>'Order No',
'LBL_MY_TOP_SO'=>'My Top Open Sales Orders',
'Status'=>'Status',
'SalesOrder'=>'Sales Order',
Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Fri May 11 02:54:57 2007
@@ -867,7 +867,7 @@
//Block74
$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
//Added for Custom invoice Number
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','invoice_no',1,0,0,100,3,69,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoice_no','vtiger_invoice',1,'1','invoice_no','Invoice No',1,0,0,100,3,69,1,'V~M',1,null,'BAS')");
//Invoice Details -- END
//users Details Starts Block 79,80,81
More information about the vtigercrm-commits
mailing list