Changed actual_cost to purchase_cost field in en_US-* init files.

diff --git a/fixed_assets/includes/depreciation.inc b/fixed_assets/includes/depreciation.inc
index cc5390795c3f56b36b3d4f0ead0162bd496a8010..3bc72126cebb53c1fa10003720d5eebb388f3f57 100644 (file)
--- a/fixed_assets/includes/depreciation.inc
+++ b/fixed_assets/includes/depreciation.inc
@@ -69,7 +69,7 @@ function compute_gl_rows_for_depreciation($item, $no_months, $period) {
                        $value = $line_value;
                break;
 
-    case 'S':  // actual_cost stores start cost of item
+    case 'S':  // purchase_cost stores start cost of item
                $value = $item['purchase_cost']*$item['depreciation_rate']/100/12;
                break;
 

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 921f6da79085a16f5e8d6e326d0d178db3c70842..af4114e23df7605be165bbc95937f18e0aa817d6 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -1875,7 +1875,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` (
   `assembly_account` varchar(15) NOT NULL DEFAULT '',
   `dimension_id` int(11) DEFAULT NULL,
   `dimension2_id` int(11) DEFAULT NULL,
-  `actual_cost` double NOT NULL DEFAULT '0',
+  `purchase_cost` double NOT NULL DEFAULT '0',
   `last_cost` double NOT NULL DEFAULT '0',
   `material_cost` double NOT NULL DEFAULT '0',
   `labour_cost` double NOT NULL DEFAULT '0',

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 2486d26183aa23986b0b7e9d71943fd963d937c7..15cf8ed63d52cff92399c2645a412a0a22ca7bdf 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1633,7 +1633,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` (
   `assembly_account` varchar(15) NOT NULL default '',
   `dimension_id` int(11) default NULL,
   `dimension2_id` int(11) default NULL,
-  `actual_cost` double NOT NULL default '0',
+  `purchase_cost` double NOT NULL default '0',
   `last_cost` double NOT NULL default '0',
   `material_cost` double NOT NULL default '0',
   `labour_cost` double NOT NULL default '0',