Site/Module setup work and auto_format fixes

2012-01-02 12:35:47 +11:00
parent 407eed04c9
commit a464d73f9a
19 changed files with 138 additions and 26 deletions
--- a/application/classes/company.php
+++ b/application/classes/company.php
@@ -65,8 +65,13 @@ class Company {
 	}

 	public static function taxid() {
-		// @todo Details should be obtained from DB
-		return Kohana::config('config.taxid');
+		// Tax ID details are stored in invoice config
+		$mc = Config::instance()->so->module_config('invoice');
+
+		if (empty($mc['TAX_ID_NAME']))
+			return empty($mc['TAX_ID']) ? '' : $mc['TAX_ID'];
+		else
+			return sprintf('%s: %s',$mc['TAX_ID_NAME'],empty($mc['TAX_ID']) ? '' : $mc['TAX_ID']);
 	}

 	public static function render() {