Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-01-19 15:08:13 +08:00
parent 94fe5243e6 f0edc5f0cc
commit 1581fc71c4
9 changed files with 131 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/update20.0.beta3.sql
View File

@@ -77,6 +77,7 @@ ALTER TABLE `zt_project` DROP `storyConcept`;
ALTER TABLE `zt_product` DROP `storyConcept`; ALTER TABLE `zt_product` DROP `storyConcept`;
ALTER TABLE `zt_user` CHANGE `avatar` `avatar` text NOT NULL AFTER `commiter`; ALTER TABLE `zt_user` CHANGE `avatar` `avatar` text NOT NULL AFTER `commiter`;
ALTER TABLE `zt_project` CHANGE `budgetUnit` `budgetUnit` char(30) NOT NULL DEFAULT 'CNY' AFTER `budget`;
-- DROP TABLE IF EXISTS `zt_searchindex`; -- DROP TABLE IF EXISTS `zt_searchindex`;
CREATE TABLE IF NOT EXISTS `zt_searchindex` ( CREATE TABLE IF NOT EXISTS `zt_searchindex` (

2
db/zentao.sql
View File

@@ -732,7 +732,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
`product` char(30) NOT NULL DEFAULT 'single', `product` char(30) NOT NULL DEFAULT 'single',
`lifetime` char(30) NOT NULL, `lifetime` char(30) NOT NULL,
`budget` varchar(30) NOT NULL DEFAULT '0', `budget` varchar(30) NOT NULL DEFAULT '0',
`budgetUnit` char(30) NOT NULL DEFAULT 'wanyuan', `budgetUnit` char(30) NOT NULL DEFAULT 'CNY',
`attribute` varchar(30) NOT NULL DEFAULT '', `attribute` varchar(30) NOT NULL DEFAULT '',
`percent` float unsigned NOT NULL DEFAULT '0', `percent` float unsigned NOT NULL DEFAULT '0',
`milestone` enum('0','1') NOT NULL DEFAULT '0', `milestone` enum('0','1') NOT NULL DEFAULT '0',

19
module/budget/lang/de.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = 'Category';
$lang->budget->name = 'Item'; $lang->budget->name = 'Item';
$lang->budget->amount = 'Estimated'; $lang->budget->amount = 'Estimated';
$lang->budget->desc = 'Description'; $lang->budget->desc = 'Description';
$lang->budget->wanyuan = 'Wanyuan'; $lang->budget->CNY = 'RMB';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = 'USD';
$lang->budget->HKD = 'HKD';
$lang->budget->NTD = 'New Taiwan';
$lang->budget->EUR = 'Euro';
$lang->budget->DEM = 'Deutsche Mark';
$lang->budget->CHF = 'Swiss Franc';
$lang->budget->FRF = 'French Franc';
$lang->budget->GBP = 'Pound';
$lang->budget->NLG = 'Florin';
$lang->budget->CAD = 'Canadian';
$lang->budget->RUR = 'Russian Ruble';
$lang->budget->INR = 'Indian';
$lang->budget->AUD = 'Australian';
$lang->budget->NZD = 'New Zealand';
$lang->budget->THB = 'Thai Baht';
$lang->budget->SGD = 'Singapore';
$lang->budget->createdBy = 'CreatedBy'; $lang->budget->createdBy = 'CreatedBy';
$lang->budget->createdDate = 'CreatedDate'; $lang->budget->createdDate = 'CreatedDate';
$lang->budget->lastEditedBy = 'LastEditBy'; $lang->budget->lastEditedBy = 'LastEditBy';

19
module/budget/lang/en.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = 'Category';
$lang->budget->name = 'Item'; $lang->budget->name = 'Item';
$lang->budget->amount = 'Estimated'; $lang->budget->amount = 'Estimated';
$lang->budget->desc = 'Description'; $lang->budget->desc = 'Description';
$lang->budget->wanyuan = 'Wanyuan'; $lang->budget->CNY = 'RMB';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = 'USD';
$lang->budget->HKD = 'HKD';
$lang->budget->NTD = 'New Taiwan';
$lang->budget->EUR = 'Euro';
$lang->budget->DEM = 'Deutsche Mark';
$lang->budget->CHF = 'Swiss Franc';
$lang->budget->FRF = 'French Franc';
$lang->budget->GBP = 'Pound';
$lang->budget->NLG = 'Florin';
$lang->budget->CAD = 'Canadian';
$lang->budget->RUR = 'Russian Ruble';
$lang->budget->INR = 'Indian';
$lang->budget->AUD = 'Australian';
$lang->budget->NZD = 'New Zealand';
$lang->budget->THB = 'Thai Baht';
$lang->budget->SGD = 'Singapore';
$lang->budget->createdBy = 'CreatedBy'; $lang->budget->createdBy = 'CreatedBy';
$lang->budget->createdDate = 'CreatedDate'; $lang->budget->createdDate = 'CreatedDate';
$lang->budget->lastEditedBy = 'LastEditBy'; $lang->budget->lastEditedBy = 'LastEditBy';

19
module/budget/lang/fr.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = 'Category';
$lang->budget->name = 'Item'; $lang->budget->name = 'Item';
$lang->budget->amount = 'Estimated'; $lang->budget->amount = 'Estimated';
$lang->budget->desc = 'Description'; $lang->budget->desc = 'Description';
$lang->budget->wanyuan = 'Wanyuan'; $lang->budget->CNY = 'RMB';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = 'USD';
$lang->budget->HKD = 'HKD';
$lang->budget->NTD = 'New Taiwan';
$lang->budget->EUR = 'Euro';
$lang->budget->DEM = 'Deutsche Mark';
$lang->budget->CHF = 'Swiss Franc';
$lang->budget->FRF = 'French Franc';
$lang->budget->GBP = 'Pound';
$lang->budget->NLG = 'Florin';
$lang->budget->CAD = 'Canadian';
$lang->budget->RUR = 'Russian Ruble';
$lang->budget->INR = 'Indian';
$lang->budget->AUD = 'Australian';
$lang->budget->NZD = 'New Zealand';
$lang->budget->THB = 'Thai Baht';
$lang->budget->SGD = 'Singapore';
$lang->budget->createdBy = 'CreatedBy'; $lang->budget->createdBy = 'CreatedBy';
$lang->budget->createdDate = 'CreatedDate'; $lang->budget->createdDate = 'CreatedDate';
$lang->budget->lastEditedBy = 'LastEditBy'; $lang->budget->lastEditedBy = 'LastEditBy';

19
module/budget/lang/vi.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = 'Category';
$lang->budget->name = 'Item'; $lang->budget->name = 'Item';
$lang->budget->amount = 'Estimated'; $lang->budget->amount = 'Estimated';
$lang->budget->desc = 'Description'; $lang->budget->desc = 'Description';
$lang->budget->wanyuan = 'Wanyuan'; $lang->budget->CNY = 'RMB';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = 'USD';
$lang->budget->HKD = 'HKD';
$lang->budget->NTD = 'New Taiwan';
$lang->budget->EUR = 'Euro';
$lang->budget->DEM = 'Deutsche Mark';
$lang->budget->CHF = 'Swiss Franc';
$lang->budget->FRF = 'French Franc';
$lang->budget->GBP = 'Pound';
$lang->budget->NLG = 'Florin';
$lang->budget->CAD = 'Canadian';
$lang->budget->RUR = 'Russian Ruble';
$lang->budget->INR = 'Indian';
$lang->budget->AUD = 'Australian';
$lang->budget->NZD = 'New Zealand';
$lang->budget->THB = 'Thai Baht';
$lang->budget->SGD = 'Singapore';
$lang->budget->createdBy = 'CreatedBy'; $lang->budget->createdBy = 'CreatedBy';
$lang->budget->createdDate = 'CreatedDate'; $lang->budget->createdDate = 'CreatedDate';
$lang->budget->lastEditedBy = 'LastEditBy'; $lang->budget->lastEditedBy = 'LastEditBy';

19
module/budget/lang/zh-cn.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = '科目';
$lang->budget->name = '费用名称'; $lang->budget->name = '费用名称';
$lang->budget->amount = '预计金额'; $lang->budget->amount = '预计金额';
$lang->budget->desc = '说明'; $lang->budget->desc = '说明';
$lang->budget->wanyuan = '万元'; $lang->budget->CNY = '人民币';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = '美元';
$lang->budget->HKD = '港元';
$lang->budget->NTD = '台元';
$lang->budget->EUR = '欧元';
$lang->budget->DEM = '马克';
$lang->budget->CHF = '瑞士法郎';
$lang->budget->FRF = '法国法郎';
$lang->budget->GBP = '英镑';
$lang->budget->NLG = '荷兰盾';
$lang->budget->CAD = '加拿大元';
$lang->budget->RUR = '卢布';
$lang->budget->INR = '卢比';
$lang->budget->AUD = '澳大利亚元';
$lang->budget->NZD = '新西兰元';
$lang->budget->THB = '泰国铢';
$lang->budget->SGD = '新加坡元';
$lang->budget->createdBy = '由谁创建'; $lang->budget->createdBy = '由谁创建';
$lang->budget->createdDate = '创建时间'; $lang->budget->createdDate = '创建时间';
$lang->budget->lastEditedBy = '由谁编辑'; $lang->budget->lastEditedBy = '由谁编辑';

19
module/budget/lang/zh-tw.php
View File

@@ -15,8 +15,23 @@ $lang->budget->subject = '科目';
$lang->budget->name = '費用名稱'; $lang->budget->name = '費用名稱';
$lang->budget->amount = '預計金額'; $lang->budget->amount = '預計金額';
$lang->budget->desc = '說明'; $lang->budget->desc = '說明';
$lang->budget->wanyuan = '萬元'; $lang->budget->CNY = '人民幣';
$lang->budget->dollar = 'Dollars'; $lang->budget->USD = '美元';
$lang->budget->HKD = '港元';
$lang->budget->NTD = '台元';
$lang->budget->EUR = '歐元';
$lang->budget->DEM = '馬克';
$lang->budget->CHF = '瑞士法郎';
$lang->budget->FRF = '法國法郎';
$lang->budget->GBP = '英鎊';
$lang->budget->NLG = '荷蘭盾';
$lang->budget->CAD = '加拿大元';
$lang->budget->RUR = '盧布';
$lang->budget->INR = '盧比';
$lang->budget->AUD = '澳大利亞元';
$lang->budget->NZD = '新西蘭元';
$lang->budget->THB = '泰國銖';
$lang->budget->SGD = '新加坡元';
$lang->budget->createdBy = '由誰創建'; $lang->budget->createdBy = '由誰創建';
$lang->budget->createdDate = '創建時間'; $lang->budget->createdDate = '創建時間';
$lang->budget->lastEditedBy = '由誰編輯'; $lang->budget->lastEditedBy = '由誰編輯';

27
module/upgrade/model.php
View File

@@ -664,6 +664,7 @@ class upgradeModel extends model
$this->saveLogs('Execute 20_0_beta3'); $this->saveLogs('Execute 20_0_beta3');
$this->execSQL($this->getUpgradeFile('20.0.beta3')); $this->execSQL($this->getUpgradeFile('20.0.beta3'));
$this->addPriv20_0_bata3(); $this->addPriv20_0_bata3();
$this->adjustBudgetUnit();
$this->appendExec('20_0_beta3'); $this->appendExec('20_0_beta3');
} }
@@ -4505,4 +4506,30 @@ class upgradeModel extends model
} }
return true; return true;
} }
/**
* Adjust budget units and values.
*
* @access public
* @return bool
*/
public function adjustBudgetUnit()
{
$budgets = $this->dao->select('id,budget,budgetUnit')->from(TABLE_PROJECT)
->where('type')->in('project,program')
->fetchAll('id');
foreach($budgets as $id => $budget)
{
$data = array();
$data['budgetUnit'] = 'CNY';
$data['budget'] = str_replace(',', '', $budget->budget);
if($budget->budgetUnit == 'wanyuan') $data['budget'] = (float)$data['budget'] * 10000;
if($budget->budgetUnit == 'dollar') $data['budgetUnit'] = 'USD';
if($data) $this->dao->update(TABLE_PROJECT)->data($data)->where('id')->eq($id)->exec();
}
return true;
}
} }