Use TaxStatus active flag in UI

uzerpllp · Nov 13, 2020 · 993ed20 · 993ed20
1 parent 924e72a
commit 993ed20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/modules/public_pages/erp/ledger/ledger_setup/templates/taxstatuss/new.tpl b/modules/public_pages/erp/ledger/ledger_setup/templates/taxstatuss/new.tpl
@@ -10,6 +10,7 @@
 			{input type='hidden'  attribute='id' }
 			{include file='elements/auditfields.tpl' }
 			{input type='text'  attribute='description' class="compulsory" }
+			{input type='checkbox' attribute='active' class="compulsory" }
 			{input type='checkbox'  attribute='apply_tax' class="compulsory" }
 			{input type='checkbox' label='EU Tax' attribute='eu_tax' class="compulsory" }
 			{input type='checkbox' label='PVA' attribute='postponed_vat_accounting' class="compulsory" }

diff --git a/modules/public_pages/erp/ledger/purchase_ledger/controllers/PlsuppliersController.php b/modules/public_pages/erp/ledger/purchase_ledger/controllers/PlsuppliersController.php
@@ -112,6 +112,11 @@ public function _new()
 			$supplier->cb_account_id = $cbaccount->{$cbaccount->idField};
 		}
 
+		$taxstatus = new TaxStatus();
+        $taxstatuses = $taxstatus->get_active_tax_statuses();
+
+        $this->view->set('f_taxstatuses', $taxstatuses);
+
 		$this->view->set('bank_account', $supplier->cb_account_id);
 		$this->view->set('bank_accounts', $this->getbankAccounts($supplier->id));
 

diff --git a/modules/public_pages/erp/ledger/purchase_ledger/templates/plsuppliers/new.tpl b/modules/public_pages/erp/ledger/purchase_ledger/templates/plsuppliers/new.tpl
@@ -36,10 +36,12 @@
 				{select attribute='payment_term_id' }
 				{select attribute='payment_type_id' }	
 				{if $action=='new' }
-					{select attribute='tax_status_id' }
+					{select attribute='tax_status_id' options=$f_taxstatuses}
 				{else}
 					{if $transaction_count == 0}
-						{select attribute='tax_status_id' }
+						{select attribute='tax_status_id' options=$f_taxstatuses}
+					{else}
+						{view_data attribute='tax_status_id'}
 					{/if}
 				{/if}
 				{select attribute='delivery_term_id' }