From 24d4232a93fcba194f526417627ebfdbf7589889 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 9 Dec 2015 10:24:09 +0100 Subject: [PATCH] Changed actual_cost to purchase_cost field in en_US-* init files. --- fixed_assets/includes/depreciation.inc | 2 +- sql/en_US-demo.sql | 2 +- sql/en_US-new.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fixed_assets/includes/depreciation.inc b/fixed_assets/includes/depreciation.inc index cc539079..3bc72126 100644 --- 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 921f6da7..af4114e2 100644 --- 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 2486d261..15cf8ed6 100644 --- 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', -- 2.30.2