From 671b042b271d54f86e2db871623517f5e9f71ba5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 28 Sep 2012 13:40:45 -0500 Subject: [PATCH] =?UTF-8?q?IDEMPIERE-362=20Hide=20things=20that=20don't=20?= =?UTF-8?q?work=20on=20iDempiere=20/=20Thanks=20to=20David=20Pe=C3=B1uela?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oracle/915_IDEMPIERE-362.sql | 259 +++++++ .../oracle/916_IDEMPIERE-362.sql | 388 ++++++++++ .../postgresql/915_IDEMPIERE-362.sql | 261 +++++++ .../postgresql/916_IDEMPIERE-362.sql | 388 ++++++++++ .../process/AcctSchemaDefaultCopy.java | 77 +- .../process/ProductCategoryAcctCopy.java | 12 +- .../src/org/compiere/acct/DocTax.java | 14 +- .../model/I_C_AcctSchema_Default.java | 407 +--------- .../org/compiere/model/I_C_AcctSchema_GL.java | 52 +- .../compiere/model/I_C_BP_Employee_Acct.java | 47 +- .../org/compiere/model/I_C_BP_Group_Acct.java | 47 +- .../compiere/model/I_C_BankAccount_Acct.java | 107 +-- .../org/compiere/model/I_C_Currency_Acct.java | 77 +- .../src/org/compiere/model/I_C_Tax_Acct.java | 47 +- .../org/compiere/model/I_M_Product_Acct.java | 182 +---- .../model/I_M_Product_Category_Acct.java | 182 +---- .../compiere/model/I_M_Warehouse_Acct.java | 62 +- .../compiere/model/MAcctSchemaDefault.java | 33 +- .../model/X_C_AcctSchema_Default.java | 704 +----------------- .../org/compiere/model/X_C_AcctSchema_GL.java | 91 +-- .../compiere/model/X_C_BP_Employee_Acct.java | 64 +- .../org/compiere/model/X_C_BP_Group_Acct.java | 76 +- .../compiere/model/X_C_BankAccount_Acct.java | 180 +---- .../org/compiere/model/X_C_Currency_Acct.java | 128 +--- .../src/org/compiere/model/X_C_Tax_Acct.java | 76 +- .../org/compiere/model/X_M_Product_Acct.java | 310 +------- .../model/X_M_Product_Category_Acct.java | 310 +------- .../compiere/model/X_M_Warehouse_Acct.java | 102 +-- .../test/functional/MCurrencyAcctTest.java | 7 +- .../data/import/AccountingUS.csv | 62 +- .../data/import/AccountingUS.xls | Bin 79360 -> 78336 bytes 31 files changed, 1664 insertions(+), 3088 deletions(-) create mode 100644 migration/360lts-release/oracle/915_IDEMPIERE-362.sql create mode 100644 migration/360lts-release/oracle/916_IDEMPIERE-362.sql create mode 100644 migration/360lts-release/postgresql/915_IDEMPIERE-362.sql create mode 100644 migration/360lts-release/postgresql/916_IDEMPIERE-362.sql diff --git a/migration/360lts-release/oracle/915_IDEMPIERE-362.sql b/migration/360lts-release/oracle/915_IDEMPIERE-362.sql new file mode 100644 index 0000000000..d5cdece2b4 --- /dev/null +++ b/migration/360lts-release/oracle/915_IDEMPIERE-362.sql @@ -0,0 +1,259 @@ +-- IDEMPIERE-362 Hide things that don't work on iDempiere +-- Sep 19, 2012 4:36:27 PM COT +UPDATE AD_Column SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + + + +-- + +UPDATE AD_Field SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + +--- +UPDATE AD_PrintFormatItem SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + +-- Sep 27, 2012 11:08:01 AM COT +UPDATE AD_Tab SET IsActive='N',Updated=TO_DATE('2012-09-27 11:08:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=214 +; + + +-- Sep 28, 2012 1:14:51 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2012-09-28 13:14:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1370 +; + +-- Sep 28, 2012 1:15:22 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Tab SET IsActive='N',Updated=TO_DATE('2012-09-28 13:15:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=569 +; + +-- Sep 28, 2012 1:20:15 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_DATE('2012-09-28 13:20:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56547 +; + +-- Sep 28, 2012 1:20:51 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_DATE('2012-09-28 13:20:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56537 +; + +SELECT register_migration_script('915_IDEMPIERE-362.sql') FROM dual +; diff --git a/migration/360lts-release/oracle/916_IDEMPIERE-362.sql b/migration/360lts-release/oracle/916_IDEMPIERE-362.sql new file mode 100644 index 0000000000..7a9472fd1a --- /dev/null +++ b/migration/360lts-release/oracle/916_IDEMPIERE-362.sql @@ -0,0 +1,388 @@ +-- IDEMPIERE-362 Hide things that don't work on iDempiere +-- Hide Payroll to be managed as extension + +-- Sep 20, 2012 7:59:44 PM COT +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-20 19:59:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53114 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53036 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_Menu SET Name='Payroll Concept Catalog', Description='Maintain Payroll Concept Catalog', IsActive='N',Updated=TO_DATE('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53115 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50084 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53039 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_Menu SET Name='Payroll Concept Category', Description='Maintain Payroll Concept Category', IsActive='N',Updated=TO_DATE('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53118 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50075 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53032 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_Menu SET Name='Payroll Contract', Description='Maintain Payroll Contract', IsActive='N',Updated=TO_DATE('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53110 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50076 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53038 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_Menu SET Name='Payroll Definition', Description='In a company, payroll is the sum of all financial records of salaries, wages, bonuses, and deductions.', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53117 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50074 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53034 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_Menu SET Name='Payroll Department', Description='Maintain Payroll Department', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53112 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50079 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53033 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_Menu SET Name='Payroll Employee', Description='Maintain Payroll Employee', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53111 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50080 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53035 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_Menu SET Name='Payroll Job', Description='Maintain Payroll Job', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53113 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50083 +; + +-- Sep 20, 2012 8:02:42 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53042 +; + +-- Sep 20, 2012 8:02:42 PM COT +UPDATE AD_Menu SET Name='Payroll Movement', Description='History of Payroll Movement', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53121 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53037 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_Menu SET Name='Payroll Process', Description='Payroll Process', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53127 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50077 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53041 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_Menu SET Name='Payroll Table', Description='Maintain Payroll Table', IsActive='N',Updated=TO_DATE('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53120 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50078 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_DATE('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53040 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_Menu SET Name='Payroll Table Type', Description='Maintain Payroll Table Type', IsActive='N',Updated=TO_DATE('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53119 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_DATE('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50082 +; + +-- Sep 28, 2012 1:07:59 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:07:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53124 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53124 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=530 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53109 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53114 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=266 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=232 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=190 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=127 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=133 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=172 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=173 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53256 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=110 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=394 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=544 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=512 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=506 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=420 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=451 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=186 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=473 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=531 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53124 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53109 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53114 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=266 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=232 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=190 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=127 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=133 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=172 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=173 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53256 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=110 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=394 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=544 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=512 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=506 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=420 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=451 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=186 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=473 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=531 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=18, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=530 +; + +-- Sep 28, 2012 1:11:02 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:11:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53123 +; + +-- Sep 28, 2012 1:11:11 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:11:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53116 +; + +-- Sep 28, 2012 1:11:15 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:11:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53122 +; + +-- Sep 28, 2012 1:11:28 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:11:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53109 +; + +-- Sep 28, 2012 1:11:33 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_DATE('2012-09-28 13:11:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53108 +; + +SELECT register_migration_script('916_IDEMPIERE-362.sql') FROM dual +; + diff --git a/migration/360lts-release/postgresql/915_IDEMPIERE-362.sql b/migration/360lts-release/postgresql/915_IDEMPIERE-362.sql new file mode 100644 index 0000000000..ace0d2f0f1 --- /dev/null +++ b/migration/360lts-release/postgresql/915_IDEMPIERE-362.sql @@ -0,0 +1,261 @@ +-- IDEMPIERE-362 Hide things that don't work on iDempiere + +-- Sep 19, 2012 4:36:27 PM COT +UPDATE AD_Column SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + + + +-- + +UPDATE AD_Field SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + +--- +UPDATE AD_PrintFormatItem SET IsActive='N' WHERE AD_Column_ID IN ( +4862, -- C_AcctSchema_Default.B_Expense_Acct +4868, -- C_AcctSchema_Default.B_RevaluationGain_Acct +4869, -- C_AcctSchema_Default.B_RevaluationLoss_Acct +4866, -- C_AcctSchema_Default.B_SettlementGain_Acct +4867, -- C_AcctSchema_Default.B_SettlementLoss_Acct +4865, -- C_AcctSchema_Default.B_Unidentified_Acct +3449, -- C_AcctSchema_Default.E_Expense_Acct +3450, -- C_AcctSchema_Default.E_Prepayment_Acct +4873, -- C_AcctSchema_Default.NotInvoicedReceivables_Acct +4840, -- C_AcctSchema_Default.NotInvoicedRevenue_Acct +56545, -- C_AcctSchema_Default.P_Burden_Acct +56543, -- C_AcctSchema_Default.P_CostOfProduction_Acct +56542, -- C_AcctSchema_Default.P_FloorStock_Acct +56544, -- C_AcctSchema_Default.P_Labor_Acct +56538, -- C_AcctSchema_Default.P_MethodChangeVariance_Acct +56541, -- C_AcctSchema_Default.P_MixVariance_Acct +56546, -- C_AcctSchema_Default.P_OutsideProcessing_Acct +56567, -- C_AcctSchema_Default.P_Overhead_Acct +56568, -- C_AcctSchema_Default.P_Scrap_Acct +56539, -- C_AcctSchema_Default.P_UsageVariance_Acct +56537, -- C_AcctSchema_Default.P_WIP_Acct +4856, -- C_AcctSchema_Default.T_Liability_Acct +4857, -- C_AcctSchema_Default.T_Receivables_Acct +6114, -- C_AcctSchema_Default.W_InvActualAdjust_Acct +3443, -- C_AcctSchema_Default.W_Inventory_Acct +4853, -- C_AcctSchema_Default.Withholding_Acct +4843, -- C_AcctSchema_Default.W_Revaluation_Acct +2501, -- C_AcctSchema_GL.IncomeSummary_Acct +2500, -- C_AcctSchema_GL.RetainedEarning_Acct +2493, -- C_AcctSchema_GL.SuspenseError_Acct +4901, -- C_BankAccount_Acct.B_Expense_Acct +4907, -- C_BankAccount_Acct.B_RevaluationGain_Acct +4908, -- C_BankAccount_Acct.B_RevaluationLoss_Acct +4905, -- C_BankAccount_Acct.B_SettlementGain_Acct +4906, -- C_BankAccount_Acct.B_SettlementLoss_Acct +4904, -- C_BankAccount_Acct.B_Unidentified_Acct +3381, -- C_BP_Employee_Acct.E_Expense_Acct +3382, -- C_BP_Employee_Acct.E_Prepayment_Acct +4999, -- C_BP_Group_Acct.NotInvoicedReceivables_Acct +4998, -- C_BP_Group_Acct.NotInvoicedRevenue_Acct +10287, -- C_Currency_Acct.RealizedGain_Acct +10289, -- C_Currency_Acct.RealizedLoss_Acct +10279, -- C_Currency_Acct.UnrealizedGain_Acct +10290, -- C_Currency_Acct.UnrealizedLoss_Acct +5085, -- C_Tax_Acct.T_Liability_Acct +5087, -- C_Tax_Acct.T_Receivables_Acct +56565, -- M_Product_Acct.P_Burden_Acct +56563, -- M_Product_Acct.P_CostOfProduction_Acct +56562, -- M_Product_Acct.P_FloorStock_Acct +56564, -- M_Product_Acct.P_Labor_Acct +56558, -- M_Product_Acct.P_MethodChangeVariance_Acct +56561, -- M_Product_Acct.P_MixVariance_Acct +56566, -- M_Product_Acct.P_OutsideProcessing_Acct +56571, -- M_Product_Acct.P_Overhead_Acct +56572, -- M_Product_Acct.P_Scrap_Acct +56559, -- M_Product_Acct.P_UsageVariance_Acct +56557, -- M_Product_Acct.P_WIP_Acct +56555, -- M_Product_Category_Acct.P_Burden_Acct +56553, -- M_Product_Category_Acct.P_CostOfProduction_Acct +56547, -- M_Product_Category_Acct.P_FloorStock_Acct +56554, -- M_Product_Category_Acct.P_Labor_Acct +56549, -- M_Product_Category_Acct.P_MethodChangeVariance_Acct +56552, -- M_Product_Category_Acct.P_MixVariance_Acct +56556, -- M_Product_Category_Acct.P_OutsideProcessing_Acct +56569, -- M_Product_Category_Acct.P_Overhead_Acct +56570, -- M_Product_Category_Acct.P_Scrap_Acct +56550, -- M_Product_Category_Acct.P_UsageVariance_Acct +56548, -- M_Product_Category_Acct.P_WIP_Acct +6124, -- M_Warehouse_Acct.W_InvActualAdjust_Acct +3386, -- M_Warehouse_Acct.W_Inventory_Acct +5133 -- M_Warehouse_Acct.W_Revaluation_Acct +) +; + + +-- Sep 27, 2012 11:08:01 AM COT +UPDATE AD_Tab SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-27 11:08:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=214 +; + +-- Sep 28, 2012 1:14:51 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:14:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1370 +; + +-- Sep 28, 2012 1:15:22 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Tab SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:15:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=569 +; + +-- Sep 28, 2012 1:20:15 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_TIMESTAMP('2012-09-28 13:20:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56547 +; + +-- Sep 28, 2012 1:20:51 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_TIMESTAMP('2012-09-28 13:20:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56537 +; + +SELECT register_migration_script('915_IDEMPIERE-362.sql') FROM dual +; + diff --git a/migration/360lts-release/postgresql/916_IDEMPIERE-362.sql b/migration/360lts-release/postgresql/916_IDEMPIERE-362.sql new file mode 100644 index 0000000000..eb23354f2c --- /dev/null +++ b/migration/360lts-release/postgresql/916_IDEMPIERE-362.sql @@ -0,0 +1,388 @@ +-- IDEMPIERE-362 Hide things that don't work on iDempiere +-- Hide Payroll to be managed as extension + +-- Sep 20, 2012 7:59:44 PM COT +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 19:59:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53114 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53036 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_Menu SET Name='Payroll Concept Catalog', Description='Maintain Payroll Concept Catalog', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53115 +; + +-- Sep 20, 2012 8:01:41 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50084 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53039 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_Menu SET Name='Payroll Concept Category', Description='Maintain Payroll Concept Category', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53118 +; + +-- Sep 20, 2012 8:01:48 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50075 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53032 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_Menu SET Name='Payroll Contract', Description='Maintain Payroll Contract', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53110 +; + +-- Sep 20, 2012 8:01:59 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:01:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50076 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53038 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_Menu SET Name='Payroll Definition', Description='In a company, payroll is the sum of all financial records of salaries, wages, bonuses, and deductions.', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53117 +; + +-- Sep 20, 2012 8:02:04 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50074 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53034 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_Menu SET Name='Payroll Department', Description='Maintain Payroll Department', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53112 +; + +-- Sep 20, 2012 8:02:08 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50079 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53033 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_Menu SET Name='Payroll Employee', Description='Maintain Payroll Employee', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53111 +; + +-- Sep 20, 2012 8:02:13 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50080 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53035 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_Menu SET Name='Payroll Job', Description='Maintain Payroll Job', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53113 +; + +-- Sep 20, 2012 8:02:18 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50083 +; + +-- Sep 20, 2012 8:02:42 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53042 +; + +-- Sep 20, 2012 8:02:42 PM COT +UPDATE AD_Menu SET Name='Payroll Movement', Description='History of Payroll Movement', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53121 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53037 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_Menu SET Name='Payroll Process', Description='Payroll Process', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53127 +; + +-- Sep 20, 2012 8:02:48 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50077 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53041 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_Menu SET Name='Payroll Table', Description='Maintain Payroll Table', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53120 +; + +-- Sep 20, 2012 8:02:55 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:02:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50078 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_Window SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Window_ID=53040 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_Menu SET Name='Payroll Table Type', Description='Maintain Payroll Table Type', IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Menu_ID=53119 +; + +-- Sep 20, 2012 8:03:03 PM COT +UPDATE AD_WF_Node SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-20 20:03:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_WF_Node_ID=50082 +; + +-- Sep 28, 2012 1:07:59 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:07:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53124 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53124 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=530 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53109 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53114 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=266 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=232 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=190 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=127 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=133 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=172 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=173 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53256 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=110 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=394 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=544 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=512 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=12, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=506 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=13, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=420 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=14, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=451 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=15, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=186 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=16, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=473 +; + +-- Sep 28, 2012 1:08:54 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=17, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=531 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53124 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53109 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=53108, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53114 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=266 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=232 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=190 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=127 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=133 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=172 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=173 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53256 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=110 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=394 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=544 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=512 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=12, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=506 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=13, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=420 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=14, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=451 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=15, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=186 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=16, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=473 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=17, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=531 +; + +-- Sep 28, 2012 1:08:58 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_TreeNodeMM SET Parent_ID=165, SeqNo=18, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=530 +; + +-- Sep 28, 2012 1:11:02 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:11:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53123 +; + +-- Sep 28, 2012 1:11:11 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:11:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53116 +; + +-- Sep 28, 2012 1:11:15 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:11:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53122 +; + +-- Sep 28, 2012 1:11:28 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:11:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53109 +; + +-- Sep 28, 2012 1:11:33 PM COT +-- IDEMPIERE-362 Hide things that don't work on iDempiere +UPDATE AD_Menu SET IsActive='N',Updated=TO_TIMESTAMP('2012-09-28 13:11:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53108 +; + +SELECT register_migration_script('916_IDEMPIERE-362.sql') FROM dual +; + diff --git a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java index b24410a39c..4b6432d7a9 100644 --- a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java +++ b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaDefaultCopy.java @@ -97,18 +97,7 @@ public class AcctSchemaDefaultCopy extends SvrProcess .append(", P_AverageCostVariance_Acct=").append(acct.getP_AverageCostVariance_Acct()) .append(", P_TradeDiscountRec_Acct=").append(acct.getP_TradeDiscountRec_Acct()) .append(", P_TradeDiscountGrant_Acct=").append(acct.getP_TradeDiscountGrant_Acct()) - .append(", P_WIP_Acct=").append(acct.getP_WIP_Acct()) - .append(", P_FloorStock_Acct=").append(acct.getP_FloorStock_Acct()) - .append(", P_MethodChangeVariance_Acct=").append(acct.getP_MethodChangeVariance_Acct()) - .append(", P_UsageVariance_Acct=").append(acct.getP_UsageVariance_Acct()) .append(", P_RateVariance_Acct=").append(acct.getP_RateVariance_Acct()) - .append(", P_MixVariance_Acct=").append(acct.getP_MixVariance_Acct()) - .append(", P_Labor_Acct=").append(acct.getP_Labor_Acct()) - .append(", P_Burden_Acct=").append(acct.getP_Burden_Acct()) - .append(", P_CostOfProduction_Acct=").append(acct.getP_CostOfProduction_Acct()) - .append(", P_OutsideProcessing_Acct=").append(acct.getP_OutsideProcessing_Acct()) - .append(", P_Overhead_Acct=").append(acct.getP_Overhead_Acct()) - .append(", P_Scrap_Acct=").append(acct.getP_Scrap_Acct()) .append(", Updated=SysDate, UpdatedBy=0 ") .append("WHERE pa.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) .append(" AND EXISTS (SELECT * FROM M_Product_Category p ") @@ -124,15 +113,13 @@ public class AcctSchemaDefaultCopy extends SvrProcess .append(" P_Revenue_Acct, P_Expense_Acct, P_CostAdjustment_Acct, P_InventoryClearing_Acct, P_Asset_Acct, P_CoGs_Acct,") .append(" P_PurchasePriceVariance_Acct, P_InvoicePriceVariance_Acct, P_AverageCostVariance_Acct,") .append(" P_TradeDiscountRec_Acct, P_TradeDiscountGrant_Acct," ) - .append(" P_WIP_Acct,P_FloorStock_Acct,P_MethodChangeVariance_Acct,P_UsageVariance_Acct,P_RateVariance_Acct,") - .append(" P_MixVariance_Acct,P_Labor_Acct,P_Burden_Acct,P_CostOfProduction_Acct,P_OutsideProcessing_Acct,P_Overhead_Acct,P_Scrap_Acct) ") + .append(" P_RateVariance_Acct) ") .append(" SELECT p.M_Product_Category_ID, acct.C_AcctSchema_ID,") .append(" p.AD_Client_ID, p.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") .append(" acct.P_Revenue_Acct, acct.P_Expense_Acct, acct.P_CostAdjustment_Acct, acct.P_InventoryClearing_Acct, acct.P_Asset_Acct, acct.P_CoGs_Acct,") .append(" acct.P_PurchasePriceVariance_Acct, acct.P_InvoicePriceVariance_Acct, acct.P_AverageCostVariance_Acct,") .append(" acct.P_TradeDiscountRec_Acct, acct.P_TradeDiscountGrant_Acct,") - .append(" acct.P_WIP_Acct,acct.P_FloorStock_Acct,acct.P_MethodChangeVariance_Acct,acct.P_UsageVariance_Acct,acct.P_RateVariance_Acct,") - .append(" acct.P_MixVariance_Acct,acct.P_Labor_Acct,acct.P_Burden_Acct,acct.P_CostOfProduction_Acct,acct.P_OutsideProcessing_Acct,P_Overhead_Acct,P_Scrap_Acct ") + .append(" acct.P_RateVariance_Acct ") .append("FROM M_Product_Category p") .append(" INNER JOIN C_AcctSchema_Default acct ON (p.AD_Client_ID=acct.AD_Client_ID) ") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -150,15 +137,13 @@ public class AcctSchemaDefaultCopy extends SvrProcess .append(" P_Revenue_Acct, P_Expense_Acct, P_CostAdjustment_Acct, P_InventoryClearing_Acct, P_Asset_Acct, P_CoGs_Acct,") .append(" P_PurchasePriceVariance_Acct, P_InvoicePriceVariance_Acct, P_AverageCostVariance_Acct,") .append(" P_TradeDiscountRec_Acct, P_TradeDiscountGrant_Acct, ") - .append(" P_WIP_Acct,P_FloorStock_Acct,P_MethodChangeVariance_Acct,P_UsageVariance_Acct,P_RateVariance_Acct,") - .append(" P_MixVariance_Acct,P_Labor_Acct,P_Burden_Acct,P_CostOfProduction_Acct,P_OutsideProcessing_Acct,P_Overhead_Acct,P_Scrap_Acct) ") + .append(" P_RateVariance_Acct) ") .append("SELECT p.M_Product_ID, acct.C_AcctSchema_ID,") .append(" p.AD_Client_ID, p.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") .append(" acct.P_Revenue_Acct, acct.P_Expense_Acct, acct.P_CostAdjustment_Acct, acct.P_InventoryClearing_Acct, acct.P_Asset_Acct, acct.P_CoGs_Acct,") .append(" acct.P_PurchasePriceVariance_Acct, acct.P_InvoicePriceVariance_Acct, acct.P_AverageCostVariance_Acct,") .append(" acct.P_TradeDiscountRec_Acct, acct.P_TradeDiscountGrant_Acct,") - .append(" acct.P_WIP_Acct,acct.P_FloorStock_Acct,acct.P_MethodChangeVariance_Acct,acct.P_UsageVariance_Acct,acct.P_RateVariance_Acct,") - .append(" acct.P_MixVariance_Acct,acct.P_Labor_Acct,acct.P_Burden_Acct,acct.P_CostOfProduction_Acct,acct.P_OutsideProcessing_Acct,acct.P_Overhead_Acct,acct.P_Scrap_Acct ") + .append(" acct.P_RateVariance_Acct ") .append("FROM M_Product p") .append(" INNER JOIN M_Product_Category_Acct acct ON (acct.M_Product_Category_ID=p.M_Product_Category_ID)") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -187,8 +172,6 @@ public class AcctSchemaDefaultCopy extends SvrProcess .append(", WriteOff_Acct=").append(acct.getWriteOff_Acct()) .append(", NotInvoicedReceipts_Acct=").append(acct.getNotInvoicedReceipts_Acct()) .append(", UnEarnedRevenue_Acct=").append(acct.getUnEarnedRevenue_Acct()) - .append(", NotInvoicedRevenue_Acct=").append(acct.getNotInvoicedRevenue_Acct()) - .append(", NotInvoicedReceivables_Acct=").append(acct.getNotInvoicedReceivables_Acct()) .append(", Updated=SysDate, UpdatedBy=0 ") .append("WHERE a.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) .append(" AND EXISTS (SELECT * FROM C_BP_Group_Acct x ") @@ -204,15 +187,13 @@ public class AcctSchemaDefaultCopy extends SvrProcess .append(" C_Receivable_Acct, C_Receivable_Services_Acct, C_PrePayment_Acct,") .append(" V_Liability_Acct, V_Liability_Services_Acct, V_PrePayment_Acct,") .append(" PayDiscount_Exp_Acct, PayDiscount_Rev_Acct, WriteOff_Acct,") - .append(" NotInvoicedReceipts_Acct, UnEarnedRevenue_Acct,") - .append(" NotInvoicedRevenue_Acct, NotInvoicedReceivables_Acct) ") + .append(" NotInvoicedReceipts_Acct, UnEarnedRevenue_Acct) ") .append("SELECT x.C_BP_Group_ID, acct.C_AcctSchema_ID,") .append(" x.AD_Client_ID, x.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") .append(" acct.C_Receivable_Acct, acct.C_Receivable_Services_Acct, acct.C_PrePayment_Acct,") .append(" acct.V_Liability_Acct, acct.V_Liability_Services_Acct, acct.V_PrePayment_Acct,") .append(" acct.PayDiscount_Exp_Acct, acct.PayDiscount_Rev_Acct, acct.WriteOff_Acct,") - .append(" acct.NotInvoicedReceipts_Acct, acct.UnEarnedRevenue_Acct,") - .append(" acct.NotInvoicedRevenue_Acct, acct.NotInvoicedReceivables_Acct ") + .append(" acct.NotInvoicedReceipts_Acct, acct.UnEarnedRevenue_Acct ") .append("FROM C_BP_Group x") .append(" INNER JOIN C_AcctSchema_Default acct ON (x.AD_Client_ID=acct.AD_Client_ID) ") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -223,8 +204,9 @@ public class AcctSchemaDefaultCopy extends SvrProcess addLog(0, null, new BigDecimal(created), "@Created@ @C_BP_Group_ID@"); createdTotal += created; - +//IDEMPIERE-362 Hide things that don't work on iDempiere // Update Business Partner - Employee + /* if (p_CopyOverwriteAcct) { sql = new StringBuilder("UPDATE C_BP_Employee_Acct a ") @@ -255,6 +237,7 @@ public class AcctSchemaDefaultCopy extends SvrProcess created = DB.executeUpdate(sql.toString(), get_TrxName()); addLog(0, null, new BigDecimal(created), "@Created@ @C_BPartner_ID@ @IsEmployee@"); createdTotal += created; + */ // if (!p_CopyOverwriteAcct) { @@ -293,15 +276,12 @@ public class AcctSchemaDefaultCopy extends SvrProcess addLog(0, null, new BigDecimal(created), "@Created@ @C_BPartner_ID@ @IsVendor@"); createdTotal += created; } - +//IDEMPIERE-362 Hide things that don't work on iDempiere // Update Warehouse if (p_CopyOverwriteAcct) { sql = new StringBuilder("UPDATE M_Warehouse_Acct a ") - .append("SET W_Inventory_Acct=").append(acct.getW_Inventory_Acct()) - .append(", W_Differences_Acct=").append(acct.getW_Differences_Acct()) - .append(", W_Revaluation_Acct=").append(acct.getW_Revaluation_Acct()) - .append(", W_InvActualAdjust_Acct=").append(acct.getW_InvActualAdjust_Acct()) + .append("SET W_Differences_Acct=").append(acct.getW_Differences_Acct()) .append(", Updated=SysDate, UpdatedBy=0 ") .append("WHERE a.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) .append(" AND EXISTS (SELECT * FROM M_Warehouse_Acct x ") @@ -314,10 +294,10 @@ public class AcctSchemaDefaultCopy extends SvrProcess sql = new StringBuilder("INSERT INTO M_Warehouse_Acct ") .append("(M_Warehouse_ID, C_AcctSchema_ID,") .append(" AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,") - .append(" W_Inventory_Acct, W_Differences_Acct, W_Revaluation_Acct, W_InvActualAdjust_Acct) ") + .append(" W_Differences_Acct) ") .append("SELECT x.M_Warehouse_ID, acct.C_AcctSchema_ID,") .append(" x.AD_Client_ID, x.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") - .append(" acct.W_Inventory_Acct, acct.W_Differences_Acct, acct.W_Revaluation_Acct, acct.W_InvActualAdjust_Acct ") + .append(" acct.W_Differences_Acct ") .append("FROM M_Warehouse x") .append(" INNER JOIN C_AcctSchema_Default acct ON (x.AD_Client_ID=acct.AD_Client_ID) ") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -361,15 +341,13 @@ public class AcctSchemaDefaultCopy extends SvrProcess addLog(0, null, new BigDecimal(created), "@Created@ @C_Project_ID@"); createdTotal += created; - +//IDEMPIERE-362 Hide things that don't work on iDempiere // Update Tax if (p_CopyOverwriteAcct) { sql = new StringBuilder("UPDATE C_Tax_Acct a ") .append("SET T_Due_Acct=").append(acct.getT_Due_Acct()) - .append(", T_Liability_Acct=").append(acct.getT_Liability_Acct()) .append(", T_Credit_Acct=").append(acct.getT_Credit_Acct()) - .append(", T_Receivables_Acct=").append(acct.getT_Receivables_Acct()) .append(", T_Expense_Acct=").append(acct.getT_Expense_Acct()) .append(", Updated=SysDate, UpdatedBy=0 ") .append("WHERE a.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -383,10 +361,10 @@ public class AcctSchemaDefaultCopy extends SvrProcess sql = new StringBuilder("INSERT INTO C_Tax_Acct ") .append("(C_Tax_ID, C_AcctSchema_ID,") .append(" AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,") - .append(" T_Due_Acct, T_Liability_Acct, T_Credit_Acct, T_Receivables_Acct, T_Expense_Acct) ") + .append(" T_Due_Acct, T_Credit_Acct, T_Expense_Acct) ") .append("SELECT x.C_Tax_ID, acct.C_AcctSchema_ID,") .append(" x.AD_Client_ID, x.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") - .append(" acct.T_Due_Acct, acct.T_Liability_Acct, acct.T_Credit_Acct, acct.T_Receivables_Acct, acct.T_Expense_Acct ") + .append(" acct.T_Due_Acct, acct.T_Credit_Acct, acct.T_Expense_Acct ") .append("FROM C_Tax x") .append(" INNER JOIN C_AcctSchema_Default acct ON (x.AD_Client_ID=acct.AD_Client_ID) ") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -404,16 +382,10 @@ public class AcctSchemaDefaultCopy extends SvrProcess sql = new StringBuilder("UPDATE C_BankAccount_Acct a ") .append("SET B_InTransit_Acct=").append(acct.getB_InTransit_Acct()) .append(", B_Asset_Acct=").append(acct.getB_Asset_Acct()) - .append(", B_Expense_Acct=").append(acct.getB_Expense_Acct()) .append(", B_InterestRev_Acct=").append(acct.getB_InterestRev_Acct()) .append(", B_InterestExp_Acct=").append(acct.getB_InterestExp_Acct()) - .append(", B_Unidentified_Acct=").append(acct.getB_Unidentified_Acct()) .append(", B_UnallocatedCash_Acct=").append(acct.getB_UnallocatedCash_Acct()) .append(", B_PaymentSelect_Acct=").append(acct.getB_PaymentSelect_Acct()) - .append(", B_SettlementGain_Acct=").append(acct.getB_SettlementGain_Acct()) - .append(", B_SettlementLoss_Acct=").append(acct.getB_SettlementLoss_Acct()) - .append(", B_RevaluationGain_Acct=").append(acct.getB_RevaluationGain_Acct()) - .append(", B_RevaluationLoss_Acct=").append(acct.getB_RevaluationLoss_Acct()) .append(", Updated=SysDate, UpdatedBy=0 ") .append("WHERE a.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) .append(" AND EXISTS (SELECT * FROM C_BankAccount_Acct x ") @@ -426,16 +398,12 @@ public class AcctSchemaDefaultCopy extends SvrProcess sql = new StringBuilder("INSERT INTO C_BankAccount_Acct ") .append("(C_BankAccount_ID, C_AcctSchema_ID,") .append(" AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,") - .append(" B_InTransit_Acct, B_Asset_Acct, B_Expense_Acct, B_InterestRev_Acct, B_InterestExp_Acct,") - .append(" B_Unidentified_Acct, B_UnallocatedCash_Acct, B_PaymentSelect_Acct,") - .append(" B_SettlementGain_Acct, B_SettlementLoss_Acct,") - .append(" B_RevaluationGain_Acct, B_RevaluationLoss_Acct) ") + .append(" B_InTransit_Acct, B_Asset_Acct, B_InterestRev_Acct, B_InterestExp_Acct,") + .append(" B_UnallocatedCash_Acct, B_PaymentSelect_Acct) ") .append("SELECT x.C_BankAccount_ID, acct.C_AcctSchema_ID,") .append(" x.AD_Client_ID, x.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") - .append(" acct.B_InTransit_Acct, acct.B_Asset_Acct, acct.B_Expense_Acct, acct.B_InterestRev_Acct, acct.B_InterestExp_Acct,") - .append(" acct.B_Unidentified_Acct, acct.B_UnallocatedCash_Acct, acct.B_PaymentSelect_Acct,") - .append(" acct.B_SettlementGain_Acct, acct.B_SettlementLoss_Acct,") - .append(" acct.B_RevaluationGain_Acct, acct.B_RevaluationLoss_Acct ") + .append(" acct.B_InTransit_Acct, acct.B_Asset_Acct, acct.B_InterestRev_Acct, acct.B_InterestExp_Acct,") + .append(" acct.B_UnallocatedCash_Acct, acct.B_PaymentSelect_Acct ") .append("FROM C_BankAccount x") .append(" INNER JOIN C_AcctSchema_Default acct ON (x.AD_Client_ID=acct.AD_Client_ID) ") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -446,8 +414,9 @@ public class AcctSchemaDefaultCopy extends SvrProcess addLog(0, null, new BigDecimal(created), "@Created@ @C_BankAccount_ID@"); createdTotal += created; - +//IDEMPIERE-362 Hide things that don't work on iDempiere // Update Withholding + /* if (p_CopyOverwriteAcct) { sql = new StringBuilder("UPDATE C_Withholding_Acct a ") @@ -477,7 +446,7 @@ public class AcctSchemaDefaultCopy extends SvrProcess created = DB.executeUpdate(sql.toString(), get_TrxName()); addLog(0, null, new BigDecimal(created), "@Created@ @C_Withholding_ID@"); createdTotal += created; - + */ // Update Charge if (p_CopyOverwriteAcct) diff --git a/org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java b/org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java index 9cbe40690b..093866f190 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java +++ b/org.adempiere.base.process/src/org/compiere/process/ProductCategoryAcctCopy.java @@ -76,13 +76,11 @@ public class ProductCategoryAcctCopy extends SvrProcess .append("SET (P_Revenue_Acct,P_Expense_Acct,P_CostAdjustment_Acct,P_InventoryClearing_Acct,P_Asset_Acct,P_COGS_Acct,") .append(" P_PurchasePriceVariance_Acct,P_InvoicePriceVariance_Acct,P_AverageCostVariance_Acct,") .append(" P_TradeDiscountRec_Acct,P_TradeDiscountGrant_Acct,") - .append(" P_WIP_Acct,P_FloorStock_Acct,P_MethodChangeVariance_Acct,P_UsageVariance_Acct,P_RateVariance_Acct,") - .append(" P_MixVariance_Acct,P_Labor_Acct,P_Burden_Acct,P_CostOfProduction_Acct,P_OutsideProcessing_Acct,P_Overhead_Acct,P_Scrap_Acct)=") + .append(" P_RateVariance_Acct)=") .append(" (SELECT P_Revenue_Acct,P_Expense_Acct,P_CostAdjustment_Acct,P_InventoryClearing_Acct,P_Asset_Acct,P_COGS_Acct,") .append(" P_PurchasePriceVariance_Acct,P_InvoicePriceVariance_Acct,P_AverageCostVariance_Acct,") .append(" P_TradeDiscountRec_Acct,P_TradeDiscountGrant_Acct,") - .append(" P_WIP_Acct,P_FloorStock_Acct,P_MethodChangeVariance_Acct,P_UsageVariance_Acct,P_RateVariance_Acct,") - .append(" P_MixVariance_Acct,P_Labor_Acct,P_Burden_Acct,P_CostOfProduction_Acct,P_OutsideProcessing_Acct,P_Overhead_Acct,P_Scrap_Acct") + .append(" P_RateVariance_Acct") .append(" FROM M_Product_Category_Acct pca") .append(" WHERE pca.M_Product_Category_ID=").append(p_M_Product_Category_ID) .append(" AND pca.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) @@ -101,15 +99,13 @@ public class ProductCategoryAcctCopy extends SvrProcess .append(" P_Revenue_Acct, P_Expense_Acct, P_CostAdjustment_Acct, P_InventoryClearing_Acct, P_Asset_Acct, P_CoGs_Acct,") .append(" P_PurchasePriceVariance_Acct, P_InvoicePriceVariance_Acct, P_AverageCostVariance_Acct,") .append(" P_TradeDiscountRec_Acct, P_TradeDiscountGrant_Acct, ") - .append(" P_WIP_Acct,P_FloorStock_Acct, P_MethodChangeVariance_Acct, P_UsageVariance_Acct, P_RateVariance_Acct,") - .append(" P_MixVariance_Acct, P_Labor_Acct, P_Burden_Acct, P_CostOfProduction_Acct, P_OutsideProcessing_Acct, P_Overhead_Acct, P_Scrap_Acct) ") + .append(" P_RateVariance_Acct) ") .append("SELECT p.M_Product_ID, acct.C_AcctSchema_ID,") .append(" p.AD_Client_ID, p.AD_Org_ID, 'Y', SysDate, 0, SysDate, 0,") .append(" acct.P_Revenue_Acct, acct.P_Expense_Acct, acct.P_CostAdjustment_Acct, acct.P_InventoryClearing_Acct, acct.P_Asset_Acct, acct.P_CoGs_Acct,") .append(" acct.P_PurchasePriceVariance_Acct, acct.P_InvoicePriceVariance_Acct, acct.P_AverageCostVariance_Acct,") .append(" acct.P_TradeDiscountRec_Acct, acct.P_TradeDiscountGrant_Acct, ") - .append(" acct.P_WIP_Acct, acct.P_FloorStock_Acct, acct.P_MethodChangeVariance_Acct, acct.P_UsageVariance_Acct, acct.P_RateVariance_Acct,") - .append(" acct.P_MixVariance_Acct, acct.P_Labor_Acct, acct.P_Burden_Acct, acct.P_CostOfProduction_Acct, acct.P_OutsideProcessing_Acct, acct.P_Overhead_Acct, acct.P_Scrap_Acct ") + .append(" acct.P_RateVariance_Acct ") .append("FROM M_Product p") .append(" INNER JOIN M_Product_Category_Acct acct ON (acct.M_Product_Category_ID=p.M_Product_Category_ID)") .append("WHERE acct.C_AcctSchema_ID=").append(p_C_AcctSchema_ID) // # diff --git a/org.adempiere.base/src/org/compiere/acct/DocTax.java b/org.adempiere.base/src/org/compiere/acct/DocTax.java index 6a1ee7effa..9dbe5f21d5 100644 --- a/org.adempiere.base/src/org/compiere/acct/DocTax.java +++ b/org.adempiere.base/src/org/compiere/acct/DocTax.java @@ -76,14 +76,10 @@ public final class DocTax /** Tax Due Acct */ public static final int ACCTTYPE_TaxDue = 0; - /** Tax Liability */ - public static final int ACCTTYPE_TaxLiability = 1; /** Tax Credit */ - public static final int ACCTTYPE_TaxCredit = 2; - /** Tax Receivables */ - public static final int ACCTTYPE_TaxReceivables = 3; + public static final int ACCTTYPE_TaxCredit = 1; /** Tax Expense */ - public static final int ACCTTYPE_TaxExpense = 4; + public static final int ACCTTYPE_TaxExpense = 2; /** * Get Account @@ -93,10 +89,10 @@ public final class DocTax */ public MAccount getAccount (int AcctType, MAcctSchema as) { - if (AcctType < 0 || AcctType > 4) + if (AcctType < ACCTTYPE_TaxDue || AcctType > ACCTTYPE_TaxExpense) return null; // - String sql = "SELECT T_Due_Acct, T_Liability_Acct, T_Credit_Acct, T_Receivables_Acct, T_Expense_Acct " + String sql = "SELECT T_Due_Acct, T_Credit_Acct, T_Expense_Acct " + "FROM C_Tax_Acct WHERE C_Tax_ID=? AND C_AcctSchema_ID=?"; int validCombination_ID = 0; PreparedStatement pstmt = null; @@ -108,7 +104,7 @@ public final class DocTax pstmt.setInt(2, as.getC_AcctSchema_ID()); rs = pstmt.executeQuery(); if (rs.next()) - validCombination_ID = rs.getInt(AcctType+1); // 1..5 + validCombination_ID = rs.getInt(AcctType+1); // 1..3 } catch (SQLException e) { diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java index d7e238c951..a994519eba 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_Default.java @@ -35,7 +35,7 @@ public interface I_C_AcctSchema_Default KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 2 - Client + /** AccessLevel = - Client */ BigDecimal accessLevel = BigDecimal.valueOf(2); @@ -77,21 +77,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getB_Asset_A() throws RuntimeException; - /** Column name B_Expense_Acct */ - public static final String COLUMNNAME_B_Expense_Acct = "B_Expense_Acct"; - - /** Set Bank Expense. - * Bank Expense Account - */ - public void setB_Expense_Acct (int B_Expense_Acct); - - /** Get Bank Expense. - * Bank Expense Account - */ - public int getB_Expense_Acct(); - - public I_C_ValidCombination getB_Expense_A() throws RuntimeException; - /** Column name B_InterestExp_Acct */ public static final String COLUMNNAME_B_InterestExp_Acct = "B_InterestExp_Acct"; @@ -152,66 +137,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getB_PaymentSelect_A() throws RuntimeException; - /** Column name B_RevaluationGain_Acct */ - public static final String COLUMNNAME_B_RevaluationGain_Acct = "B_RevaluationGain_Acct"; - - /** Set Bank Revaluation Gain. - * Bank Revaluation Gain Account - */ - public void setB_RevaluationGain_Acct (int B_RevaluationGain_Acct); - - /** Get Bank Revaluation Gain. - * Bank Revaluation Gain Account - */ - public int getB_RevaluationGain_Acct(); - - public I_C_ValidCombination getB_RevaluationGain_A() throws RuntimeException; - - /** Column name B_RevaluationLoss_Acct */ - public static final String COLUMNNAME_B_RevaluationLoss_Acct = "B_RevaluationLoss_Acct"; - - /** Set Bank Revaluation Loss. - * Bank Revaluation Loss Account - */ - public void setB_RevaluationLoss_Acct (int B_RevaluationLoss_Acct); - - /** Get Bank Revaluation Loss. - * Bank Revaluation Loss Account - */ - public int getB_RevaluationLoss_Acct(); - - public I_C_ValidCombination getB_RevaluationLoss_A() throws RuntimeException; - - /** Column name B_SettlementGain_Acct */ - public static final String COLUMNNAME_B_SettlementGain_Acct = "B_SettlementGain_Acct"; - - /** Set Bank Settlement Gain. - * Bank Settlement Gain Account - */ - public void setB_SettlementGain_Acct (int B_SettlementGain_Acct); - - /** Get Bank Settlement Gain. - * Bank Settlement Gain Account - */ - public int getB_SettlementGain_Acct(); - - public I_C_ValidCombination getB_SettlementGain_A() throws RuntimeException; - - /** Column name B_SettlementLoss_Acct */ - public static final String COLUMNNAME_B_SettlementLoss_Acct = "B_SettlementLoss_Acct"; - - /** Set Bank Settlement Loss. - * Bank Settlement Loss Account - */ - public void setB_SettlementLoss_Acct (int B_SettlementLoss_Acct); - - /** Get Bank Settlement Loss. - * Bank Settlement Loss Account - */ - public int getB_SettlementLoss_Acct(); - - public I_C_ValidCombination getB_SettlementLoss_A() throws RuntimeException; - /** Column name B_UnallocatedCash_Acct */ public static final String COLUMNNAME_B_UnallocatedCash_Acct = "B_UnallocatedCash_Acct"; @@ -227,21 +152,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getB_UnallocatedCash_A() throws RuntimeException; - /** Column name B_Unidentified_Acct */ - public static final String COLUMNNAME_B_Unidentified_Acct = "B_Unidentified_Acct"; - - /** Set Bank Unidentified Receipts. - * Bank Unidentified Receipts Account - */ - public void setB_Unidentified_Acct (int B_Unidentified_Acct); - - /** Get Bank Unidentified Receipts. - * Bank Unidentified Receipts Account - */ - public int getB_Unidentified_Acct(); - - public I_C_ValidCombination getB_Unidentified_A() throws RuntimeException; - /** Column name C_AcctSchema_Default_UU */ public static final String COLUMNNAME_C_AcctSchema_Default_UU = "C_AcctSchema_Default_UU"; @@ -417,36 +327,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getC_Receivable_Services_A() throws RuntimeException; - /** Column name E_Expense_Acct */ - public static final String COLUMNNAME_E_Expense_Acct = "E_Expense_Acct"; - - /** Set Employee Expense. - * Account for Employee Expenses - */ - public void setE_Expense_Acct (int E_Expense_Acct); - - /** Get Employee Expense. - * Account for Employee Expenses - */ - public int getE_Expense_Acct(); - - public I_C_ValidCombination getE_Expense_A() throws RuntimeException; - - /** Column name E_Prepayment_Acct */ - public static final String COLUMNNAME_E_Prepayment_Acct = "E_Prepayment_Acct"; - - /** Set Employee Prepayment. - * Account for Employee Expense Prepayments - */ - public void setE_Prepayment_Acct (int E_Prepayment_Acct); - - /** Get Employee Prepayment. - * Account for Employee Expense Prepayments - */ - public int getE_Prepayment_Acct(); - - public I_C_ValidCombination getE_Prepayment_A() throws RuntimeException; - /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; @@ -475,36 +355,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getNotInvoicedReceipts_A() throws RuntimeException; - /** Column name NotInvoicedReceivables_Acct */ - public static final String COLUMNNAME_NotInvoicedReceivables_Acct = "NotInvoicedReceivables_Acct"; - - /** Set Not-invoiced Receivables. - * Account for not invoiced Receivables - */ - public void setNotInvoicedReceivables_Acct (int NotInvoicedReceivables_Acct); - - /** Get Not-invoiced Receivables. - * Account for not invoiced Receivables - */ - public int getNotInvoicedReceivables_Acct(); - - public I_C_ValidCombination getNotInvoicedReceivables_A() throws RuntimeException; - - /** Column name NotInvoicedRevenue_Acct */ - public static final String COLUMNNAME_NotInvoicedRevenue_Acct = "NotInvoicedRevenue_Acct"; - - /** Set Not-invoiced Revenue. - * Account for not invoiced Revenue - */ - public void setNotInvoicedRevenue_Acct (int NotInvoicedRevenue_Acct); - - /** Get Not-invoiced Revenue. - * Account for not invoiced Revenue - */ - public int getNotInvoicedRevenue_Acct(); - - public I_C_ValidCombination getNotInvoicedRevenue_A() throws RuntimeException; - /** Column name P_Asset_Acct */ public static final String COLUMNNAME_P_Asset_Acct = "P_Asset_Acct"; @@ -565,21 +415,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getPayDiscount_Rev_A() throws RuntimeException; - /** Column name P_Burden_Acct */ - public static final String COLUMNNAME_P_Burden_Acct = "P_Burden_Acct"; - - /** Set Burden. - * The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct); - - /** Get Burden. - * The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct(); - - public I_C_ValidCombination getP_Burden_A() throws RuntimeException; - /** Column name P_COGS_Acct */ public static final String COLUMNNAME_P_COGS_Acct = "P_COGS_Acct"; @@ -610,21 +445,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getP_CostAdjustment_A() throws RuntimeException; - /** Column name P_CostOfProduction_Acct */ - public static final String COLUMNNAME_P_CostOfProduction_Acct = "P_CostOfProduction_Acct"; - - /** Set Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct); - - /** Get Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct(); - - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException; - /** Column name P_Expense_Acct */ public static final String COLUMNNAME_P_Expense_Acct = "P_Expense_Acct"; @@ -640,21 +460,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getP_Expense_A() throws RuntimeException; - /** Column name P_FloorStock_Acct */ - public static final String COLUMNNAME_P_FloorStock_Acct = "P_FloorStock_Acct"; - - /** Set Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct); - - /** Get Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct(); - - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException; - /** Column name P_InventoryClearing_Acct */ public static final String COLUMNNAME_P_InventoryClearing_Acct = "P_InventoryClearing_Acct"; @@ -715,81 +520,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getPJ_WIP_A() throws RuntimeException; - /** Column name P_Labor_Acct */ - public static final String COLUMNNAME_P_Labor_Acct = "P_Labor_Acct"; - - /** Set Labor. - * The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct); - - /** Get Labor. - * The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct(); - - public I_C_ValidCombination getP_Labor_A() throws RuntimeException; - - /** Column name P_MethodChangeVariance_Acct */ - public static final String COLUMNNAME_P_MethodChangeVariance_Acct = "P_MethodChangeVariance_Acct"; - - /** Set Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct); - - /** Get Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct(); - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException; - - /** Column name P_MixVariance_Acct */ - public static final String COLUMNNAME_P_MixVariance_Acct = "P_MixVariance_Acct"; - - /** Set Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct); - - /** Get Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct(); - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException; - - /** Column name P_OutsideProcessing_Acct */ - public static final String COLUMNNAME_P_OutsideProcessing_Acct = "P_OutsideProcessing_Acct"; - - /** Set Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct); - - /** Get Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct(); - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException; - - /** Column name P_Overhead_Acct */ - public static final String COLUMNNAME_P_Overhead_Acct = "P_Overhead_Acct"; - - /** Set Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct); - - /** Get Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct(); - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException; - /** Column name P_PurchasePriceVariance_Acct */ public static final String COLUMNNAME_P_PurchasePriceVariance_Acct = "P_PurchasePriceVariance_Acct"; @@ -844,21 +574,6 @@ public interface I_C_AcctSchema_Default /** Get Process Now */ public boolean isProcessing(); - /** Column name P_Scrap_Acct */ - public static final String COLUMNNAME_P_Scrap_Acct = "P_Scrap_Acct"; - - /** Set Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct); - - /** Get Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct(); - - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException; - /** Column name P_TradeDiscountGrant_Acct */ public static final String COLUMNNAME_P_TradeDiscountGrant_Acct = "P_TradeDiscountGrant_Acct"; @@ -889,36 +604,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getP_TradeDiscountRec_A() throws RuntimeException; - /** Column name P_UsageVariance_Acct */ - public static final String COLUMNNAME_P_UsageVariance_Acct = "P_UsageVariance_Acct"; - - /** Set Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct); - - /** Get Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct(); - - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException; - - /** Column name P_WIP_Acct */ - public static final String COLUMNNAME_P_WIP_Acct = "P_WIP_Acct"; - - /** Set Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct); - - /** Get Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct(); - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException; - /** Column name RealizedGain_Acct */ public static final String COLUMNNAME_RealizedGain_Acct = "RealizedGain_Acct"; @@ -994,36 +679,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getT_Expense_A() throws RuntimeException; - /** Column name T_Liability_Acct */ - public static final String COLUMNNAME_T_Liability_Acct = "T_Liability_Acct"; - - /** Set Tax Liability. - * Account for Tax declaration liability - */ - public void setT_Liability_Acct (int T_Liability_Acct); - - /** Get Tax Liability. - * Account for Tax declaration liability - */ - public int getT_Liability_Acct(); - - public I_C_ValidCombination getT_Liability_A() throws RuntimeException; - - /** Column name T_Receivables_Acct */ - public static final String COLUMNNAME_T_Receivables_Acct = "T_Receivables_Acct"; - - /** Set Tax Receivables. - * Account for Tax credit after tax declaration - */ - public void setT_Receivables_Acct (int T_Receivables_Acct); - - /** Get Tax Receivables. - * Account for Tax credit after tax declaration - */ - public int getT_Receivables_Acct(); - - public I_C_ValidCombination getT_Receivables_A() throws RuntimeException; - /** Column name UnEarnedRevenue_Acct */ public static final String COLUMNNAME_UnEarnedRevenue_Acct = "UnEarnedRevenue_Acct"; @@ -1145,66 +800,6 @@ public interface I_C_AcctSchema_Default public I_C_ValidCombination getW_Differences_A() throws RuntimeException; - /** Column name W_InvActualAdjust_Acct */ - public static final String COLUMNNAME_W_InvActualAdjust_Acct = "W_InvActualAdjust_Acct"; - - /** Set Inventory Adjustment. - * Account for Inventory value adjustments for Actual Costing - */ - public void setW_InvActualAdjust_Acct (int W_InvActualAdjust_Acct); - - /** Get Inventory Adjustment. - * Account for Inventory value adjustments for Actual Costing - */ - public int getW_InvActualAdjust_Acct(); - - public I_C_ValidCombination getW_InvActualAdjust_A() throws RuntimeException; - - /** Column name W_Inventory_Acct */ - public static final String COLUMNNAME_W_Inventory_Acct = "W_Inventory_Acct"; - - /** Set (Not Used). - * Warehouse Inventory Asset Account - Currently not used - */ - public void setW_Inventory_Acct (int W_Inventory_Acct); - - /** Get (Not Used). - * Warehouse Inventory Asset Account - Currently not used - */ - public int getW_Inventory_Acct(); - - public I_C_ValidCombination getW_Inventory_A() throws RuntimeException; - - /** Column name Withholding_Acct */ - public static final String COLUMNNAME_Withholding_Acct = "Withholding_Acct"; - - /** Set Withholding. - * Account for Withholdings - */ - public void setWithholding_Acct (int Withholding_Acct); - - /** Get Withholding. - * Account for Withholdings - */ - public int getWithholding_Acct(); - - public I_C_ValidCombination getWithholding_A() throws RuntimeException; - - /** Column name W_Revaluation_Acct */ - public static final String COLUMNNAME_W_Revaluation_Acct = "W_Revaluation_Acct"; - - /** Set Inventory Revaluation. - * Account for Inventory Revaluation - */ - public void setW_Revaluation_Acct (int W_Revaluation_Acct); - - /** Get Inventory Revaluation. - * Account for Inventory Revaluation - */ - public int getW_Revaluation_Acct(); - - public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException; - /** Column name WriteOff_Acct */ public static final String COLUMNNAME_WriteOff_Acct = "WriteOff_Acct"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java index a989f4228d..02b9784dd6 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_AcctSchema_GL.java @@ -31,11 +31,11 @@ public interface I_C_AcctSchema_GL public static final String Table_Name = "C_AcctSchema_GL"; /** AD_Table_ID=266 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 266; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 2 - Client + /** AccessLevel = - Client */ BigDecimal accessLevel = BigDecimal.valueOf(2); @@ -62,6 +62,15 @@ public interface I_C_AcctSchema_GL */ public int getAD_Org_ID(); + /** Column name C_AcctSchema_GL_UU */ + public static final String COLUMNNAME_C_AcctSchema_GL_UU = "C_AcctSchema_GL_UU"; + + /** Set C_AcctSchema_GL_UU */ + public void setC_AcctSchema_GL_UU (String C_AcctSchema_GL_UU); + + /** Get C_AcctSchema_GL_UU */ + public String getC_AcctSchema_GL_UU(); + /** Column name C_AcctSchema_ID */ public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID"; @@ -75,7 +84,7 @@ public interface I_C_AcctSchema_GL */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name CommitmentOffset_Acct */ public static final String COLUMNNAME_CommitmentOffset_Acct = "CommitmentOffset_Acct"; @@ -138,21 +147,6 @@ public interface I_C_AcctSchema_GL public I_C_ValidCombination getCurrencyBalancing_A() throws RuntimeException; - /** Column name IncomeSummary_Acct */ - public static final String COLUMNNAME_IncomeSummary_Acct = "IncomeSummary_Acct"; - - /** Set Income Summary Acct. - * Income Summary Account - */ - public void setIncomeSummary_Acct (int IncomeSummary_Acct); - - /** Get Income Summary Acct. - * Income Summary Account - */ - public int getIncomeSummary_Acct(); - - public I_C_ValidCombination getIncomeSummary_A() throws RuntimeException; - /** Column name IntercompanyDueFrom_Acct */ public static final String COLUMNNAME_IntercompanyDueFrom_Acct = "IntercompanyDueFrom_Acct"; @@ -211,17 +205,6 @@ public interface I_C_AcctSchema_GL public I_C_ValidCombination getPPVOffset_A() throws RuntimeException; - /** Column name RetainedEarning_Acct */ - public static final String COLUMNNAME_RetainedEarning_Acct = "RetainedEarning_Acct"; - - /** Set Retained Earning Acct */ - public void setRetainedEarning_Acct (int RetainedEarning_Acct); - - /** Get Retained Earning Acct */ - public int getRetainedEarning_Acct(); - - public I_C_ValidCombination getRetainedEarning_A() throws RuntimeException; - /** Column name SuspenseBalancing_Acct */ public static final String COLUMNNAME_SuspenseBalancing_Acct = "SuspenseBalancing_Acct"; @@ -233,17 +216,6 @@ public interface I_C_AcctSchema_GL public I_C_ValidCombination getSuspenseBalancing_A() throws RuntimeException; - /** Column name SuspenseError_Acct */ - public static final String COLUMNNAME_SuspenseError_Acct = "SuspenseError_Acct"; - - /** Set Suspense Error Acct */ - public void setSuspenseError_Acct (int SuspenseError_Acct); - - /** Get Suspense Error Acct */ - public int getSuspenseError_Acct(); - - public I_C_ValidCombination getSuspenseError_A() throws RuntimeException; - /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java index 2f06d88403..ccb98f5fbf 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Employee_Acct.java @@ -31,11 +31,11 @@ public interface I_C_BP_Employee_Acct public static final String Table_Name = "C_BP_Employee_Acct"; /** AD_Table_ID=184 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 184; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,7 @@ public interface I_C_BP_Employee_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name C_BPartner_ID */ public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID"; @@ -90,7 +90,16 @@ public interface I_C_BP_Employee_Acct */ public int getC_BPartner_ID(); - public I_C_BPartner getC_BPartner() throws RuntimeException; + public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException; + + /** Column name C_BP_Employee_Acct_UU */ + public static final String COLUMNNAME_C_BP_Employee_Acct_UU = "C_BP_Employee_Acct_UU"; + + /** Set C_BP_Employee_Acct_UU */ + public void setC_BP_Employee_Acct_UU (String C_BP_Employee_Acct_UU); + + /** Get C_BP_Employee_Acct_UU */ + public String getC_BP_Employee_Acct_UU(); /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -108,36 +117,6 @@ public interface I_C_BP_Employee_Acct */ public int getCreatedBy(); - /** Column name E_Expense_Acct */ - public static final String COLUMNNAME_E_Expense_Acct = "E_Expense_Acct"; - - /** Set Employee Expense. - * Account for Employee Expenses - */ - public void setE_Expense_Acct (int E_Expense_Acct); - - /** Get Employee Expense. - * Account for Employee Expenses - */ - public int getE_Expense_Acct(); - - public I_C_ValidCombination getE_Expense_A() throws RuntimeException; - - /** Column name E_Prepayment_Acct */ - public static final String COLUMNNAME_E_Prepayment_Acct = "E_Prepayment_Acct"; - - /** Set Employee Prepayment. - * Account for Employee Expense Prepayments - */ - public void setE_Prepayment_Acct (int E_Prepayment_Acct); - - /** Get Employee Prepayment. - * Account for Employee Expense Prepayments - */ - public int getE_Prepayment_Acct(); - - public I_C_ValidCombination getE_Prepayment_A() throws RuntimeException; - /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java index ef91291393..929e0a7fd9 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_BP_Group_Acct.java @@ -31,11 +31,11 @@ public interface I_C_BP_Group_Acct public static final String Table_Name = "C_BP_Group_Acct"; /** AD_Table_ID=395 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 395; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,16 @@ public interface I_C_BP_Group_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + + /** Column name C_BP_Group_Acct_UU */ + public static final String COLUMNNAME_C_BP_Group_Acct_UU = "C_BP_Group_Acct_UU"; + + /** Set C_BP_Group_Acct_UU */ + public void setC_BP_Group_Acct_UU (String C_BP_Group_Acct_UU); + + /** Get C_BP_Group_Acct_UU */ + public String getC_BP_Group_Acct_UU(); /** Column name C_BP_Group_ID */ public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID"; @@ -90,7 +99,7 @@ public interface I_C_BP_Group_Acct */ public int getC_BP_Group_ID(); - public I_C_BP_Group getC_BP_Group() throws RuntimeException; + public org.compiere.model.I_C_BP_Group getC_BP_Group() throws RuntimeException; /** Column name C_Prepayment_Acct */ public static final String COLUMNNAME_C_Prepayment_Acct = "C_Prepayment_Acct"; @@ -181,36 +190,6 @@ public interface I_C_BP_Group_Acct public I_C_ValidCombination getNotInvoicedReceipts_A() throws RuntimeException; - /** Column name NotInvoicedReceivables_Acct */ - public static final String COLUMNNAME_NotInvoicedReceivables_Acct = "NotInvoicedReceivables_Acct"; - - /** Set Not-invoiced Receivables. - * Account for not invoiced Receivables - */ - public void setNotInvoicedReceivables_Acct (int NotInvoicedReceivables_Acct); - - /** Get Not-invoiced Receivables. - * Account for not invoiced Receivables - */ - public int getNotInvoicedReceivables_Acct(); - - public I_C_ValidCombination getNotInvoicedReceivables_A() throws RuntimeException; - - /** Column name NotInvoicedRevenue_Acct */ - public static final String COLUMNNAME_NotInvoicedRevenue_Acct = "NotInvoicedRevenue_Acct"; - - /** Set Not-invoiced Revenue. - * Account for not invoiced Revenue - */ - public void setNotInvoicedRevenue_Acct (int NotInvoicedRevenue_Acct); - - /** Get Not-invoiced Revenue. - * Account for not invoiced Revenue - */ - public int getNotInvoicedRevenue_Acct(); - - public I_C_ValidCombination getNotInvoicedRevenue_A() throws RuntimeException; - /** Column name PayDiscount_Exp_Acct */ public static final String COLUMNNAME_PayDiscount_Exp_Acct = "PayDiscount_Exp_Acct"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java index 56d0bf87c8..eac085b167 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_BankAccount_Acct.java @@ -31,11 +31,11 @@ public interface I_C_BankAccount_Acct public static final String Table_Name = "C_BankAccount_Acct"; /** AD_Table_ID=391 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 391; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -77,21 +77,6 @@ public interface I_C_BankAccount_Acct public I_C_ValidCombination getB_Asset_A() throws RuntimeException; - /** Column name B_Expense_Acct */ - public static final String COLUMNNAME_B_Expense_Acct = "B_Expense_Acct"; - - /** Set Bank Expense. - * Bank Expense Account - */ - public void setB_Expense_Acct (int B_Expense_Acct); - - /** Get Bank Expense. - * Bank Expense Account - */ - public int getB_Expense_Acct(); - - public I_C_ValidCombination getB_Expense_A() throws RuntimeException; - /** Column name B_InterestExp_Acct */ public static final String COLUMNNAME_B_InterestExp_Acct = "B_InterestExp_Acct"; @@ -152,66 +137,6 @@ public interface I_C_BankAccount_Acct public I_C_ValidCombination getB_PaymentSelect_A() throws RuntimeException; - /** Column name B_RevaluationGain_Acct */ - public static final String COLUMNNAME_B_RevaluationGain_Acct = "B_RevaluationGain_Acct"; - - /** Set Bank Revaluation Gain. - * Bank Revaluation Gain Account - */ - public void setB_RevaluationGain_Acct (int B_RevaluationGain_Acct); - - /** Get Bank Revaluation Gain. - * Bank Revaluation Gain Account - */ - public int getB_RevaluationGain_Acct(); - - public I_C_ValidCombination getB_RevaluationGain_A() throws RuntimeException; - - /** Column name B_RevaluationLoss_Acct */ - public static final String COLUMNNAME_B_RevaluationLoss_Acct = "B_RevaluationLoss_Acct"; - - /** Set Bank Revaluation Loss. - * Bank Revaluation Loss Account - */ - public void setB_RevaluationLoss_Acct (int B_RevaluationLoss_Acct); - - /** Get Bank Revaluation Loss. - * Bank Revaluation Loss Account - */ - public int getB_RevaluationLoss_Acct(); - - public I_C_ValidCombination getB_RevaluationLoss_A() throws RuntimeException; - - /** Column name B_SettlementGain_Acct */ - public static final String COLUMNNAME_B_SettlementGain_Acct = "B_SettlementGain_Acct"; - - /** Set Bank Settlement Gain. - * Bank Settlement Gain Account - */ - public void setB_SettlementGain_Acct (int B_SettlementGain_Acct); - - /** Get Bank Settlement Gain. - * Bank Settlement Gain Account - */ - public int getB_SettlementGain_Acct(); - - public I_C_ValidCombination getB_SettlementGain_A() throws RuntimeException; - - /** Column name B_SettlementLoss_Acct */ - public static final String COLUMNNAME_B_SettlementLoss_Acct = "B_SettlementLoss_Acct"; - - /** Set Bank Settlement Loss. - * Bank Settlement Loss Account - */ - public void setB_SettlementLoss_Acct (int B_SettlementLoss_Acct); - - /** Get Bank Settlement Loss. - * Bank Settlement Loss Account - */ - public int getB_SettlementLoss_Acct(); - - public I_C_ValidCombination getB_SettlementLoss_A() throws RuntimeException; - /** Column name B_UnallocatedCash_Acct */ public static final String COLUMNNAME_B_UnallocatedCash_Acct = "B_UnallocatedCash_Acct"; @@ -227,21 +152,6 @@ public interface I_C_BankAccount_Acct public I_C_ValidCombination getB_UnallocatedCash_A() throws RuntimeException; - /** Column name B_Unidentified_Acct */ - public static final String COLUMNNAME_B_Unidentified_Acct = "B_Unidentified_Acct"; - - /** Set Bank Unidentified Receipts. - * Bank Unidentified Receipts Account - */ - public void setB_Unidentified_Acct (int B_Unidentified_Acct); - - /** Get Bank Unidentified Receipts. - * Bank Unidentified Receipts Account - */ - public int getB_Unidentified_Acct(); - - public I_C_ValidCombination getB_Unidentified_A() throws RuntimeException; - /** Column name C_AcctSchema_ID */ public static final String COLUMNNAME_C_AcctSchema_ID = "C_AcctSchema_ID"; @@ -255,7 +165,16 @@ public interface I_C_BankAccount_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + + /** Column name C_BankAccount_Acct_UU */ + public static final String COLUMNNAME_C_BankAccount_Acct_UU = "C_BankAccount_Acct_UU"; + + /** Set C_BankAccount_Acct_UU */ + public void setC_BankAccount_Acct_UU (String C_BankAccount_Acct_UU); + + /** Get C_BankAccount_Acct_UU */ + public String getC_BankAccount_Acct_UU(); /** Column name C_BankAccount_ID */ public static final String COLUMNNAME_C_BankAccount_ID = "C_BankAccount_ID"; @@ -270,7 +189,7 @@ public interface I_C_BankAccount_Acct */ public int getC_BankAccount_ID(); - public I_C_BankAccount getC_BankAccount() throws RuntimeException; + public org.compiere.model.I_C_BankAccount getC_BankAccount() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java index a2e2a523a1..b0b18865a4 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_Currency_Acct.java @@ -31,11 +31,11 @@ public interface I_C_Currency_Acct public static final String Table_Name = "C_Currency_Acct"; /** AD_Table_ID=638 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 638; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,16 @@ public interface I_C_Currency_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + + /** Column name C_Currency_Acct_UU */ + public static final String COLUMNNAME_C_Currency_Acct_UU = "C_Currency_Acct_UU"; + + /** Set C_Currency_Acct_UU */ + public void setC_Currency_Acct_UU (String C_Currency_Acct_UU); + + /** Get C_Currency_Acct_UU */ + public String getC_Currency_Acct_UU(); /** Column name C_Currency_ID */ public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID"; @@ -90,7 +99,7 @@ public interface I_C_Currency_Acct */ public int getC_Currency_ID(); - public I_C_Currency getC_Currency() throws RuntimeException; + public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -121,66 +130,6 @@ public interface I_C_Currency_Acct */ public boolean isActive(); - /** Column name RealizedGain_Acct */ - public static final String COLUMNNAME_RealizedGain_Acct = "RealizedGain_Acct"; - - /** Set Realized Gain Acct. - * Realized Gain Account - */ - public void setRealizedGain_Acct (int RealizedGain_Acct); - - /** Get Realized Gain Acct. - * Realized Gain Account - */ - public int getRealizedGain_Acct(); - - public I_C_ValidCombination getRealizedGain_A() throws RuntimeException; - - /** Column name RealizedLoss_Acct */ - public static final String COLUMNNAME_RealizedLoss_Acct = "RealizedLoss_Acct"; - - /** Set Realized Loss Acct. - * Realized Loss Account - */ - public void setRealizedLoss_Acct (int RealizedLoss_Acct); - - /** Get Realized Loss Acct. - * Realized Loss Account - */ - public int getRealizedLoss_Acct(); - - public I_C_ValidCombination getRealizedLoss_A() throws RuntimeException; - - /** Column name UnrealizedGain_Acct */ - public static final String COLUMNNAME_UnrealizedGain_Acct = "UnrealizedGain_Acct"; - - /** Set Unrealized Gain Acct. - * Unrealized Gain Account for currency revaluation - */ - public void setUnrealizedGain_Acct (int UnrealizedGain_Acct); - - /** Get Unrealized Gain Acct. - * Unrealized Gain Account for currency revaluation - */ - public int getUnrealizedGain_Acct(); - - public I_C_ValidCombination getUnrealizedGain_A() throws RuntimeException; - - /** Column name UnrealizedLoss_Acct */ - public static final String COLUMNNAME_UnrealizedLoss_Acct = "UnrealizedLoss_Acct"; - - /** Set Unrealized Loss Acct. - * Unrealized Loss Account for currency revaluation - */ - public void setUnrealizedLoss_Acct (int UnrealizedLoss_Acct); - - /** Get Unrealized Loss Acct. - * Unrealized Loss Account for currency revaluation - */ - public int getUnrealizedLoss_Acct(); - - public I_C_ValidCombination getUnrealizedLoss_A() throws RuntimeException; - /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java index 203f525027..fe731ac0b7 100644 --- a/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_C_Tax_Acct.java @@ -31,11 +31,11 @@ public interface I_C_Tax_Acct public static final String Table_Name = "C_Tax_Acct"; /** AD_Table_ID=399 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 399; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,7 @@ public interface I_C_Tax_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -93,6 +93,15 @@ public interface I_C_Tax_Acct */ public int getCreatedBy(); + /** Column name C_Tax_Acct_UU */ + public static final String COLUMNNAME_C_Tax_Acct_UU = "C_Tax_Acct_UU"; + + /** Set C_Tax_Acct_UU */ + public void setC_Tax_Acct_UU (String C_Tax_Acct_UU); + + /** Get C_Tax_Acct_UU */ + public String getC_Tax_Acct_UU(); + /** Column name C_Tax_ID */ public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID"; @@ -106,7 +115,7 @@ public interface I_C_Tax_Acct */ public int getC_Tax_ID(); - public I_C_Tax getC_Tax() throws RuntimeException; + public org.compiere.model.I_C_Tax getC_Tax() throws RuntimeException; /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; @@ -166,36 +175,6 @@ public interface I_C_Tax_Acct public I_C_ValidCombination getT_Expense_A() throws RuntimeException; - /** Column name T_Liability_Acct */ - public static final String COLUMNNAME_T_Liability_Acct = "T_Liability_Acct"; - - /** Set Tax Liability. - * Account for Tax declaration liability - */ - public void setT_Liability_Acct (int T_Liability_Acct); - - /** Get Tax Liability. - * Account for Tax declaration liability - */ - public int getT_Liability_Acct(); - - public I_C_ValidCombination getT_Liability_A() throws RuntimeException; - - /** Column name T_Receivables_Acct */ - public static final String COLUMNNAME_T_Receivables_Acct = "T_Receivables_Acct"; - - /** Set Tax Receivables. - * Account for Tax credit after tax declaration - */ - public void setT_Receivables_Acct (int T_Receivables_Acct); - - /** Get Tax Receivables. - * Account for Tax credit after tax declaration - */ - public int getT_Receivables_Acct(); - - public I_C_ValidCombination getT_Receivables_A() throws RuntimeException; - /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java index a54b140ff9..affb5e75e1 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_Acct.java @@ -31,11 +31,11 @@ public interface I_M_Product_Acct public static final String Table_Name = "M_Product_Acct"; /** AD_Table_ID=273 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 273; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,7 @@ public interface I_M_Product_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -106,6 +106,15 @@ public interface I_M_Product_Acct */ public boolean isActive(); + /** Column name M_Product_Acct_UU */ + public static final String COLUMNNAME_M_Product_Acct_UU = "M_Product_Acct_UU"; + + /** Set M_Product_Acct_UU */ + public void setM_Product_Acct_UU (String M_Product_Acct_UU); + + /** Get M_Product_Acct_UU */ + public String getM_Product_Acct_UU(); + /** Column name M_Product_ID */ public static final String COLUMNNAME_M_Product_ID = "M_Product_ID"; @@ -119,7 +128,7 @@ public interface I_M_Product_Acct */ public int getM_Product_ID(); - public I_M_Product getM_Product() throws RuntimeException; + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException; /** Column name P_Asset_Acct */ public static final String COLUMNNAME_P_Asset_Acct = "P_Asset_Acct"; @@ -151,21 +160,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_AverageCostVariance_A() throws RuntimeException; - /** Column name P_Burden_Acct */ - public static final String COLUMNNAME_P_Burden_Acct = "P_Burden_Acct"; - - /** Set Burden. - * The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct); - - /** Get Burden. - * The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct(); - - public I_C_ValidCombination getP_Burden_A() throws RuntimeException; - /** Column name P_COGS_Acct */ public static final String COLUMNNAME_P_COGS_Acct = "P_COGS_Acct"; @@ -196,21 +190,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_CostAdjustment_A() throws RuntimeException; - /** Column name P_CostOfProduction_Acct */ - public static final String COLUMNNAME_P_CostOfProduction_Acct = "P_CostOfProduction_Acct"; - - /** Set Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct); - - /** Get Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct(); - - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException; - /** Column name P_Expense_Acct */ public static final String COLUMNNAME_P_Expense_Acct = "P_Expense_Acct"; @@ -226,21 +205,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_Expense_A() throws RuntimeException; - /** Column name P_FloorStock_Acct */ - public static final String COLUMNNAME_P_FloorStock_Acct = "P_FloorStock_Acct"; - - /** Set Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct); - - /** Get Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct(); - - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException; - /** Column name P_InventoryClearing_Acct */ public static final String COLUMNNAME_P_InventoryClearing_Acct = "P_InventoryClearing_Acct"; @@ -271,81 +235,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_InvoicePriceVariance_A() throws RuntimeException; - /** Column name P_Labor_Acct */ - public static final String COLUMNNAME_P_Labor_Acct = "P_Labor_Acct"; - - /** Set Labor. - * The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct); - - /** Get Labor. - * The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct(); - - public I_C_ValidCombination getP_Labor_A() throws RuntimeException; - - /** Column name P_MethodChangeVariance_Acct */ - public static final String COLUMNNAME_P_MethodChangeVariance_Acct = "P_MethodChangeVariance_Acct"; - - /** Set Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct); - - /** Get Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct(); - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException; - - /** Column name P_MixVariance_Acct */ - public static final String COLUMNNAME_P_MixVariance_Acct = "P_MixVariance_Acct"; - - /** Set Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct); - - /** Get Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct(); - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException; - - /** Column name P_OutsideProcessing_Acct */ - public static final String COLUMNNAME_P_OutsideProcessing_Acct = "P_OutsideProcessing_Acct"; - - /** Set Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct); - - /** Get Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct(); - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException; - - /** Column name P_Overhead_Acct */ - public static final String COLUMNNAME_P_Overhead_Acct = "P_Overhead_Acct"; - - /** Set Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct); - - /** Get Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct(); - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException; - /** Column name P_PurchasePriceVariance_Acct */ public static final String COLUMNNAME_P_PurchasePriceVariance_Acct = "P_PurchasePriceVariance_Acct"; @@ -391,21 +280,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_Revenue_A() throws RuntimeException; - /** Column name P_Scrap_Acct */ - public static final String COLUMNNAME_P_Scrap_Acct = "P_Scrap_Acct"; - - /** Set Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct); - - /** Get Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct(); - - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException; - /** Column name P_TradeDiscountGrant_Acct */ public static final String COLUMNNAME_P_TradeDiscountGrant_Acct = "P_TradeDiscountGrant_Acct"; @@ -436,36 +310,6 @@ public interface I_M_Product_Acct public I_C_ValidCombination getP_TradeDiscountRec_A() throws RuntimeException; - /** Column name P_UsageVariance_Acct */ - public static final String COLUMNNAME_P_UsageVariance_Acct = "P_UsageVariance_Acct"; - - /** Set Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct); - - /** Get Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct(); - - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException; - - /** Column name P_WIP_Acct */ - public static final String COLUMNNAME_P_WIP_Acct = "P_WIP_Acct"; - - /** Set Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct); - - /** Get Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct(); - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException; - /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java index 29b7f9a807..37bf89c489 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Product_Category_Acct.java @@ -31,11 +31,11 @@ public interface I_M_Product_Category_Acct public static final String Table_Name = "M_Product_Category_Acct"; /** AD_Table_ID=401 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 401; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,7 @@ public interface I_M_Product_Category_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name CostingLevel */ public static final String COLUMNNAME_CostingLevel = "CostingLevel"; @@ -132,6 +132,15 @@ public interface I_M_Product_Category_Acct */ public boolean isActive(); + /** Column name M_Product_Category_Acct_UU */ + public static final String COLUMNNAME_M_Product_Category_Acct_UU = "M_Product_Category_Acct_UU"; + + /** Set M_Product_Category_Acct_UU */ + public void setM_Product_Category_Acct_UU (String M_Product_Category_Acct_UU); + + /** Get M_Product_Category_Acct_UU */ + public String getM_Product_Category_Acct_UU(); + /** Column name M_Product_Category_ID */ public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID"; @@ -145,7 +154,7 @@ public interface I_M_Product_Category_Acct */ public int getM_Product_Category_ID(); - public I_M_Product_Category getM_Product_Category() throws RuntimeException; + public org.compiere.model.I_M_Product_Category getM_Product_Category() throws RuntimeException; /** Column name P_Asset_Acct */ public static final String COLUMNNAME_P_Asset_Acct = "P_Asset_Acct"; @@ -177,21 +186,6 @@ public interface I_M_Product_Category_Acct public I_C_ValidCombination getP_AverageCostVariance_A() throws RuntimeException; - /** Column name P_Burden_Acct */ - public static final String COLUMNNAME_P_Burden_Acct = "P_Burden_Acct"; - - /** Set Burden. - * The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct); - - /** Get Burden. - * The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct(); - - public I_C_ValidCombination getP_Burden_A() throws RuntimeException; - /** Column name P_COGS_Acct */ public static final String COLUMNNAME_P_COGS_Acct = "P_COGS_Acct"; @@ -222,21 +216,6 @@ public interface I_M_Product_Category_Acct public I_C_ValidCombination getP_CostAdjustment_A() throws RuntimeException; - /** Column name P_CostOfProduction_Acct */ - public static final String COLUMNNAME_P_CostOfProduction_Acct = "P_CostOfProduction_Acct"; - - /** Set Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct); - - /** Get Cost Of Production. - * The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct(); - - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException; - /** Column name P_Expense_Acct */ public static final String COLUMNNAME_P_Expense_Acct = "P_Expense_Acct"; @@ -252,21 +231,6 @@ public interface I_M_Product_Category_Acct public I_C_ValidCombination getP_Expense_A() throws RuntimeException; - /** Column name P_FloorStock_Acct */ - public static final String COLUMNNAME_P_FloorStock_Acct = "P_FloorStock_Acct"; - - /** Set Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct); - - /** Get Floor Stock. - * The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct(); - - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException; - /** Column name P_InventoryClearing_Acct */ public static final String COLUMNNAME_P_InventoryClearing_Acct = "P_InventoryClearing_Acct"; @@ -297,81 +261,6 @@ public interface I_M_Product_Category_Acct public I_C_ValidCombination getP_InvoicePriceVariance_A() throws RuntimeException; - /** Column name P_Labor_Acct */ - public static final String COLUMNNAME_P_Labor_Acct = "P_Labor_Acct"; - - /** Set Labor. - * The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct); - - /** Get Labor. - * The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct(); - - public I_C_ValidCombination getP_Labor_A() throws RuntimeException; - - /** Column name P_MethodChangeVariance_Acct */ - public static final String COLUMNNAME_P_MethodChangeVariance_Acct = "P_MethodChangeVariance_Acct"; - - /** Set Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct); - - /** Get Method Change Variance. - * The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct(); - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException; - - /** Column name P_MixVariance_Acct */ - public static final String COLUMNNAME_P_MixVariance_Acct = "P_MixVariance_Acct"; - - /** Set Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct); - - /** Get Mix Variance. - * The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct(); - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException; - - /** Column name P_OutsideProcessing_Acct */ - public static final String COLUMNNAME_P_OutsideProcessing_Acct = "P_OutsideProcessing_Acct"; - - /** Set Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct); - - /** Get Outside Processing. - * The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct(); - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException; - - /** Column name P_Overhead_Acct */ - public static final String COLUMNNAME_P_Overhead_Acct = "P_Overhead_Acct"; - - /** Set Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct); - - /** Get Overhead. - * The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct(); - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException; - /** Column name P_PurchasePriceVariance_Acct */ public static final String COLUMNNAME_P_PurchasePriceVariance_Acct = "P_PurchasePriceVariance_Acct"; @@ -426,21 +315,6 @@ public interface I_M_Product_Category_Acct /** Get Process Now */ public boolean isProcessing(); - /** Column name P_Scrap_Acct */ - public static final String COLUMNNAME_P_Scrap_Acct = "P_Scrap_Acct"; - - /** Set Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct); - - /** Get Scrap. - * The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct(); - - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException; - /** Column name P_TradeDiscountGrant_Acct */ public static final String COLUMNNAME_P_TradeDiscountGrant_Acct = "P_TradeDiscountGrant_Acct"; @@ -471,36 +345,6 @@ public interface I_M_Product_Category_Acct public I_C_ValidCombination getP_TradeDiscountRec_A() throws RuntimeException; - /** Column name P_UsageVariance_Acct */ - public static final String COLUMNNAME_P_UsageVariance_Acct = "P_UsageVariance_Acct"; - - /** Set Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct); - - /** Get Usage Variance. - * The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct(); - - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException; - - /** Column name P_WIP_Acct */ - public static final String COLUMNNAME_P_WIP_Acct = "P_WIP_Acct"; - - /** Set Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct); - - /** Get Work In Process. - * The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct(); - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException; - /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; diff --git a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java index 4b43c0a448..8e1daa9631 100644 --- a/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/I_M_Warehouse_Acct.java @@ -31,11 +31,11 @@ public interface I_M_Warehouse_Acct public static final String Table_Name = "M_Warehouse_Acct"; /** AD_Table_ID=191 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + public static final int Table_ID = 191; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = - Client - Org */ BigDecimal accessLevel = BigDecimal.valueOf(3); @@ -75,7 +75,7 @@ public interface I_M_Warehouse_Acct */ public int getC_AcctSchema_ID(); - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException; + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException; /** Column name Created */ public static final String COLUMNNAME_Created = "Created"; @@ -106,6 +106,15 @@ public interface I_M_Warehouse_Acct */ public boolean isActive(); + /** Column name M_Warehouse_Acct_UU */ + public static final String COLUMNNAME_M_Warehouse_Acct_UU = "M_Warehouse_Acct_UU"; + + /** Set M_Warehouse_Acct_UU */ + public void setM_Warehouse_Acct_UU (String M_Warehouse_Acct_UU); + + /** Get M_Warehouse_Acct_UU */ + public String getM_Warehouse_Acct_UU(); + /** Column name M_Warehouse_ID */ public static final String COLUMNNAME_M_Warehouse_ID = "M_Warehouse_ID"; @@ -119,7 +128,7 @@ public interface I_M_Warehouse_Acct */ public int getM_Warehouse_ID(); - public I_M_Warehouse getM_Warehouse() throws RuntimeException; + public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException; /** Column name Updated */ public static final String COLUMNNAME_Updated = "Updated"; @@ -151,49 +160,4 @@ public interface I_M_Warehouse_Acct public int getW_Differences_Acct(); public I_C_ValidCombination getW_Differences_A() throws RuntimeException; - - /** Column name W_InvActualAdjust_Acct */ - public static final String COLUMNNAME_W_InvActualAdjust_Acct = "W_InvActualAdjust_Acct"; - - /** Set Inventory Adjustment. - * Account for Inventory value adjustments for Actual Costing - */ - public void setW_InvActualAdjust_Acct (int W_InvActualAdjust_Acct); - - /** Get Inventory Adjustment. - * Account for Inventory value adjustments for Actual Costing - */ - public int getW_InvActualAdjust_Acct(); - - public I_C_ValidCombination getW_InvActualAdjust_A() throws RuntimeException; - - /** Column name W_Inventory_Acct */ - public static final String COLUMNNAME_W_Inventory_Acct = "W_Inventory_Acct"; - - /** Set (Not Used). - * Warehouse Inventory Asset Account - Currently not used - */ - public void setW_Inventory_Acct (int W_Inventory_Acct); - - /** Get (Not Used). - * Warehouse Inventory Asset Account - Currently not used - */ - public int getW_Inventory_Acct(); - - public I_C_ValidCombination getW_Inventory_A() throws RuntimeException; - - /** Column name W_Revaluation_Acct */ - public static final String COLUMNNAME_W_Revaluation_Acct = "W_Revaluation_Acct"; - - /** Set Inventory Revaluation. - * Account for Inventory Revaluation - */ - public void setW_Revaluation_Acct (int W_Revaluation_Acct); - - /** Get Inventory Revaluation. - * Account for Inventory Revaluation - */ - public int getW_Revaluation_Acct(); - - public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException; } diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java index c5aec04768..5927a786e7 100644 --- a/org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java +++ b/org.adempiere.base/src/org/compiere/model/MAcctSchemaDefault.java @@ -84,26 +84,31 @@ public class MAcctSchemaDefault extends X_C_AcctSchema_Default * @param C_Currency_ID currency * @return gain acct */ - public int getRealizedGain_Acct (int C_Currency_ID) - { - MCurrencyAcct acct = MCurrencyAcct.get (this, C_Currency_ID); - if (acct != null) - return acct.getRealizedGain_Acct(); - return super.getRealizedGain_Acct(); - } // getRealizedGain_Acct +// IDEMPIERE-362 Hide things that don't work on iDempiere + +// public int getRealizedGain_Acct (int C_Currency_ID) +// { +// MCurrencyAcct acct = MCurrencyAcct.get (this, C_Currency_ID); +// if (acct != null) +// return acct.getRealizedGain_Acct(); +// return super.getRealizedGain_Acct(); +// } // getRealizedGain_Acct /** * Get Realized Loss Acct for currency * @param C_Currency_ID currency * @return loss acct */ - public int getRealizedLoss_Acct (int C_Currency_ID) - { - MCurrencyAcct acct = MCurrencyAcct.get (this, C_Currency_ID); - if (acct != null) - return acct.getRealizedLoss_Acct(); - return super.getRealizedLoss_Acct(); - } // getRealizedLoss_Acct + +// IDEMPIERE-362 Hide things that don't work on iDempiere + +// public int getRealizedLoss_Acct (int C_Currency_ID) +// { +// MCurrencyAcct acct = MCurrencyAcct.get (this, C_Currency_ID); +// if (acct != null) +// return acct.getRealizedLoss_Acct(); +// return super.getRealizedLoss_Acct(); +// } // getRealizedLoss_Acct /** * Get Acct Info list diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java index 1e7bce2396..7ca91ce8ef 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java @@ -30,7 +30,7 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default /** * */ - private static final long serialVersionUID = 20120817L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_AcctSchema_Default (Properties ctx, int C_AcctSchema_Default_ID, String trxName) @@ -39,17 +39,11 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default /** if (C_AcctSchema_Default_ID == 0) { setB_Asset_Acct (0); - setB_Expense_Acct (0); setB_InterestExp_Acct (0); setB_InterestRev_Acct (0); setB_InTransit_Acct (0); setB_PaymentSelect_Acct (0); - setB_RevaluationGain_Acct (0); - setB_RevaluationLoss_Acct (0); - setB_SettlementGain_Acct (0); - setB_SettlementLoss_Acct (0); setB_UnallocatedCash_Acct (0); - setB_Unidentified_Acct (0); setC_AcctSchema_ID (0); setCB_Asset_Acct (0); setCB_CashTransfer_Acct (0); @@ -60,44 +54,27 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default setC_Prepayment_Acct (0); setC_Receivable_Acct (0); setC_Receivable_Services_Acct (0); - setE_Expense_Acct (0); - setE_Prepayment_Acct (0); setNotInvoicedReceipts_Acct (0); - setNotInvoicedReceivables_Acct (0); - setNotInvoicedRevenue_Acct (0); setP_Asset_Acct (0); setPayDiscount_Exp_Acct (0); setPayDiscount_Rev_Acct (0); - setP_Burden_Acct (0); setP_COGS_Acct (0); setP_CostAdjustment_Acct (0); - setP_CostOfProduction_Acct (0); setP_Expense_Acct (0); - setP_FloorStock_Acct (0); setP_InventoryClearing_Acct (0); setP_InvoicePriceVariance_Acct (0); setPJ_Asset_Acct (0); setPJ_WIP_Acct (0); - setP_Labor_Acct (0); - setP_MethodChangeVariance_Acct (0); - setP_MixVariance_Acct (0); - setP_OutsideProcessing_Acct (0); - setP_Overhead_Acct (0); setP_PurchasePriceVariance_Acct (0); setP_RateVariance_Acct (0); setP_Revenue_Acct (0); - setP_Scrap_Acct (0); setP_TradeDiscountGrant_Acct (0); setP_TradeDiscountRec_Acct (0); - setP_UsageVariance_Acct (0); - setP_WIP_Acct (0); setRealizedGain_Acct (0); setRealizedLoss_Acct (0); setT_Credit_Acct (0); setT_Due_Acct (0); setT_Expense_Acct (0); - setT_Liability_Acct (0); - setT_Receivables_Acct (0); setUnEarnedRevenue_Acct (0); setUnrealizedGain_Acct (0); setUnrealizedLoss_Acct (0); @@ -105,10 +82,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default setV_Liability_Services_Acct (0); setV_Prepayment_Acct (0); setW_Differences_Acct (0); - setW_InvActualAdjust_Acct (0); - setW_Inventory_Acct (0); - setWithholding_Acct (0); - setW_Revaluation_Acct (0); setWriteOff_Acct (0); } */ } @@ -166,31 +139,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getB_Expense_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_Expense_Acct(), get_TrxName()); } - - /** Set Bank Expense. - @param B_Expense_Acct - Bank Expense Account - */ - public void setB_Expense_Acct (int B_Expense_Acct) - { - set_Value (COLUMNNAME_B_Expense_Acct, Integer.valueOf(B_Expense_Acct)); - } - - /** Get Bank Expense. - @return Bank Expense Account - */ - public int getB_Expense_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_Expense_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getB_InterestExp_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -291,106 +239,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getB_RevaluationGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_RevaluationGain_Acct(), get_TrxName()); } - - /** Set Bank Revaluation Gain. - @param B_RevaluationGain_Acct - Bank Revaluation Gain Account - */ - public void setB_RevaluationGain_Acct (int B_RevaluationGain_Acct) - { - set_Value (COLUMNNAME_B_RevaluationGain_Acct, Integer.valueOf(B_RevaluationGain_Acct)); - } - - /** Get Bank Revaluation Gain. - @return Bank Revaluation Gain Account - */ - public int getB_RevaluationGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_RevaluationGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_RevaluationLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_RevaluationLoss_Acct(), get_TrxName()); } - - /** Set Bank Revaluation Loss. - @param B_RevaluationLoss_Acct - Bank Revaluation Loss Account - */ - public void setB_RevaluationLoss_Acct (int B_RevaluationLoss_Acct) - { - set_Value (COLUMNNAME_B_RevaluationLoss_Acct, Integer.valueOf(B_RevaluationLoss_Acct)); - } - - /** Get Bank Revaluation Loss. - @return Bank Revaluation Loss Account - */ - public int getB_RevaluationLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_RevaluationLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_SettlementGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_SettlementGain_Acct(), get_TrxName()); } - - /** Set Bank Settlement Gain. - @param B_SettlementGain_Acct - Bank Settlement Gain Account - */ - public void setB_SettlementGain_Acct (int B_SettlementGain_Acct) - { - set_Value (COLUMNNAME_B_SettlementGain_Acct, Integer.valueOf(B_SettlementGain_Acct)); - } - - /** Get Bank Settlement Gain. - @return Bank Settlement Gain Account - */ - public int getB_SettlementGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_SettlementGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_SettlementLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_SettlementLoss_Acct(), get_TrxName()); } - - /** Set Bank Settlement Loss. - @param B_SettlementLoss_Acct - Bank Settlement Loss Account - */ - public void setB_SettlementLoss_Acct (int B_SettlementLoss_Acct) - { - set_Value (COLUMNNAME_B_SettlementLoss_Acct, Integer.valueOf(B_SettlementLoss_Acct)); - } - - /** Get Bank Settlement Loss. - @return Bank Settlement Loss Account - */ - public int getB_SettlementLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_SettlementLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getB_UnallocatedCash_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -416,31 +264,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getB_Unidentified_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_Unidentified_Acct(), get_TrxName()); } - - /** Set Bank Unidentified Receipts. - @param B_Unidentified_Acct - Bank Unidentified Receipts Account - */ - public void setB_Unidentified_Acct (int B_Unidentified_Acct) - { - set_Value (COLUMNNAME_B_Unidentified_Acct, Integer.valueOf(B_Unidentified_Acct)); - } - - /** Get Bank Unidentified Receipts. - @return Bank Unidentified Receipts Account - */ - public int getB_Unidentified_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_Unidentified_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set C_AcctSchema_Default_UU. @param C_AcctSchema_Default_UU C_AcctSchema_Default_UU */ public void setC_AcctSchema_Default_UU (String C_AcctSchema_Default_UU) @@ -716,56 +539,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getE_Expense_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getE_Expense_Acct(), get_TrxName()); } - - /** Set Employee Expense. - @param E_Expense_Acct - Account for Employee Expenses - */ - public void setE_Expense_Acct (int E_Expense_Acct) - { - set_Value (COLUMNNAME_E_Expense_Acct, Integer.valueOf(E_Expense_Acct)); - } - - /** Get Employee Expense. - @return Account for Employee Expenses - */ - public int getE_Expense_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_E_Expense_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getE_Prepayment_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getE_Prepayment_Acct(), get_TrxName()); } - - /** Set Employee Prepayment. - @param E_Prepayment_Acct - Account for Employee Expense Prepayments - */ - public void setE_Prepayment_Acct (int E_Prepayment_Acct) - { - set_Value (COLUMNNAME_E_Prepayment_Acct, Integer.valueOf(E_Prepayment_Acct)); - } - - /** Get Employee Prepayment. - @return Account for Employee Expense Prepayments - */ - public int getE_Prepayment_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_E_Prepayment_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getNotInvoicedReceipts_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -791,56 +564,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getNotInvoicedReceivables_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getNotInvoicedReceivables_Acct(), get_TrxName()); } - - /** Set Not-invoiced Receivables. - @param NotInvoicedReceivables_Acct - Account for not invoiced Receivables - */ - public void setNotInvoicedReceivables_Acct (int NotInvoicedReceivables_Acct) - { - set_Value (COLUMNNAME_NotInvoicedReceivables_Acct, Integer.valueOf(NotInvoicedReceivables_Acct)); - } - - /** Get Not-invoiced Receivables. - @return Account for not invoiced Receivables - */ - public int getNotInvoicedReceivables_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_NotInvoicedReceivables_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getNotInvoicedRevenue_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getNotInvoicedRevenue_Acct(), get_TrxName()); } - - /** Set Not-invoiced Revenue. - @param NotInvoicedRevenue_Acct - Account for not invoiced Revenue - */ - public void setNotInvoicedRevenue_Acct (int NotInvoicedRevenue_Acct) - { - set_Value (COLUMNNAME_NotInvoicedRevenue_Acct, Integer.valueOf(NotInvoicedRevenue_Acct)); - } - - /** Get Not-invoiced Revenue. - @return Account for not invoiced Revenue - */ - public int getNotInvoicedRevenue_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_NotInvoicedRevenue_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_Asset_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -941,31 +664,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getP_Burden_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Burden_Acct(), get_TrxName()); } - - /** Set Burden. - @param P_Burden_Acct - The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct) - { - set_Value (COLUMNNAME_P_Burden_Acct, Integer.valueOf(P_Burden_Acct)); - } - - /** Get Burden. - @return The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Burden_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_COGS_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1016,31 +714,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_CostOfProduction_Acct(), get_TrxName()); } - - /** Set Cost Of Production. - @param P_CostOfProduction_Acct - The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct) - { - set_Value (COLUMNNAME_P_CostOfProduction_Acct, Integer.valueOf(P_CostOfProduction_Acct)); - } - - /** Get Cost Of Production. - @return The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_CostOfProduction_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_Expense_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1066,31 +739,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_FloorStock_Acct(), get_TrxName()); } - - /** Set Floor Stock. - @param P_FloorStock_Acct - The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct) - { - set_Value (COLUMNNAME_P_FloorStock_Acct, Integer.valueOf(P_FloorStock_Acct)); - } - - /** Get Floor Stock. - @return The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_FloorStock_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_InventoryClearing_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1191,131 +839,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getP_Labor_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Labor_Acct(), get_TrxName()); } - - /** Set Labor. - @param P_Labor_Acct - The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct) - { - set_Value (COLUMNNAME_P_Labor_Acct, Integer.valueOf(P_Labor_Acct)); - } - - /** Get Labor. - @return The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Labor_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MethodChangeVariance_Acct(), get_TrxName()); } - - /** Set Method Change Variance. - @param P_MethodChangeVariance_Acct - The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct) - { - set_Value (COLUMNNAME_P_MethodChangeVariance_Acct, Integer.valueOf(P_MethodChangeVariance_Acct)); - } - - /** Get Method Change Variance. - @return The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MethodChangeVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MixVariance_Acct(), get_TrxName()); } - - /** Set Mix Variance. - @param P_MixVariance_Acct - The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct) - { - set_Value (COLUMNNAME_P_MixVariance_Acct, Integer.valueOf(P_MixVariance_Acct)); - } - - /** Get Mix Variance. - @return The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MixVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_OutsideProcessing_Acct(), get_TrxName()); } - - /** Set Outside Processing. - @param P_OutsideProcessing_Acct - The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct) - { - set_Value (COLUMNNAME_P_OutsideProcessing_Acct, Integer.valueOf(P_OutsideProcessing_Acct)); - } - - /** Get Outside Processing. - @return The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_OutsideProcessing_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Overhead_Acct(), get_TrxName()); } - - /** Set Overhead. - @param P_Overhead_Acct - The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct) - { - set_Value (COLUMNNAME_P_Overhead_Acct, Integer.valueOf(P_Overhead_Acct)); - } - - /** Get Overhead. - @return The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Overhead_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_PurchasePriceVariance_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1412,31 +935,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return false; } - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Scrap_Acct(), get_TrxName()); } - - /** Set Scrap. - @param P_Scrap_Acct - The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct) - { - set_Value (COLUMNNAME_P_Scrap_Acct, Integer.valueOf(P_Scrap_Acct)); - } - - /** Get Scrap. - @return The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Scrap_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_TradeDiscountGrant_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1487,56 +985,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_UsageVariance_Acct(), get_TrxName()); } - - /** Set Usage Variance. - @param P_UsageVariance_Acct - The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct) - { - set_Value (COLUMNNAME_P_UsageVariance_Acct, Integer.valueOf(P_UsageVariance_Acct)); - } - - /** Get Usage Variance. - @return The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_UsageVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_WIP_Acct(), get_TrxName()); } - - /** Set Work In Process. - @param P_WIP_Acct - The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct) - { - set_Value (COLUMNNAME_P_WIP_Acct, Integer.valueOf(P_WIP_Acct)); - } - - /** Get Work In Process. - @return The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_WIP_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getRealizedGain_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1662,56 +1110,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getT_Liability_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getT_Liability_Acct(), get_TrxName()); } - - /** Set Tax Liability. - @param T_Liability_Acct - Account for Tax declaration liability - */ - public void setT_Liability_Acct (int T_Liability_Acct) - { - set_Value (COLUMNNAME_T_Liability_Acct, Integer.valueOf(T_Liability_Acct)); - } - - /** Get Tax Liability. - @return Account for Tax declaration liability - */ - public int getT_Liability_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_T_Liability_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getT_Receivables_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getT_Receivables_Acct(), get_TrxName()); } - - /** Set Tax Receivables. - @param T_Receivables_Acct - Account for Tax credit after tax declaration - */ - public void setT_Receivables_Acct (int T_Receivables_Acct) - { - set_Value (COLUMNNAME_T_Receivables_Acct, Integer.valueOf(T_Receivables_Acct)); - } - - /** Get Tax Receivables. - @return Account for Tax credit after tax declaration - */ - public int getT_Receivables_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_T_Receivables_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getUnEarnedRevenue_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -1887,106 +1285,6 @@ public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default return ii.intValue(); } - public I_C_ValidCombination getW_InvActualAdjust_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_InvActualAdjust_Acct(), get_TrxName()); } - - /** Set Inventory Adjustment. - @param W_InvActualAdjust_Acct - Account for Inventory value adjustments for Actual Costing - */ - public void setW_InvActualAdjust_Acct (int W_InvActualAdjust_Acct) - { - set_Value (COLUMNNAME_W_InvActualAdjust_Acct, Integer.valueOf(W_InvActualAdjust_Acct)); - } - - /** Get Inventory Adjustment. - @return Account for Inventory value adjustments for Actual Costing - */ - public int getW_InvActualAdjust_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_InvActualAdjust_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getW_Inventory_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_Inventory_Acct(), get_TrxName()); } - - /** Set (Not Used). - @param W_Inventory_Acct - Warehouse Inventory Asset Account - Currently not used - */ - public void setW_Inventory_Acct (int W_Inventory_Acct) - { - set_Value (COLUMNNAME_W_Inventory_Acct, Integer.valueOf(W_Inventory_Acct)); - } - - /** Get (Not Used). - @return Warehouse Inventory Asset Account - Currently not used - */ - public int getW_Inventory_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_Inventory_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getWithholding_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getWithholding_Acct(), get_TrxName()); } - - /** Set Withholding. - @param Withholding_Acct - Account for Withholdings - */ - public void setWithholding_Acct (int Withholding_Acct) - { - set_Value (COLUMNNAME_Withholding_Acct, Integer.valueOf(Withholding_Acct)); - } - - /** Get Withholding. - @return Account for Withholdings - */ - public int getWithholding_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_Withholding_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_Revaluation_Acct(), get_TrxName()); } - - /** Set Inventory Revaluation. - @param W_Revaluation_Acct - Account for Inventory Revaluation - */ - public void setW_Revaluation_Acct (int W_Revaluation_Acct) - { - set_Value (COLUMNNAME_W_Revaluation_Acct, Integer.valueOf(W_Revaluation_Acct)); - } - - /** Get Inventory Revaluation. - @return Account for Inventory Revaluation - */ - public int getW_Revaluation_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_Revaluation_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getWriteOff_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java index d2b2d8429c..313b353a1a 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java @@ -30,7 +30,7 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_AcctSchema_GL (Properties ctx, int C_AcctSchema_GL_ID, String trxName) @@ -41,11 +41,9 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis setC_AcctSchema_ID (0); setCommitmentOffset_Acct (0); setCommitmentOffsetSales_Acct (0); - setIncomeSummary_Acct (0); setIntercompanyDueFrom_Acct (0); setIntercompanyDueTo_Acct (0); setPPVOffset_Acct (0); - setRetainedEarning_Acct (0); setUseCurrencyBalancing (false); setUseSuspenseBalancing (false); setUseSuspenseError (false); @@ -80,9 +78,23 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + /** Set C_AcctSchema_GL_UU. + @param C_AcctSchema_GL_UU C_AcctSchema_GL_UU */ + public void setC_AcctSchema_GL_UU (String C_AcctSchema_GL_UU) + { + set_Value (COLUMNNAME_C_AcctSchema_GL_UU, C_AcctSchema_GL_UU); + } + + /** Get C_AcctSchema_GL_UU. + @return C_AcctSchema_GL_UU */ + public String getC_AcctSchema_GL_UU () + { + return (String)get_Value(COLUMNNAME_C_AcctSchema_GL_UU); + } + + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -191,31 +203,6 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis return ii.intValue(); } - public I_C_ValidCombination getIncomeSummary_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getIncomeSummary_Acct(), get_TrxName()); } - - /** Set Income Summary Acct. - @param IncomeSummary_Acct - Income Summary Account - */ - public void setIncomeSummary_Acct (int IncomeSummary_Acct) - { - set_Value (COLUMNNAME_IncomeSummary_Acct, Integer.valueOf(IncomeSummary_Acct)); - } - - /** Get Income Summary Acct. - @return Income Summary Account - */ - public int getIncomeSummary_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_IncomeSummary_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getIntercompanyDueFrom_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -291,28 +278,6 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis return ii.intValue(); } - public I_C_ValidCombination getRetainedEarning_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getRetainedEarning_Acct(), get_TrxName()); } - - /** Set Retained Earning Acct. - @param RetainedEarning_Acct Retained Earning Acct */ - public void setRetainedEarning_Acct (int RetainedEarning_Acct) - { - set_Value (COLUMNNAME_RetainedEarning_Acct, Integer.valueOf(RetainedEarning_Acct)); - } - - /** Get Retained Earning Acct. - @return Retained Earning Acct */ - public int getRetainedEarning_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_RetainedEarning_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getSuspenseBalancing_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -335,28 +300,6 @@ public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persis return ii.intValue(); } - public I_C_ValidCombination getSuspenseError_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getSuspenseError_Acct(), get_TrxName()); } - - /** Set Suspense Error Acct. - @param SuspenseError_Acct Suspense Error Acct */ - public void setSuspenseError_Acct (int SuspenseError_Acct) - { - set_Value (COLUMNNAME_SuspenseError_Acct, Integer.valueOf(SuspenseError_Acct)); - } - - /** Get Suspense Error Acct. - @return Suspense Error Acct */ - public int getSuspenseError_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_SuspenseError_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - /** Set Use Currency Balancing. @param UseCurrencyBalancing Use Currency Balancing */ public void setUseCurrencyBalancing (boolean UseCurrencyBalancing) diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java index 7db3548b47..72b850df48 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java @@ -29,7 +29,7 @@ public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_ /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_BP_Employee_Acct (Properties ctx, int C_BP_Employee_Acct_ID, String trxName) @@ -39,8 +39,6 @@ public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_ { setC_AcctSchema_ID (0); setC_BPartner_ID (0); - setE_Expense_Acct (0); - setE_Prepayment_Acct (0); } */ } @@ -72,9 +70,9 @@ public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_ return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -100,9 +98,9 @@ public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_ return ii.intValue(); } - public I_C_BPartner getC_BPartner() throws RuntimeException + public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException { - return (I_C_BPartner)MTable.get(getCtx(), I_C_BPartner.Table_Name) + return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name) .getPO(getC_BPartner_ID(), get_TrxName()); } /** Set Business Partner . @@ -128,53 +126,17 @@ public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_ return ii.intValue(); } - public I_C_ValidCombination getE_Expense_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getE_Expense_Acct(), get_TrxName()); } - - /** Set Employee Expense. - @param E_Expense_Acct - Account for Employee Expenses - */ - public void setE_Expense_Acct (int E_Expense_Acct) + /** Set C_BP_Employee_Acct_UU. + @param C_BP_Employee_Acct_UU C_BP_Employee_Acct_UU */ + public void setC_BP_Employee_Acct_UU (String C_BP_Employee_Acct_UU) { - set_Value (COLUMNNAME_E_Expense_Acct, Integer.valueOf(E_Expense_Acct)); + set_Value (COLUMNNAME_C_BP_Employee_Acct_UU, C_BP_Employee_Acct_UU); } - /** Get Employee Expense. - @return Account for Employee Expenses - */ - public int getE_Expense_Acct () + /** Get C_BP_Employee_Acct_UU. + @return C_BP_Employee_Acct_UU */ + public String getC_BP_Employee_Acct_UU () { - Integer ii = (Integer)get_Value(COLUMNNAME_E_Expense_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getE_Prepayment_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getE_Prepayment_Acct(), get_TrxName()); } - - /** Set Employee Prepayment. - @param E_Prepayment_Acct - Account for Employee Expense Prepayments - */ - public void setE_Prepayment_Acct (int E_Prepayment_Acct) - { - set_Value (COLUMNNAME_E_Prepayment_Acct, Integer.valueOf(E_Prepayment_Acct)); - } - - /** Get Employee Prepayment. - @return Account for Employee Expense Prepayments - */ - public int getE_Prepayment_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_E_Prepayment_Acct); - if (ii == null) - return 0; - return ii.intValue(); + return (String)get_Value(COLUMNNAME_C_BP_Employee_Acct_UU); } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java index 002b3cb905..aacaee6a33 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java @@ -30,7 +30,7 @@ public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persis /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_BP_Group_Acct (Properties ctx, int C_BP_Group_Acct_ID, String trxName) @@ -44,8 +44,6 @@ public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persis setC_Receivable_Acct (0); setC_Receivable_Services_Acct (0); setNotInvoicedReceipts_Acct (0); - setNotInvoicedReceivables_Acct (0); - setNotInvoicedRevenue_Acct (0); setPayDiscount_Exp_Acct (0); setPayDiscount_Rev_Acct (0); setUnEarnedRevenue_Acct (0); @@ -84,9 +82,9 @@ public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persis return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -112,9 +110,23 @@ public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persis return ii.intValue(); } - public I_C_BP_Group getC_BP_Group() throws RuntimeException + /** Set C_BP_Group_Acct_UU. + @param C_BP_Group_Acct_UU C_BP_Group_Acct_UU */ + public void setC_BP_Group_Acct_UU (String C_BP_Group_Acct_UU) + { + set_Value (COLUMNNAME_C_BP_Group_Acct_UU, C_BP_Group_Acct_UU); + } + + /** Get C_BP_Group_Acct_UU. + @return C_BP_Group_Acct_UU */ + public String getC_BP_Group_Acct_UU () + { + return (String)get_Value(COLUMNNAME_C_BP_Group_Acct_UU); + } + + public org.compiere.model.I_C_BP_Group getC_BP_Group() throws RuntimeException { - return (I_C_BP_Group)MTable.get(getCtx(), I_C_BP_Group.Table_Name) + return (org.compiere.model.I_C_BP_Group)MTable.get(getCtx(), org.compiere.model.I_C_BP_Group.Table_Name) .getPO(getC_BP_Group_ID(), get_TrxName()); } /** Set Business Partner Group. @@ -248,56 +260,6 @@ public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persis return ii.intValue(); } - public I_C_ValidCombination getNotInvoicedReceivables_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getNotInvoicedReceivables_Acct(), get_TrxName()); } - - /** Set Not-invoiced Receivables. - @param NotInvoicedReceivables_Acct - Account for not invoiced Receivables - */ - public void setNotInvoicedReceivables_Acct (int NotInvoicedReceivables_Acct) - { - set_Value (COLUMNNAME_NotInvoicedReceivables_Acct, Integer.valueOf(NotInvoicedReceivables_Acct)); - } - - /** Get Not-invoiced Receivables. - @return Account for not invoiced Receivables - */ - public int getNotInvoicedReceivables_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_NotInvoicedReceivables_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getNotInvoicedRevenue_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getNotInvoicedRevenue_Acct(), get_TrxName()); } - - /** Set Not-invoiced Revenue. - @param NotInvoicedRevenue_Acct - Account for not invoiced Revenue - */ - public void setNotInvoicedRevenue_Acct (int NotInvoicedRevenue_Acct) - { - set_Value (COLUMNNAME_NotInvoicedRevenue_Acct, Integer.valueOf(NotInvoicedRevenue_Acct)); - } - - /** Get Not-invoiced Revenue. - @return Account for not invoiced Revenue - */ - public int getNotInvoicedRevenue_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_NotInvoicedRevenue_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getPayDiscount_Exp_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java index d551748f3b..a0ac41d168 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java @@ -29,7 +29,7 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_BankAccount_Acct (Properties ctx, int C_BankAccount_Acct_ID, String trxName) @@ -38,17 +38,11 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ /** if (C_BankAccount_Acct_ID == 0) { setB_Asset_Acct (0); - setB_Expense_Acct (0); setB_InterestExp_Acct (0); setB_InterestRev_Acct (0); setB_InTransit_Acct (0); setB_PaymentSelect_Acct (0); - setB_RevaluationGain_Acct (0); - setB_RevaluationLoss_Acct (0); - setB_SettlementGain_Acct (0); - setB_SettlementLoss_Acct (0); setB_UnallocatedCash_Acct (0); - setB_Unidentified_Acct (0); setC_AcctSchema_ID (0); setC_BankAccount_ID (0); } */ @@ -107,31 +101,6 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ return ii.intValue(); } - public I_C_ValidCombination getB_Expense_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_Expense_Acct(), get_TrxName()); } - - /** Set Bank Expense. - @param B_Expense_Acct - Bank Expense Account - */ - public void setB_Expense_Acct (int B_Expense_Acct) - { - set_Value (COLUMNNAME_B_Expense_Acct, Integer.valueOf(B_Expense_Acct)); - } - - /** Get Bank Expense. - @return Bank Expense Account - */ - public int getB_Expense_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_Expense_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getB_InterestExp_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -232,106 +201,6 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ return ii.intValue(); } - public I_C_ValidCombination getB_RevaluationGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_RevaluationGain_Acct(), get_TrxName()); } - - /** Set Bank Revaluation Gain. - @param B_RevaluationGain_Acct - Bank Revaluation Gain Account - */ - public void setB_RevaluationGain_Acct (int B_RevaluationGain_Acct) - { - set_Value (COLUMNNAME_B_RevaluationGain_Acct, Integer.valueOf(B_RevaluationGain_Acct)); - } - - /** Get Bank Revaluation Gain. - @return Bank Revaluation Gain Account - */ - public int getB_RevaluationGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_RevaluationGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_RevaluationLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_RevaluationLoss_Acct(), get_TrxName()); } - - /** Set Bank Revaluation Loss. - @param B_RevaluationLoss_Acct - Bank Revaluation Loss Account - */ - public void setB_RevaluationLoss_Acct (int B_RevaluationLoss_Acct) - { - set_Value (COLUMNNAME_B_RevaluationLoss_Acct, Integer.valueOf(B_RevaluationLoss_Acct)); - } - - /** Get Bank Revaluation Loss. - @return Bank Revaluation Loss Account - */ - public int getB_RevaluationLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_RevaluationLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_SettlementGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_SettlementGain_Acct(), get_TrxName()); } - - /** Set Bank Settlement Gain. - @param B_SettlementGain_Acct - Bank Settlement Gain Account - */ - public void setB_SettlementGain_Acct (int B_SettlementGain_Acct) - { - set_Value (COLUMNNAME_B_SettlementGain_Acct, Integer.valueOf(B_SettlementGain_Acct)); - } - - /** Get Bank Settlement Gain. - @return Bank Settlement Gain Account - */ - public int getB_SettlementGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_SettlementGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getB_SettlementLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_SettlementLoss_Acct(), get_TrxName()); } - - /** Set Bank Settlement Loss. - @param B_SettlementLoss_Acct - Bank Settlement Loss Account - */ - public void setB_SettlementLoss_Acct (int B_SettlementLoss_Acct) - { - set_Value (COLUMNNAME_B_SettlementLoss_Acct, Integer.valueOf(B_SettlementLoss_Acct)); - } - - /** Get Bank Settlement Loss. - @return Bank Settlement Loss Account - */ - public int getB_SettlementLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_SettlementLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getB_UnallocatedCash_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -357,34 +226,9 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ return ii.intValue(); } - public I_C_ValidCombination getB_Unidentified_A() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getB_Unidentified_Acct(), get_TrxName()); } - - /** Set Bank Unidentified Receipts. - @param B_Unidentified_Acct - Bank Unidentified Receipts Account - */ - public void setB_Unidentified_Acct (int B_Unidentified_Acct) - { - set_Value (COLUMNNAME_B_Unidentified_Acct, Integer.valueOf(B_Unidentified_Acct)); - } - - /** Get Bank Unidentified Receipts. - @return Bank Unidentified Receipts Account - */ - public int getB_Unidentified_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_B_Unidentified_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException - { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -410,9 +254,23 @@ public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_ return ii.intValue(); } - public I_C_BankAccount getC_BankAccount() throws RuntimeException + /** Set C_BankAccount_Acct_UU. + @param C_BankAccount_Acct_UU C_BankAccount_Acct_UU */ + public void setC_BankAccount_Acct_UU (String C_BankAccount_Acct_UU) + { + set_Value (COLUMNNAME_C_BankAccount_Acct_UU, C_BankAccount_Acct_UU); + } + + /** Get C_BankAccount_Acct_UU. + @return C_BankAccount_Acct_UU */ + public String getC_BankAccount_Acct_UU () + { + return (String)get_Value(COLUMNNAME_C_BankAccount_Acct_UU); + } + + public org.compiere.model.I_C_BankAccount getC_BankAccount() throws RuntimeException { - return (I_C_BankAccount)MTable.get(getCtx(), I_C_BankAccount.Table_Name) + return (org.compiere.model.I_C_BankAccount)MTable.get(getCtx(), org.compiere.model.I_C_BankAccount.Table_Name) .getPO(getC_BankAccount_ID(), get_TrxName()); } /** Set Bank Account. diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java index b470c4f860..be54e29445 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java @@ -29,7 +29,7 @@ public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persis /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_Currency_Acct (Properties ctx, int C_Currency_Acct_ID, String trxName) @@ -39,10 +39,6 @@ public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persis { setC_AcctSchema_ID (0); setC_Currency_ID (0); - setRealizedGain_Acct (0); - setRealizedLoss_Acct (0); - setUnrealizedGain_Acct (0); - setUnrealizedLoss_Acct (0); } */ } @@ -74,9 +70,9 @@ public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persis return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -102,9 +98,23 @@ public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persis return ii.intValue(); } - public I_C_Currency getC_Currency() throws RuntimeException + /** Set C_Currency_Acct_UU. + @param C_Currency_Acct_UU C_Currency_Acct_UU */ + public void setC_Currency_Acct_UU (String C_Currency_Acct_UU) + { + set_Value (COLUMNNAME_C_Currency_Acct_UU, C_Currency_Acct_UU); + } + + /** Get C_Currency_Acct_UU. + @return C_Currency_Acct_UU */ + public String getC_Currency_Acct_UU () + { + return (String)get_Value(COLUMNNAME_C_Currency_Acct_UU); + } + + public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException { - return (I_C_Currency)MTable.get(getCtx(), I_C_Currency.Table_Name) + return (org.compiere.model.I_C_Currency)MTable.get(getCtx(), org.compiere.model.I_C_Currency.Table_Name) .getPO(getC_Currency_ID(), get_TrxName()); } /** Set Currency. @@ -129,104 +139,4 @@ public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persis return 0; return ii.intValue(); } - - public I_C_ValidCombination getRealizedGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getRealizedGain_Acct(), get_TrxName()); } - - /** Set Realized Gain Acct. - @param RealizedGain_Acct - Realized Gain Account - */ - public void setRealizedGain_Acct (int RealizedGain_Acct) - { - set_Value (COLUMNNAME_RealizedGain_Acct, Integer.valueOf(RealizedGain_Acct)); - } - - /** Get Realized Gain Acct. - @return Realized Gain Account - */ - public int getRealizedGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_RealizedGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getRealizedLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getRealizedLoss_Acct(), get_TrxName()); } - - /** Set Realized Loss Acct. - @param RealizedLoss_Acct - Realized Loss Account - */ - public void setRealizedLoss_Acct (int RealizedLoss_Acct) - { - set_Value (COLUMNNAME_RealizedLoss_Acct, Integer.valueOf(RealizedLoss_Acct)); - } - - /** Get Realized Loss Acct. - @return Realized Loss Account - */ - public int getRealizedLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_RealizedLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getUnrealizedGain_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getUnrealizedGain_Acct(), get_TrxName()); } - - /** Set Unrealized Gain Acct. - @param UnrealizedGain_Acct - Unrealized Gain Account for currency revaluation - */ - public void setUnrealizedGain_Acct (int UnrealizedGain_Acct) - { - set_Value (COLUMNNAME_UnrealizedGain_Acct, Integer.valueOf(UnrealizedGain_Acct)); - } - - /** Get Unrealized Gain Acct. - @return Unrealized Gain Account for currency revaluation - */ - public int getUnrealizedGain_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_UnrealizedGain_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getUnrealizedLoss_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getUnrealizedLoss_Acct(), get_TrxName()); } - - /** Set Unrealized Loss Acct. - @param UnrealizedLoss_Acct - Unrealized Loss Account for currency revaluation - */ - public void setUnrealizedLoss_Acct (int UnrealizedLoss_Acct) - { - set_Value (COLUMNNAME_UnrealizedLoss_Acct, Integer.valueOf(UnrealizedLoss_Acct)); - } - - /** Get Unrealized Loss Acct. - @return Unrealized Loss Account for currency revaluation - */ - public int getUnrealizedLoss_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_UnrealizedLoss_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java index 545a8433bf..d7447d0c7c 100644 --- a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java @@ -29,7 +29,7 @@ public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_C_Tax_Acct (Properties ctx, int C_Tax_Acct_ID, String trxName) @@ -42,8 +42,6 @@ public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent setT_Credit_Acct (0); setT_Due_Acct (0); setT_Expense_Acct (0); - setT_Liability_Acct (0); - setT_Receivables_Acct (0); } */ } @@ -75,9 +73,9 @@ public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -103,9 +101,23 @@ public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent return ii.intValue(); } - public I_C_Tax getC_Tax() throws RuntimeException + /** Set C_Tax_Acct_UU. + @param C_Tax_Acct_UU C_Tax_Acct_UU */ + public void setC_Tax_Acct_UU (String C_Tax_Acct_UU) + { + set_Value (COLUMNNAME_C_Tax_Acct_UU, C_Tax_Acct_UU); + } + + /** Get C_Tax_Acct_UU. + @return C_Tax_Acct_UU */ + public String getC_Tax_Acct_UU () + { + return (String)get_Value(COLUMNNAME_C_Tax_Acct_UU); + } + + public org.compiere.model.I_C_Tax getC_Tax() throws RuntimeException { - return (I_C_Tax)MTable.get(getCtx(), I_C_Tax.Table_Name) + return (org.compiere.model.I_C_Tax)MTable.get(getCtx(), org.compiere.model.I_C_Tax.Table_Name) .getPO(getC_Tax_ID(), get_TrxName()); } /** Set Tax. @@ -205,54 +217,4 @@ public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent return 0; return ii.intValue(); } - - public I_C_ValidCombination getT_Liability_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getT_Liability_Acct(), get_TrxName()); } - - /** Set Tax Liability. - @param T_Liability_Acct - Account for Tax declaration liability - */ - public void setT_Liability_Acct (int T_Liability_Acct) - { - set_Value (COLUMNNAME_T_Liability_Acct, Integer.valueOf(T_Liability_Acct)); - } - - /** Get Tax Liability. - @return Account for Tax declaration liability - */ - public int getT_Liability_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_T_Liability_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getT_Receivables_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getT_Receivables_Acct(), get_TrxName()); } - - /** Set Tax Receivables. - @param T_Receivables_Acct - Account for Tax credit after tax declaration - */ - public void setT_Receivables_Acct (int T_Receivables_Acct) - { - set_Value (COLUMNNAME_T_Receivables_Acct, Integer.valueOf(T_Receivables_Acct)); - } - - /** Get Tax Receivables. - @return Account for Tax credit after tax declaration - */ - public int getT_Receivables_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_T_Receivables_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java index 31a5819cdd..a8a902ff9f 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java @@ -29,7 +29,7 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_M_Product_Acct (Properties ctx, int M_Product_Acct_ID, String trxName) @@ -40,27 +40,16 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste setC_AcctSchema_ID (0); setM_Product_ID (0); setP_Asset_Acct (0); - setP_Burden_Acct (0); setP_COGS_Acct (0); setP_CostAdjustment_Acct (0); - setP_CostOfProduction_Acct (0); setP_Expense_Acct (0); - setP_FloorStock_Acct (0); setP_InventoryClearing_Acct (0); setP_InvoicePriceVariance_Acct (0); - setP_Labor_Acct (0); - setP_MethodChangeVariance_Acct (0); - setP_MixVariance_Acct (0); - setP_OutsideProcessing_Acct (0); - setP_Overhead_Acct (0); setP_PurchasePriceVariance_Acct (0); setP_RateVariance_Acct (0); setP_Revenue_Acct (0); - setP_Scrap_Acct (0); setP_TradeDiscountGrant_Acct (0); setP_TradeDiscountRec_Acct (0); - setP_UsageVariance_Acct (0); - setP_WIP_Acct (0); } */ } @@ -92,9 +81,9 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -120,9 +109,23 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_M_Product getM_Product() throws RuntimeException + /** Set M_Product_Acct_UU. + @param M_Product_Acct_UU M_Product_Acct_UU */ + public void setM_Product_Acct_UU (String M_Product_Acct_UU) + { + set_Value (COLUMNNAME_M_Product_Acct_UU, M_Product_Acct_UU); + } + + /** Get M_Product_Acct_UU. + @return M_Product_Acct_UU */ + public String getM_Product_Acct_UU () + { + return (String)get_Value(COLUMNNAME_M_Product_Acct_UU); + } + + public org.compiere.model.I_M_Product getM_Product() throws RuntimeException { - return (I_M_Product)MTable.get(getCtx(), I_M_Product.Table_Name) + return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name) .getPO(getM_Product_ID(), get_TrxName()); } /** Set Product. @@ -198,31 +201,6 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_C_ValidCombination getP_Burden_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Burden_Acct(), get_TrxName()); } - - /** Set Burden. - @param P_Burden_Acct - The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct) - { - set_Value (COLUMNNAME_P_Burden_Acct, Integer.valueOf(P_Burden_Acct)); - } - - /** Get Burden. - @return The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Burden_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_COGS_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -273,31 +251,6 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_CostOfProduction_Acct(), get_TrxName()); } - - /** Set Cost Of Production. - @param P_CostOfProduction_Acct - The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct) - { - set_Value (COLUMNNAME_P_CostOfProduction_Acct, Integer.valueOf(P_CostOfProduction_Acct)); - } - - /** Get Cost Of Production. - @return The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_CostOfProduction_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_Expense_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -323,31 +276,6 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_FloorStock_Acct(), get_TrxName()); } - - /** Set Floor Stock. - @param P_FloorStock_Acct - The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct) - { - set_Value (COLUMNNAME_P_FloorStock_Acct, Integer.valueOf(P_FloorStock_Acct)); - } - - /** Get Floor Stock. - @return The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_FloorStock_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_InventoryClearing_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -398,131 +326,6 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_C_ValidCombination getP_Labor_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Labor_Acct(), get_TrxName()); } - - /** Set Labor. - @param P_Labor_Acct - The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct) - { - set_Value (COLUMNNAME_P_Labor_Acct, Integer.valueOf(P_Labor_Acct)); - } - - /** Get Labor. - @return The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Labor_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MethodChangeVariance_Acct(), get_TrxName()); } - - /** Set Method Change Variance. - @param P_MethodChangeVariance_Acct - The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct) - { - set_Value (COLUMNNAME_P_MethodChangeVariance_Acct, Integer.valueOf(P_MethodChangeVariance_Acct)); - } - - /** Get Method Change Variance. - @return The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MethodChangeVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MixVariance_Acct(), get_TrxName()); } - - /** Set Mix Variance. - @param P_MixVariance_Acct - The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct) - { - set_Value (COLUMNNAME_P_MixVariance_Acct, Integer.valueOf(P_MixVariance_Acct)); - } - - /** Get Mix Variance. - @return The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MixVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_OutsideProcessing_Acct(), get_TrxName()); } - - /** Set Outside Processing. - @param P_OutsideProcessing_Acct - The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct) - { - set_Value (COLUMNNAME_P_OutsideProcessing_Acct, Integer.valueOf(P_OutsideProcessing_Acct)); - } - - /** Get Outside Processing. - @return The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_OutsideProcessing_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Overhead_Acct(), get_TrxName()); } - - /** Set Overhead. - @param P_Overhead_Acct - The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct) - { - set_Value (COLUMNNAME_P_Overhead_Acct, Integer.valueOf(P_Overhead_Acct)); - } - - /** Get Overhead. - @return The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Overhead_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_PurchasePriceVariance_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -598,31 +401,6 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return ii.intValue(); } - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Scrap_Acct(), get_TrxName()); } - - /** Set Scrap. - @param P_Scrap_Acct - The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct) - { - set_Value (COLUMNNAME_P_Scrap_Acct, Integer.valueOf(P_Scrap_Acct)); - } - - /** Get Scrap. - @return The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Scrap_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_TradeDiscountGrant_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -672,54 +450,4 @@ public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persiste return 0; return ii.intValue(); } - - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_UsageVariance_Acct(), get_TrxName()); } - - /** Set Usage Variance. - @param P_UsageVariance_Acct - The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct) - { - set_Value (COLUMNNAME_P_UsageVariance_Acct, Integer.valueOf(P_UsageVariance_Acct)); - } - - /** Get Usage Variance. - @return The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_UsageVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_WIP_Acct(), get_TrxName()); } - - /** Set Work In Process. - @param P_WIP_Acct - The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct) - { - set_Value (COLUMNNAME_P_WIP_Acct, Integer.valueOf(P_WIP_Acct)); - } - - /** Get Work In Process. - @return The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_WIP_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java index 9589896779..914bd49a85 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java @@ -29,7 +29,7 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_M_Product_Category_Acct (Properties ctx, int M_Product_Category_Acct_ID, String trxName) @@ -40,27 +40,16 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor setC_AcctSchema_ID (0); setM_Product_Category_ID (0); setP_Asset_Acct (0); - setP_Burden_Acct (0); setP_COGS_Acct (0); setP_CostAdjustment_Acct (0); - setP_CostOfProduction_Acct (0); setP_Expense_Acct (0); - setP_FloorStock_Acct (0); setP_InventoryClearing_Acct (0); setP_InvoicePriceVariance_Acct (0); - setP_Labor_Acct (0); - setP_MethodChangeVariance_Acct (0); - setP_MixVariance_Acct (0); - setP_OutsideProcessing_Acct (0); - setP_Overhead_Acct (0); setP_PurchasePriceVariance_Acct (0); setP_RateVariance_Acct (0); setP_Revenue_Acct (0); - setP_Scrap_Acct (0); setP_TradeDiscountGrant_Acct (0); setP_TradeDiscountRec_Acct (0); - setP_UsageVariance_Acct (0); - setP_WIP_Acct (0); } */ } @@ -92,9 +81,9 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -184,9 +173,23 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return (String)get_Value(COLUMNNAME_CostingMethod); } - public I_M_Product_Category getM_Product_Category() throws RuntimeException + /** Set M_Product_Category_Acct_UU. + @param M_Product_Category_Acct_UU M_Product_Category_Acct_UU */ + public void setM_Product_Category_Acct_UU (String M_Product_Category_Acct_UU) + { + set_Value (COLUMNNAME_M_Product_Category_Acct_UU, M_Product_Category_Acct_UU); + } + + /** Get M_Product_Category_Acct_UU. + @return M_Product_Category_Acct_UU */ + public String getM_Product_Category_Acct_UU () + { + return (String)get_Value(COLUMNNAME_M_Product_Category_Acct_UU); + } + + public org.compiere.model.I_M_Product_Category getM_Product_Category() throws RuntimeException { - return (I_M_Product_Category)MTable.get(getCtx(), I_M_Product_Category.Table_Name) + return (org.compiere.model.I_M_Product_Category)MTable.get(getCtx(), org.compiere.model.I_M_Product_Category.Table_Name) .getPO(getM_Product_Category_ID(), get_TrxName()); } /** Set Product Category. @@ -262,31 +265,6 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return ii.intValue(); } - public I_C_ValidCombination getP_Burden_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Burden_Acct(), get_TrxName()); } - - /** Set Burden. - @param P_Burden_Acct - The Burden account is the account used Manufacturing Order - */ - public void setP_Burden_Acct (int P_Burden_Acct) - { - set_Value (COLUMNNAME_P_Burden_Acct, Integer.valueOf(P_Burden_Acct)); - } - - /** Get Burden. - @return The Burden account is the account used Manufacturing Order - */ - public int getP_Burden_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Burden_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_COGS_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -337,31 +315,6 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return ii.intValue(); } - public I_C_ValidCombination getP_CostOfProduction_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_CostOfProduction_Acct(), get_TrxName()); } - - /** Set Cost Of Production. - @param P_CostOfProduction_Acct - The Cost Of Production account is the account used Manufacturing Order - */ - public void setP_CostOfProduction_Acct (int P_CostOfProduction_Acct) - { - set_Value (COLUMNNAME_P_CostOfProduction_Acct, Integer.valueOf(P_CostOfProduction_Acct)); - } - - /** Get Cost Of Production. - @return The Cost Of Production account is the account used Manufacturing Order - */ - public int getP_CostOfProduction_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_CostOfProduction_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_Expense_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -387,31 +340,6 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return ii.intValue(); } - public I_C_ValidCombination getP_FloorStock_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_FloorStock_Acct(), get_TrxName()); } - - /** Set Floor Stock. - @param P_FloorStock_Acct - The Floor Stock account is the account used Manufacturing Order - */ - public void setP_FloorStock_Acct (int P_FloorStock_Acct) - { - set_Value (COLUMNNAME_P_FloorStock_Acct, Integer.valueOf(P_FloorStock_Acct)); - } - - /** Get Floor Stock. - @return The Floor Stock account is the account used Manufacturing Order - */ - public int getP_FloorStock_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_FloorStock_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_InventoryClearing_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -462,131 +390,6 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return ii.intValue(); } - public I_C_ValidCombination getP_Labor_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Labor_Acct(), get_TrxName()); } - - /** Set Labor. - @param P_Labor_Acct - The Labor account is the account used Manufacturing Order - */ - public void setP_Labor_Acct (int P_Labor_Acct) - { - set_Value (COLUMNNAME_P_Labor_Acct, Integer.valueOf(P_Labor_Acct)); - } - - /** Get Labor. - @return The Labor account is the account used Manufacturing Order - */ - public int getP_Labor_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Labor_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MethodChangeVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MethodChangeVariance_Acct(), get_TrxName()); } - - /** Set Method Change Variance. - @param P_MethodChangeVariance_Acct - The Method Change Variance account is the account used Manufacturing Order - */ - public void setP_MethodChangeVariance_Acct (int P_MethodChangeVariance_Acct) - { - set_Value (COLUMNNAME_P_MethodChangeVariance_Acct, Integer.valueOf(P_MethodChangeVariance_Acct)); - } - - /** Get Method Change Variance. - @return The Method Change Variance account is the account used Manufacturing Order - */ - public int getP_MethodChangeVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MethodChangeVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_MixVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_MixVariance_Acct(), get_TrxName()); } - - /** Set Mix Variance. - @param P_MixVariance_Acct - The Mix Variance account is the account used Manufacturing Order - */ - public void setP_MixVariance_Acct (int P_MixVariance_Acct) - { - set_Value (COLUMNNAME_P_MixVariance_Acct, Integer.valueOf(P_MixVariance_Acct)); - } - - /** Get Mix Variance. - @return The Mix Variance account is the account used Manufacturing Order - */ - public int getP_MixVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_MixVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_OutsideProcessing_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_OutsideProcessing_Acct(), get_TrxName()); } - - /** Set Outside Processing. - @param P_OutsideProcessing_Acct - The Outside Processing Account is the account used in Manufacturing Order - */ - public void setP_OutsideProcessing_Acct (int P_OutsideProcessing_Acct) - { - set_Value (COLUMNNAME_P_OutsideProcessing_Acct, Integer.valueOf(P_OutsideProcessing_Acct)); - } - - /** Get Outside Processing. - @return The Outside Processing Account is the account used in Manufacturing Order - */ - public int getP_OutsideProcessing_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_OutsideProcessing_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_Overhead_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Overhead_Acct(), get_TrxName()); } - - /** Set Overhead. - @param P_Overhead_Acct - The Overhead account is the account used in Manufacturing Order - */ - public void setP_Overhead_Acct (int P_Overhead_Acct) - { - set_Value (COLUMNNAME_P_Overhead_Acct, Integer.valueOf(P_Overhead_Acct)); - } - - /** Get Overhead. - @return The Overhead account is the account used in Manufacturing Order - */ - public int getP_Overhead_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Overhead_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_PurchasePriceVariance_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -683,31 +486,6 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return false; } - public I_C_ValidCombination getP_Scrap_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_Scrap_Acct(), get_TrxName()); } - - /** Set Scrap. - @param P_Scrap_Acct - The Scrap account is the account used in Manufacturing Order - */ - public void setP_Scrap_Acct (int P_Scrap_Acct) - { - set_Value (COLUMNNAME_P_Scrap_Acct, Integer.valueOf(P_Scrap_Acct)); - } - - /** Get Scrap. - @return The Scrap account is the account used in Manufacturing Order - */ - public int getP_Scrap_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_Scrap_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - public I_C_ValidCombination getP_TradeDiscountGrant_A() throws RuntimeException { return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) @@ -757,54 +535,4 @@ public class X_M_Product_Category_Acct extends PO implements I_M_Product_Categor return 0; return ii.intValue(); } - - public I_C_ValidCombination getP_UsageVariance_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_UsageVariance_Acct(), get_TrxName()); } - - /** Set Usage Variance. - @param P_UsageVariance_Acct - The Usage Variance account is the account used Manufacturing Order - */ - public void setP_UsageVariance_Acct (int P_UsageVariance_Acct) - { - set_Value (COLUMNNAME_P_UsageVariance_Acct, Integer.valueOf(P_UsageVariance_Acct)); - } - - /** Get Usage Variance. - @return The Usage Variance account is the account used Manufacturing Order - */ - public int getP_UsageVariance_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_UsageVariance_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getP_WIP_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getP_WIP_Acct(), get_TrxName()); } - - /** Set Work In Process. - @param P_WIP_Acct - The Work in Process account is the account used Manufacturing Order - */ - public void setP_WIP_Acct (int P_WIP_Acct) - { - set_Value (COLUMNNAME_P_WIP_Acct, Integer.valueOf(P_WIP_Acct)); - } - - /** Get Work In Process. - @return The Work in Process account is the account used Manufacturing Order - */ - public int getP_WIP_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_P_WIP_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java index d5559baab7..13e1e294a6 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java @@ -29,7 +29,7 @@ public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Pers /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20120928L; /** Standard Constructor */ public X_M_Warehouse_Acct (Properties ctx, int M_Warehouse_Acct_ID, String trxName) @@ -40,9 +40,6 @@ public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Pers setC_AcctSchema_ID (0); setM_Warehouse_ID (0); setW_Differences_Acct (0); - setW_InvActualAdjust_Acct (0); - setW_Inventory_Acct (0); - setW_Revaluation_Acct (0); } */ } @@ -74,9 +71,9 @@ public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Pers return sb.toString(); } - public I_C_AcctSchema getC_AcctSchema() throws RuntimeException + public org.compiere.model.I_C_AcctSchema getC_AcctSchema() throws RuntimeException { - return (I_C_AcctSchema)MTable.get(getCtx(), I_C_AcctSchema.Table_Name) + return (org.compiere.model.I_C_AcctSchema)MTable.get(getCtx(), org.compiere.model.I_C_AcctSchema.Table_Name) .getPO(getC_AcctSchema_ID(), get_TrxName()); } /** Set Accounting Schema. @@ -102,9 +99,23 @@ public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Pers return ii.intValue(); } - public I_M_Warehouse getM_Warehouse() throws RuntimeException + /** Set M_Warehouse_Acct_UU. + @param M_Warehouse_Acct_UU M_Warehouse_Acct_UU */ + public void setM_Warehouse_Acct_UU (String M_Warehouse_Acct_UU) + { + set_Value (COLUMNNAME_M_Warehouse_Acct_UU, M_Warehouse_Acct_UU); + } + + /** Get M_Warehouse_Acct_UU. + @return M_Warehouse_Acct_UU */ + public String getM_Warehouse_Acct_UU () + { + return (String)get_Value(COLUMNNAME_M_Warehouse_Acct_UU); + } + + public org.compiere.model.I_M_Warehouse getM_Warehouse() throws RuntimeException { - return (I_M_Warehouse)MTable.get(getCtx(), I_M_Warehouse.Table_Name) + return (org.compiere.model.I_M_Warehouse)MTable.get(getCtx(), org.compiere.model.I_M_Warehouse.Table_Name) .getPO(getM_Warehouse_ID(), get_TrxName()); } /** Set Warehouse. @@ -154,79 +165,4 @@ public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Pers return 0; return ii.intValue(); } - - public I_C_ValidCombination getW_InvActualAdjust_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_InvActualAdjust_Acct(), get_TrxName()); } - - /** Set Inventory Adjustment. - @param W_InvActualAdjust_Acct - Account for Inventory value adjustments for Actual Costing - */ - public void setW_InvActualAdjust_Acct (int W_InvActualAdjust_Acct) - { - set_Value (COLUMNNAME_W_InvActualAdjust_Acct, Integer.valueOf(W_InvActualAdjust_Acct)); - } - - /** Get Inventory Adjustment. - @return Account for Inventory value adjustments for Actual Costing - */ - public int getW_InvActualAdjust_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_InvActualAdjust_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getW_Inventory_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_Inventory_Acct(), get_TrxName()); } - - /** Set (Not Used). - @param W_Inventory_Acct - Warehouse Inventory Asset Account - Currently not used - */ - public void setW_Inventory_Acct (int W_Inventory_Acct) - { - set_Value (COLUMNNAME_W_Inventory_Acct, Integer.valueOf(W_Inventory_Acct)); - } - - /** Get (Not Used). - @return Warehouse Inventory Asset Account - Currently not used - */ - public int getW_Inventory_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_Inventory_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } - - public I_C_ValidCombination getW_Revaluation_A() throws RuntimeException - { - return (I_C_ValidCombination)MTable.get(getCtx(), I_C_ValidCombination.Table_Name) - .getPO(getW_Revaluation_Acct(), get_TrxName()); } - - /** Set Inventory Revaluation. - @param W_Revaluation_Acct - Account for Inventory Revaluation - */ - public void setW_Revaluation_Acct (int W_Revaluation_Acct) - { - set_Value (COLUMNNAME_W_Revaluation_Acct, Integer.valueOf(W_Revaluation_Acct)); - } - - /** Get Inventory Revaluation. - @return Account for Inventory Revaluation - */ - public int getW_Revaluation_Acct () - { - Integer ii = (Integer)get_Value(COLUMNNAME_W_Revaluation_Acct); - if (ii == null) - return 0; - return ii.intValue(); - } } \ No newline at end of file diff --git a/org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java b/org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java index 2bebb02a72..f3b7295925 100644 --- a/org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java +++ b/org.adempiere.extend/src/test/functional/MCurrencyAcctTest.java @@ -33,8 +33,11 @@ public class MCurrencyAcctTest extends AdempiereTestCase public void testQuery() throws Exception { //red1 create C_Currency_Acct wih SchemaDef = 101 and C_Currency = 100 MAcctSchemaDefault as = MAcctSchemaDefault.get(getCtx(), 101); - int a = as.getRealizedGain_Acct(100); - assertTrue("No test record been setup", a > 0); + +// IDEMPIERE-362 Hide things that don't work on iDempiere + + //int a = as.getRealizedGain_Acct(100); + //assertTrue("No test record been setup", a > 0); } diff --git a/org.adempiere.server-feature/data/import/AccountingUS.csv b/org.adempiere.server-feature/data/import/AccountingUS.csv index 6f5b458db4..6c45d08307 100644 --- a/org.adempiere.server-feature/data/import/AccountingUS.csv +++ b/org.adempiere.server-feature/data/import/AccountingUS.csv @@ -3,7 +3,7 @@ 11,"Cash",,"Asset",,,"Yes",,1,11,"Cash",1,"Cash",,,,,, 11100,"Checking Account","Bank Asset","Asset",,"Yes","No","B_ASSET_ACCT",11,,,,,,,,,, 11110,"Checking In-Transfer","Bank transactions in transit","Asset",,"Yes","No","B_INTRANSIT_ACCT",11,,,,,,,,,, -11120,"Checking Unidentified Receipts","Receipts from unidentified customer","Asset",,"Yes","No","B_UNIDENTIFIED_ACCT",11,,,,,,,,,, +11120,"Checking Unidentified Receipts","Receipts from unidentified customer","Asset",,"Yes","No","",11,,,,,,,,,, 11130,"Checking Unallocated Receipts","Received, unallocated payments","Asset",,"Yes","No","B_UNALLOCATEDCASH_ACCT",11,,,,,,,,,, 11200,"Checking Account 2",,"Asset",,,"No",,11,,,,,,,,,, 11300,"Savings Account",,"Asset",,,"No",,11,,,,,,,,,, @@ -16,7 +16,7 @@ 12115,"Accounts Receivable Services - Trade","Accounts Receivables for Services","Asset",,"Yes","No","C_RECEIVABLE_SERVICES_ACCT",121,,,"2a","Trade nodes and accounts receivables",,,,,, 12120,"A/R Non Sufficient Funds Returned Checks",,"Asset",,,"No",,121,,,"2a",,,,,,, 12180,"A/R Trade Allowance for Bad Debit",,"Asset",,,"No",,121,,,"2b","Less allowances for bad debts",,,,,, -12190,"Not invoiced receivables","We delivered but have not invoiced yet","Asset",,"Yes","No","NOTINVOICEDRECEIVABLES_ACCT",121,,,"2a",,,,,,, +12190,"Not invoiced receivables","We delivered but have not invoiced yet","Asset",,"Yes","No","",121,,,"2a",,,,,,, 122,"Credit Card in Transit",,"Asset",,,"Yes",,12,,,,,,,,,, 12210,"In Transit A/R Amex",,"Asset",,,"No",,122,,,"2a",,,,,,, 12220,"In Transit A/R Master Card",,"Asset",,,"No",,122,,,"2a",,,,,,, @@ -30,10 +30,10 @@ 12440,"Loans Receivable Others",,"Asset",,,"No",,124,,,"2a",,,,,,, 125,"Prepayments",,"Asset",,,"Yes",,12,,,,,,,,,, 12510,"Vendor prepayment","Prepayments for future expense","Asset",,"Yes","No","V_PREPAYMENT_ACCT",125,,,"2a",,,,,,, -12520,"Employee Expense Prepayment","Expense advances","Asset",,"Yes","No","E_PREPAYMENT_ACCT",125,,,"2a",,,,,,, +12520,"Employee Expense Prepayment","Expense advances","Asset",,"Yes","No","",125,,,"2a",,,,,,, 126,"Tax receivables",,"Asset",,,"Yes",,12,,,,,,,,,, 12610,"Tax credit A/R","Tax to be reimbursed - before tax declaration","Asset",,"Yes","No","T_CREDIT_ACCT",126,,,6,,,,,,, -12620,"Tax receivables","Tax to receive based on tax declaration","Asset",,"Yes","No","T_RECEIVABLES_ACCT",126,,,6,,,,,,, +12620,"Tax receivables","Tax to receive based on tax declaration","Asset",,"Yes","No","",126,,,6,,,,,,, 12800,"Intercompany Due From","Default Receivables account for intercompany trx","Asset",,"Yes","No","INTERCOMPANYDUEFROM_ACCT",12,,,6,,,,,,, 12900,"A/R Miscellaneous",,"Asset",,,"No",,12,,,"2a",,,,,,, 13,"Investments",,"Asset",,,"Yes",,1,13,"Investments",,,,,,,, @@ -41,10 +41,10 @@ 13200,"Tax-Exempt Securities",,"Asset",,,"No",,13,,,5,"Tax-Exempt Securities",,,,,, 13300,"Other Investments",,"Asset",,,"No",,13,,,9,"Other Investments",,,,,, 14,"Inventory",,"Asset",,,"Yes",,1,14,"Inventory",3,"Inventories",,,,,, -14100,"General Trade Inventory","Inventory Account","Asset",,"Yes","No","W_INVENTORY_ACCT",14,,,,,,,,,, +14100,"General Trade Inventory","Inventory Account","Asset",,"Yes","No","",14,,,,,,,,,, 14120,"Product asset","Product Inventory Account","Asset",,"Yes","No","P_ASSET_ACCT",14,,,,,,,,,, -14130,"Work In Process","Work In Process Account","Asset",,"Yes","No","P_WIP_ACCT",14,,,,,,,,,, -14140,"Floor Stock","Floor Stock Account","Asset",,"Yes","No","P_FLOORSTOCK_ACCT",14,,,,,,,,,, +14130,"Work In Process","Work In Process Account","Asset",,"Yes","No","",14,,,,,,,,,, +14140,"Floor Stock","Floor Stock Account","Asset",,"Yes","No","",14,,,,,,,,,, 15,"Prepaid Expenses, Deposits & Other Current Assets",,"Asset",,,"Yes",,1,15,"Prepaid Expenses, Deposits & Other Current Assets",6,"Other Current Assets",,,,,, 151,"Prepaid Expenses",,"Asset",,,"Yes",,15,,,,,,,,,, 15110,"Prepaid Insurance",,"Asset",,,"No",,151,,,,,,,,,, @@ -110,8 +110,8 @@ 21550,"Mail Order Deposits",,"Liability",,,"No",,215,,,,,,,,,, 216,"Tax Payables",,"Liability",,,"Yes",,21,,,18,"Other current liabilities",,,,,, 21610,"Tax due","Tax to be paid - before tax declaration","Liability",,"Yes","No","T_DUE_ACCT",216,,,,,,,,,, -21620,"Tax liability","Tax to be paid based on tax declaration","Liability",,"Yes","No","T_LIABILITY_ACCT",216,,,,,,,,,, -21700,"Withholding (Tax)","Withholding for 1099 or Quality Guarantee","Liability",,"Yes","No","WITHHOLDING_ACCT",21,,,,,,,,,, +21620,"Tax liability","Tax to be paid based on tax declaration","Liability",,"Yes","No","",216,,,,,,,,,, +21700,"Withholding (Tax)","Withholding for 1099 or Quality Guarantee","Liability",,"Yes","No","",21,,,,,,,,,, 21710,"Withholding (Other)",,"Liability",,,"No",,21,,,,,,,,,, 21800,"Intercompany Due To","Default Payables account for intercompany trx","Liability",,"Yes","No","INTERCOMPANYDUETO_ACCT",21,,,,,,,,,, 22,"Accrued Expenses",,"Liability",,,"Yes",,2,22,"Accrued Expenses",18,,,,,,, @@ -152,7 +152,7 @@ 32,"Earnings",,"Owner's Equity",,,"Yes",,3,32,"Current Profit & Loss",25,"Retained Earnings",,,,,, 32100,"Dividends",,"Owner's Equity",,,"No",,32,,,,,,,,,, 32200,"Drawings",,"Owner's Equity",,,"No",,32,,,,,,,,,, -32900,"Retained Earnings","Year end processing to balance account (Income Summary)","Owner's Equity",,"Yes","No","RETAINEDEARNING_ACCT",32,,,,,,,,,, +32900,"Retained Earnings","Year end processing to balance account (Income Summary)","Owner's Equity",,"Yes","No","",32,,,,,,,,,, ,,,,,,,,,33,"Total Liabilities and Equity",,,,,,,, 4,"Sales",,"Revenue",,,"Yes",,,,,,,4,"Sales",,,, 41000,"Trade Revenue","Default Product or Service revenue","Revenue",,"Yes","No","P_REVENUE_ACCT",4,,,,,,,"1a","Gross receipts or sales",, @@ -160,16 +160,16 @@ 43000,"Sideline Revenue",,"Revenue",,,"No",,4,,,,,,,"1a",,, 46000,"Royalties Revenue",,"Revenue",,,"No",,4,,,,,,,7,"Gross Royalties",, 47000,"Unearned revenue","We have invoiced, but not delivered yet","Revenue",,"Yes","No","UNEARNEDREVENUE_ACCT",4,,,,,,,"1a",,, -48000,"Not invoiced revenue","We delivered but have not invoiced yet","Revenue",,"Yes","No","NOTINVOICEDREVENUE_ACCT",4,,,,,,,"1a",,, +48000,"Not invoiced revenue","We delivered but have not invoiced yet","Revenue",,"Yes","No","",4,,,,,,,"1a",,, 49,"Sales Discounts",,"Revenue",,,"Yes",,4,,,,,49,"Sales Discounts","1b","Less returns and allowances",, 49100,"Trade Discounts","Granted Trade discounts (corrects Product Revenue)","Revenue",,"Yes","No","P_TRADEDISCOUNTGRANT_ACCT",49,,,,,,,,,, 49200,"Payment discount expense","Granted early payment discount to customers","Revenue",,"Yes","No","PAYDISCOUNT_EXP_ACCT",49,,,,,,,,,, 49300,"Promotion Discounts",,"Revenue",,,"No",,49,,,,,,,,,, 5,"Cost of Goods Sold",,"Expense",,,"Yes",,,,,,,5,"Cost of Goods Sold",2,"Cost of goods sold",, 51100,"Product CoGs","Cost of Goods Sold","Expense",,"Yes","No","P_COGS_ACCT",5,,,,,,,,,, -51110,"Cost Of Production","Cost Of Production Account","Expense",,"Yes","No","P_COSTOFPRODUCTION_ACCT",5,,,,,,,,,, -51120,"Scrap","Scrap Account","Expense",,"Yes","No","P_SCRAP_ACCT",5,,,,,,,,,, -51130,"Outside Processing (Subcontract)","Outside Processing Account","Expense",,"Yes","No","P_OUTSIDEPROCESSING_ACCT",5,,,,,,,,,, +51110,"Cost Of Production","Cost Of Production Account","Expense",,"Yes","No","",5,,,,,,,,,, +51120,"Scrap","Scrap Account","Expense",,"Yes","No","",5,,,,,,,,,, +51130,"Outside Processing (Subcontract)","Outside Processing Account","Expense",,"Yes","No","",5,,,,,,,,,, 51200,"Product Expense","Default Service costs (I.e. not on inventory)","Expense",,"Yes","No","P_EXPENSE_ACCT",5,,,,,,,,,, 51210,"Product Cost Adjustment","Product Cost Adjustments","Expense",,"Yes","No","P_COSTADJUSTMENT_ACCT",5,,,,,,,,,, 51290,"Product Inventory Clearing","Default Product costs (I.e. on inventory)","Expense",,"Yes","No","P_INVENTORYCLEARING_ACCT",5,,,,,,,,,, @@ -182,17 +182,17 @@ 56,"Inventory CoGs",,"Expense",,,"Yes",,5,,,,,56,"Inventory CoGs",2,,, 56100,"Inventory Shrinkage","Physical Inventory Gain/Loss","Expense",,"Yes","No","W_DIFFERENCES_ACCT",56,,,,,,,,,, 56200,"Inventory Write Down Below Cost",,"Expense",,,"No",,56,,,,,,,,,, -56300,"Inventory Adjustment","Inventory Actual Accounting Value Adjustment","Expense",,"Yes","No","W_INVACTUALADJUST_ACCT",56,,,,,,,,,, -56400,"Inventory Revaluation","Difference to (lower cost) or market","Expense",,"Yes","No","W_REVALUATION_ACCT",56,,,,,,,,,, +56300,"Inventory Adjustment","Inventory Actual Accounting Value Adjustment","Expense",,"Yes","No","",56,,,,,,,,,, +56400,"Inventory Revaluation","Difference to (lower cost) or market","Expense",,"Yes","No","",56,,,,,,,,,, 57000,"Direct Labor",,"Expense",,,"No",,5,,,,,,,,,, 58,"CoGS Variances",,"Expense",,,"Yes",,5,,,,,58,"CoGs Variances",2,,, 58100,"Invoice price variance","Difference between product cost and invoice price (IPV)","Expense",,"Yes","No","P_INVOICEPRICEVARIANCE_ACCT",58,,,,,,,,,, 58200,"Purchase price variance","Difference between purchase price and standard costs (PPV)","Expense",,"Yes","No","P_PURCHASEPRICEVARIANCE_ACCT",58,,,,,,,,,, 58300,"Purchase price variance Offset","Offset Account for Purchase price variance (PPV) ","Expense",,"Yes","No","PPVOFFSET_ACCT",58,,,,,,,,,, -58400,"Using Variance","Account for Using Variance","Expense",,"Yes","No","P_USAGEVARIANCE_ACCT",58,,,,,,,,,, -58500,"Method Change Variance","Account for Method Change Variance","Expense",,"Yes","No","P_METHODCHANGEVARIANCE_ACCT",58,,,,,,,,,, -58600,"Rate Variance","Account for Rate Variance","Expense",,"Yes","No","P_RATEVARIANCE_ACCT",58,,,,,,,,,, -58700,"Mix Variance","Account for Mix Variance","Expense",,"Yes","No","P_MIXVARIANCE_ACCT",58,,,,,,,,,, +58400,"Using Variance","Account for Using Variance","Expense",,"Yes","No","",58,,,,,,,,,, +58500,"Method Change Variance","Account for Method Change Variance","Expense",,"Yes","No","P_RATEVARIANCE_ACCT",58,,,,,,,,,, +58600,"Rate Variance","Account for Rate Variance","Expense",,"Yes","No","",58,,,,,,,,,, +58700,"Mix Variance","Account for Mix Variance","Expense",,"Yes","No","",58,,,,,,,,,, 58800,"Average Cost Variance","Account for Average Cost Variance","Expense",,"Yes","No","P_AVERAGECOSTVARIANCE_ACCT",58,,,,,,,,,, 59,"CoGs Discounts",,"Expense",,,"Yes",,5,,,,,59,"CoGS Discounts",2,,, 59100,"Trade discounts received","Received Trade Discounts (corrects Product expense)","Expense",,"Yes","No","P_TRADEDISCOUNTREC_ACCT",59,,,,,,,,,, @@ -273,7 +273,7 @@ 68300,"Business Travel - Hotel",,"Expense",,,"No",,68,,,,,,,,,, 68400,"Business Meals & Entertainment (50%)",,"Expense",,,"No",,68,,,,,,,,,, 68500,"Staff Meeting Food (100%)",,"Expense",,,"No",,68,,,,,,,,,, -68600,"Employee expense","Default employee expenses","Expense",,"Yes","No","E_EXPENSE_ACCT",68,,,,,,,,,, +68600,"Employee expense","Default employee expenses","Expense",,"Yes","No","",68,,,,,,,,,, 68900,"Business Travel Other Expense",,"Expense",,,"No",,68,,,,,,,,,, 69,"Insurance",,"Expense",,,"Yes",,6,,,,,69,"Insurance",,,, 69100,"Business Insurance",,"Expense",,,"No",,69,,,,,,,,,, @@ -282,7 +282,7 @@ 69400,"Other Insurance",,"Expense",,,"No",,69,,,,,,,,,, 70,"Payment Processor Costs",,"Expense",,,"Yes",,6,,,,,70,"Payment Processor Costs",,,, 70100,"Credit Card Service Charges",,"Expense",,,"No",,70,,,,,,,,,, -70200,"Bank Service Charges","Bank expenses","Expense",,"Yes","No","B_EXPENSE_ACCT",70,,,,,,,,,, +70200,"Bank Service Charges","Bank expenses","Expense",,"Yes","No","",70,,,,,,,,,, 70900,"Other Payment Service Charges",,"Expense",,,"No",,70,,,,,,,,,, 71,"Dues & Subscription",,"Expense",,,"Yes",,6,,,,,71,"Dues & Subscriptions",,,, 71100,"Association Membership Fees",,"Expense",,,"No",,71,,,,,,,,,, @@ -329,7 +329,7 @@ 79,"Default/Suspense Accounts","Temporary accounts - balance should be zero","Expense",,,"Yes",,6,,,,,79,"Default/Suspense Accounts",,,, 79100,"Default account","Default Account (if no other account is defined) V1.1","Expense",,"Yes","No","DEFAULT_ACCT",79,,,,,,,,,, 79200,"Suspense balancing ","Difference to make journal balance in source currency - needs to be solved","Expense",,"Yes","No","SUSPENSEBALANCING_ACCT",79,,,,,,,,,, -79300,"Suspense error","Import did not find account - needs to be solved","Expense",,"Yes","No","SUSPENSEERROR_ACCT",79,,,,,,,,,, +79300,"Suspense error","Import did not find account - needs to be solved","Expense",,"Yes","No","",79,,,,,,,,,, 79400,"Cash book expense","Default other expense for petty cash transactions","Expense",,"Yes","No","CB_EXPENSE_ACCT",79,,,,,,,,,, 79500,"Cash book receipts","Default other revenue for petty cash transactions","Revenue",,"Yes","No","CB_RECEIPT_ACCT",79,,,,,,,,,, 79600,"Charge expense","Default other expense","Expense",,"Yes","No","CH_EXPENSE_ACCT",79,,,,,,,,,, @@ -342,8 +342,8 @@ 80300,"Rental Income",,"Revenue",,,"No",,80,,,,,,,6,"Gross Rents",, 80400,"Sales Tax Commission",,"Revenue",,,"No",,80,,,,,,,,,, 805,"Currency Gain",,"Revenue",,,"Yes",,80,,,,,805,"Currency Gain",,,, -80510,"Bank revaluation gain","Foreign currency bank account gain","Revenue",,"Yes","No","B_REVALUATIONGAIN_ACCT",805,,,,,,,,,, -80520,"Bank settlement gain","Difference between payment and bank account currency","Revenue",,"Yes","No","B_SETTLEMENTGAIN_ACCT",805,,,,,,,,,, +80510,"Bank revaluation gain","Foreign currency bank account gain","Revenue",,"Yes","No","",805,,,,,,,,,, +80520,"Bank settlement gain","Difference between payment and bank account currency","Revenue",,"Yes","No","",805,,,,,,,,,, 80530,"Unrealized gain","Difference between foreign currency receivables/payables and current rate","Revenue",,"Yes","No","UNREALIZEDGAIN_ACCT",805,,,,,,,,,, 80540,"Realized gain","Difference between invoice and payment currency","Revenue",,"Yes","No","REALIZEDGAIN_ACCT",805,,,,,,,,,, 80700,"Capital Gains Income",,"Revenue",,,"No",,80,,,,,,,,,, @@ -355,8 +355,8 @@ 82300,"Uninsured Casualty Loss",,"Expense",,,"No",,82,,,,,,,,,, 82400,"Charitable Contributions",,"Expense",,,"No",,82,,,,,,,19,"Charitable Contributions",, 825,"Currency Loss",,"Expense",,,"Yes",,82,,,,,825,"Currency Loss",,,, -82510,"Bank revaluation loss","Foreign currency bank account loss","Expense",,"Yes","No","B_REVALUATIONLOSS_ACCT",825,,,,,,,,,, -82520,"Bank settlement loss","Difference between payment and bank account currency","Expense",,"Yes","No","B_SETTLEMENTLOSS_ACCT",825,,,,,,,,,, +82510,"Bank revaluation loss","Foreign currency bank account loss","Expense",,"Yes","No","",825,,,,,,,,,, +82520,"Bank settlement loss","Difference between payment and bank account currency","Expense",,"Yes","No","",825,,,,,,,,,, 82530,"Unrealized loss","Difference between foreign currency receivables/payables and current rate","Expense",,"Yes","No","UNREALIZEDLOSS_ACCT",825,,,,,,,,,, 82540,"Realized loss","Difference between invoice and payment currency","Expense",,"Yes","No","REALIZEDLOSS_ACCT",825,,,,,,,,,, 82550,"Currency balancing","Rounding difference to make journal balance in accounting currency","Expense",,"Yes","No","CURRENCYBALANCING_ACCT",825,,,,,,,,,, @@ -364,15 +364,15 @@ 82800,"Fixes Asset Sale Loss",,"Expense",,,"No",,82,,,,,,,,,, 82900,"Other Expense",,"Expense",,,"No",,82,,,,,,,,,, 83,"Expense (Absorbed)",,"Expense",,,"Yes",,,,,,,83,"Expense (Absorbed)",,,, -83100,"Labor (Absorbed)","Labor Absorbed account","Expense",,"Yes","No","P_LABOR_ACCT",83,,,,,,,,,, -83200,"Burden (Absorbed)","Burden Absorbed account","Expense",,"Yes","No","P_BURDEN_ACCT",83,,,,,,,,,, -83300,"Overhead (Applied)","Overhead Applied account","Expense",,"Yes","No","P_OVERHEAD_ACCT",83,,,,,,,,,, +83100,"Labor (Absorbed)","Labor Absorbed account","Expense",,"Yes","No","",83,,,,,,,,,, +83200,"Burden (Absorbed)","Burden Absorbed account","Expense",,"Yes","No","",83,,,,,,,,,, +83300,"Overhead (Applied)","Overhead Applied account","Expense",,"Yes","No","",83,,,,,,,,,, ,,,,,,,,,,,,,"83_","Net Income before Tax",,,, 89,"Income Tax & Summary",,"Expense",,,"Yes",,,,,,,89,"Income Tax & Summary",,,, 89100,"Federal Income Tax",,"Expense",,,"No",,89,,,,,,,,,, 89200,"State Income Tax",,"Expense",,,"No",,89,,,,,,,,,, 89300,"Local Income Tax",,"Expense",,,"No",,89,,,,,,,,,, -89900,"Income Summary","Year end processing to balance account (Retained Earnings)","Expense",,"Yes","No","INCOMESUMMARY_ACCT",89,,,,,"89_","Net Income",,,, +89900,"Income Summary","Year end processing to balance account (Retained Earnings)","Expense",,"Yes","No","",89,,,,,"89_","Net Income",,,, 91,"Costing",,"Memo",,,"Yes",,,,,,,,,,,, 911,"Profit Center Costing Distribution",,"Memo",,,"No",,91,,,,,,,,,, 912,"Project Costing Distribution",,"Memo",,,"No",,91,,,,,,,,,, diff --git a/org.adempiere.server-feature/data/import/AccountingUS.xls b/org.adempiere.server-feature/data/import/AccountingUS.xls index fc8ced345b7c3ed77e3da5cc7fb9acd6c819e77a..9e028bcd6c63052763b2c483c464582b7b7009d2 100644 GIT binary patch delta 10818 zcmZXa3w+J>|Hr?dV=faua~thAGsD_TKOJYgvjU$(l z+!J!-mfR|-BuPRNA|*+ZB$xmD^ZCB^O~3yDH#!QtGHow4%DfZ?+P3V-{uMw);J|7zvio=GKqQ>11YtF z1o>(YpwDX83KWZ)Qi}X_Qvz4(t}7l`|75xdgfyHds&a`=eTVnXDT{rC)wl1kQQ0Hu zqBkY*RHJ$>dMPP6a60J)L2a8R(~73e=w8#IH1Vn7#hV(lsv3dco?0ACi(8)y%xaTT zB5AUPH}>QyVRxDUE*n0m%Y@Z>%GWGV}VgG)G*5M*a9^T zV=gxz)4(uFRx^xcDTdLtbYQCQXO}BX1YYRw5^A6O?DQZi)+eBT-xw0<2<+QgRW%u=pcv{o9wyf_cWsH_a13J^!Efc_`c0Wl$ zSzeJyO|$-WOCGm!=VZA>LzQQwjxk?-5d7o@_+-r}pydijmUb>Z)DjT6{dCu)= zG^Td_Oqm2$LATU|X7r1r1N|aJeY(^yRy3uM{<-2Qn%X~=$1Tuw{^2w4@`0GDRzj8f=Qz)PAtyO9#6}8`?QIS3biv)N!t^ zN7t4b4e^Rp${A8SM9o$ySBMe8dufCTT0JC*PZ7E>q)_dq42=p6@IYn2jU8o?(5?$#;jv87-u3Px1X>K}i^K%nLH`KY}D0aQ4uzUWWKMy2yMe6(8(prq0D#XuT5I#&#$bEEr;!PIO{CHE0qS6ymz`u{38wsu&$OGhvBKjHA($Q$5P2E+>ok z$;NRZ^zpXzN&6z5o6L5K$#aYG)G9Ci@$o3y+<44*&QQ5~jY>vyqfEh&%5)&Fl9)gz z^D@Omil34xCQ&|bC(|X~=25e$nPLhp;_XzrIkgj)Z8a@HPD8=AdNQZe%xPZn676SY z29#8-yiBg?UNMuBrYDG5ls!G&GYfi}?n=HBscZffIyJq%m`$Z$8X{h$(Jy6+IdqJ- zuTjj5Ofi?H^L8Gc<81*odO1@N74UXGUE}QnYBe)cETk1P(|LP+W}@&@ty#HZ5iOjR zDqlxCnR-_JbYqrVET%H~sUD@MiF}s#$;Q88UI9dtuTb_@=M(E5#PGo0h`%UpNE%KZ4FqDxP$uWPjI7}gnEcpqPQK;IB z*{5Km!L~5_3~Y?e3SPJ55umZKwP*G@*f_8i%#MP+2zGSK*VDU>V`4!k?n+5WgG*K^G^!~Ex@&vRz_}dp+@@uduU@MrN1e*$WgV{G= z)4)=eTk;gxbg;S1PJ_J!cAnW8uo+Exw~V zZ`7CPpwB|i&^IjkJy<^29%kpkUO}BQE0e`}N?VyIFF=_M_uQ41xJbuWn(_xIuR+MA}l3}p_K>8$)nhgi7+IxBS=^>;Yu&ED3<_QsFYmyx2uW?$ zS@LhN*TEL8vpj!+E!J1(T_;jk=T*ABt~%9R-^%rmK||Juh1`R@RJVHHpatvOy6zct zVSSzO2hf)3LJyrt6=G-XhUi#+Cg}&;GNTkfswy}ZX|yr;bwS^smKh;NAHzkHHn>BI zffefha*_2LqU$K5dO9xW^kn1Wa+gk9uAg^7NLXH!aDPJsAt?T>M0K4Fcq>2Vzptq3 z0ixbzdFQ;gs>g^_udVKluK#@~s++QUC{n`PqgBPX-i`<D~Q-{0EM6OM$pbb56s(&^MbP+h;;zs0Zi<7q-5 z(Gvm3M(wZRM7IBEz!Z^mC*bwegz~ob)p8=+m$uF1&)%cAc|B23Hfi4zPGtK&WnVPi z+UAuel+BpFq<1aJub6t~wt(d`;}=QI-T^zqtPa>#X5EZXirL=j5vI>An!P<%#=#dr z?xF3LtP8dcEObYPtOxck>W$pt6ZPoGj>evNDBJaD>N}A=n#i4|Xh3N@O_=~?2dYlr zX(c@gwo~UOI+4zGqDK$p&Y}ZZc2{&#Ls)j{bgvUVn!f8l=fSR`^ohHoWg{f)Mvu1b zvSeeh_b|?&-9C{-J$5(tG=Z{5H`dgN>~U`0ZSq>e+1;k68I9L^f)xPFVWcv!(_cZN!&rE6oWuNx7bfQNGx$i%N+*dTnxIJO&-uKL&DBcBf_hh+} zS|NYGuGZR#9<8?jKh^dZRrBnN_OwC50iFJg6WN{av(FT5Y4$!dDHX~=?Mri_N1HkL zpJomgHFKYvNk_s5I=!6}+08WHZ;A{Wy5E%Tp?rv=wQ9eQmm%)$Z|vy^*)gJkoI+TBHMS2eLlK-ptkG=*_YI-i-NE z?dD?o?s8l|w+A8jIC2XPWyrx`UxD3VHU#VhSi6riBAW^8|)jf zfy{=1odP?=EC=i~SglVoWG>hlu&K<3gMABjp4kYnvtZ3W&5$F(z5`pzY!uizu)EAg zgMDwaK)27naLF-%=V5GkG((OBy8t%-s1-YonVQ^-dUAK~uqXGTp4=DVzi9glzQ~Z{ zfqp=Vp3EkIT>{&~Y$DiYX6k+)cFgBdOf_{`KdzhOaeY}ot|!r)W2T&ptRGS7&@oHq zfn5O${nC}yND2KEQo9AoV4V8u)n}!zOm#2usdKcGFu4tH`u4&c%>igE;BXmkW)U-zfARFk>gOk@YD2D zrhFajA5_|N%94x0?tzs#ZOJ8I_ffsaX`g4Q!&LQUPNb?YrDLZ}SqSz3l}eql%dBaZDY0`tQ1(#c}s2p3kK`V z>@Bd;V5^vI1bYnZ7PGg(%7C@F;FX)e$}&^q%)j8{wXusA;^Y=6<=_s#XvufLBv>}H ztzaQwdzl5m%7c~r!IIm+DuDI;!JG6hSVf_}WZLdT`q((pqc3h11zzC4`ypEHfTa>j zR=VVsJHaY5Qv>RL$tQNw)=P167nD%AuV3N?Hn1vS%`Wo-8(3AaIn4HeJq~t`+52E& z%v4KtfAop>X~vInaxWA&+y{TOJo~_^>7nj-BKtIqxKf?cuSCfM;2va7y<*9OVBu)z z_!Xb{fMR}%lOIB&ij9|1<7M8jV!c?hfqO3e7hCl1lMU*a4k67H~TUimTH zHR0}c&ByC(>*+F^c@HwfquF3~G=4t))B;77KQS*;in7z#?w6 zlqbOAz(z9r8mule)vv=heBx`0_&rXZgi;Ug9>4Q)99TTqMrNnL>Vw^5b{eb!SlUfq zjsr_zrdnEh(ahkEGy!g6nTVAK!1~xeKYSHvZ#8wlU^Gg6p23=O484+=rB^ zjSrm2HXeLn>NSp3QPPlf=Rr%)Lpaj3pFa%gcm6aCru)MLUbLF?Fd^IpC0+Z9IgzT% zOIY7OY#@RbR1gWC;*i>DV+kkH9azvuB#4p=7K()MQcyCqFW8Cff(x#Q&WWV~+Y9yC z>oJbhSFasJabukBWd~8#c-|-jR|oAX>(3Fw9a0XkBM(HavH6z>(Kb!dz5GG0qrRg0 z7=8I)1$~Wm;%P`W3VsOEg*yrL2L=)~I_VyUIFa2$fBhg4Ez0}52MM!I1s2t%+F6&0 zylj{0tjknHVrM<4+?CBiBE@yb@c$kp!a^!R?NX$=i;EOd+25l$k0KOe*CO#{7DK9l z`ijQ(O>xmxRPom>A>zWTLhPnH{kRjM)8k5raR2HOA}Tx#Ql>V#oe0LCm9cV3Hdcew zT^l`41Y>4No`!J$)RMw1UmfDJ+8W_97P>^6@(&(9e5n2};5(Sw`*-wqiREHmPN}kb zwx2B;-6yJ44gXCp6%vV3J&MHGQatpUpwAW2@ro85?4CvRGp4c@yw5Y`o0LB+Sfq+t z{{F#Y+W&l!+Mkb_y5aaA28+U&1|0DZ{zO83{#0wtk23Z7Q!)R?rG;8#_9s6kPIzjg zycKZa`-;ww0q`}IJnndZf8KfO!#Pkp`Sj4^9th_~8$uh5Dw9HZYP^6$0FNqIbUq9PIa%hsJpaw5AEcgqWVy*QiirFs6S3L??d1fF3!qp1_w8DlFTV;EO@w{>%;j}>SkDQ z4#(JLR}`&<+!gdJg3gWbhN3>Os(HeRvek}&0L$WQAySFkbJhP(h1DT2EjK}Jc2hiw?*5rahVVP0{) zDaso)Y`7qtpBKR^c;QuWL%-RuWCY(nf=@B*Qmmp8yn|bxqIy%(xX#DzvTeE^DGsQH zOYt|KPQ#zo5}AVkMkLs%=6cL{U^`QyL{AYskx#~dxDE7X_YO1Z>5G9KJ9|*$A3IG5A delta 11807 zcmZXa34Bb~`^N7X5faOZ*u_LF(OgMv5viq;n`B62nMlGUN>=+4iLEFaOI1}>bLgnr ztEzTls}icZtE%F!s;a21sG_Q<{NHo#liTvsPw(XYKF|A}<(@fr<|M@zJ&Lb;%x_y` zk%oUhnznH3b9O)5%3h+M-G8>ZobfS^*i=W1BfgIjo#;q2J;R!wVs&b1nj&Ma*@^K+bbMlbI%?brjZ(Ga)8pctiLvp?JqlsDUv zk>W^BL)}Y`vyw(XK}!#HkMfkY(t4*UuOl_pnQBg_N0On&8U5dp^q||KWZ`foH>fM? zr8&~m6CH9%Sz@VhUS@GLM^EG?I@8ScNJEd#Ef^j!X5iSdBL@KeH^KA4#Rwph{kDUa**-K zG0r4MTJNMJqhc|iPJ7g_RcMdMmiF{HoFn^7IfJT)7!=3+(v2-ZTJ>aVjv zVasx|mLip|&xlo7P96lWxAN*G*%7Rjcs5(-!4Rq`Aw(3C5-Qea>#VgnmYqb`fShpF zM)b)k;%(rqsl08)$(#t*PSnf|?9|>;s%s97#-vTPc~hq}EmBL~XLgfoj7SGKxvCK^ zM&w4Yj$(CgU~okZP80NR4SH8ojXc!wQ8gmO-P{D$UPR^jv1diUyae6}RcldhmeyJ9 z%+q-nFkjVDS8+2hR866;n!@KqgZx0M(JeoibrZw#i&&&Mlb>Lhy^wvUMMCY~E;IXH zSG5}@Vh6}}=MV5>hS)IRUpMUr=`D2iZ%#3@n+LkU&N5YcF~nH{RKhl<$IVSE@ot(9lEm^C`IhMeiv z8)kv1e>P8zcP3 zWwNni!nh(fPF$m($BWqU`RoO;c6=t~+FmH4>)00t^9g9V3$<3DO%&H&2xpT-z=R~a z7EB0dFN)O@GU@twg3cz3pos~53NpH>*_tY*Pt@5uAk(M}cUyW~Yk*QS*yIXMTM#qqq*AgL*yHguW)$6i2YR;%spk ze;rDKQs#+(X%XxVkufcd%@=d0B?Zoho~V|_n^q+EmlBHP(nwTGqxSSVOo*WA!`T9{ zV0tE7C~ngAEfF^(lextzx-Jrr==!$kGc%Jd7F+20j_`gtlPwVg=(<#ty_`hX>a)Vx zG7&wih%Fb}XC?3zXfsny@G?>J6+gC8w0b4ME)_YC&(mw9cC8gt%l3J-kE{|UuOzS) z;w-t}6%YR7?yuaPgH3mTgH8c8$dZx)K1Pkoox|w=IQpW@C{VH zZB}IZj*_obJRsk8D1(%5hZUK=s5f-BQw)1Ux9@^7SowBak?Gq)z7NIeH*~%S$`Fjg zcm72CM_@x$?p`Z0bJxz-**zRu~1qi)79jK=#-gVS?GvEg8Si5&nN0k)3V$6zDD z9uPYSRzOVNg`Op8>=Uu9q@Dc`lu@cjpIVXGqw6I)`%Kgmy8Uw~h06DZ6`8(%qKSH} z7OH*hOEG~mzJjMnWqfT#W=0t@id4p7aa!p78+b;e=e`RJ`w_4)s>-)kWL7C$ptGZ5 z@dBNH2W2cqcx*u=`%d^SH25(n<4`q^*!N)L!L|`Q4)y|=?Ja|!0Gj}oO6(-qM6gxF z{ts*t*ll8`z+ME4b{qT$u*qO0#7=`v0Xt9ZN3f}2?H3vR4A@I1E1kZmi~M*f_Aj2v ze}YyFf9g91KMOVuY!$Je!KQ=VCUy>N23YhGgZ~0H6Rd>Td9atk&J();HVdr%QiERv zdj)Jdv0uSv6O-%j*wRS5WO4(Wtv1(+2f=K${ag~Qm$l=Uk@YGn6)ZFO6|gyAWyG$6 zy@u*Fmq)UzB6)c@zXoM4+$GBm_M14qT<6!Jybh)M3WMDc$t!ez6Usa&vqj>@;!S;+<&i0b@`xKtls$^Ow?TyXRFLa_L@dMp71VFU8usut804NJefGLCd9ug zw56)5mlesXhLo4 zJgfodGBqSBz4ZN{5ScDZFINfYmzxR8RYFZ9EU!rTKmS^g zR;r2ewIWPZ{Q4k!ZGv(%E1#ICmF7f=c~qnh(pIS=U8x81o~^2A?eq2i&zL}d6|IYM ztDY#gij+xOHSu_Tpie!NdzT7i$lDdRp^yDv$hBOpzGaa&sDW6sLHBP6wp#U~kriPm zH#P(@KT&U^?%x>Fd&+3HA{hH`3}XIb)<)f@38Xa@BiX+(iU$C`uX@*1)ZCQ70z}_U zeyo`oze%?@hrU)-uW+wbC7O!8n{@iheQ8sKJrKSRl&_@~$zC)Soj02c{{yw~pJBqa zxuZP@rgbVsw<0rT9a7e*lvYf9PAT-^P2G(3Dka2<%#=o3ny9Y}>nY_$EtF{@dP}&y zHC!81P8%ySa~5pTSzA%ICBohg%0}gDZ$+lhcdO3AMAxkm_6|@sDPOo1nZEht>nQeY zjo=YbHk)%*vd!Sn0&T(cr4Z``wiRpzvCd%Ih-J|9-P)G+AEs7}NG%QKUEnK4?%Yy? zcLm!HcBa(Hp99;0dY!ks*mI&}dnbE0C_B|)BCW_A%$4mrixR#&bZ$V|g{nPw81`te z-6}W6ip<=#JIq_YTiw4{CO+K}WOu;yp-Sm)MP`ckPBZ00mC}QWXLbhhIGFaJ<*c0s zj|ck*s!icH^O@}-D-+Y7c)0NivaDdJ3LZJhyY=#w?W#@fl&es7|Hj|0<9|hU_!t}99dESc5lv^L^bTZIr zuWs)T<)HFqS&`|>*=v?Qs7hxuF=cO%JqM;wR7$QDnJEYN>MT!O->dU{D2H%+TI_SN z0b=sLPWFLNK2;S4S&>=c*gl;N7LWEt*oQ#*O!%#Rm9`2u~oTjt`Uz`g|QyWd5J2HW!o_%QEa zeb!X0IcNmGNV;4$@)l*Q?S#kFV|X%hk0ICh6DOYn_B~i3v8iCk!Hy7n3G4(| z$RQ^$20IBhhuAc*{{y>1Y&zH}u{@Tgsfn5MQOY9A>i(p+3JNbODUx~?`eDPtIT{79$uk;}yR~-h) zz2R3)KKtJkHNVk$39>GsQul8RF2F8>y+v#R*cGr##1?{GMT;Gexacru-Vr}Km|1s3 z=WgiNkaPZs!54x32G;&tgTD=S9c((W#b7tUjuCqY>?T;VqXu6B_B+^UVoSkpfgL2a z4D1hLa&~;bbJ>?$OwP^Ldv zJs>8>J^#4N{x6fgSZ_IGFV+c<6FT1j_7Ii2o-p`Eut#8XiERS=2i4DFE;w}UaT z`^0vD*@(#@$DMYu9b(04KRR04ds^qapjSf9-O~o&4dwwB`=h}>1gi|TfY=@|Pq2%` zJ_4%(*5Qo7_kvXgn@MaRm>1Y_Vr5|7U@d;4BPg(HU}K3L0ILpm=%)z&F<1>^a-800 zUF@L9I~&SBfl?FhWoHe32#kZ>B=#wo4_LRK4gMKeEwFjSJ_qv!JNt7)+!tWAnf#U5 zmsX_ijTKea2CCoh$Ze-K^Q0$UBii=NNPegJiV5erApSKH>Y#yH=OXxFu)4(L@D87I zvBRRpFQNP!DD~jZ`NiNz!0Ll-A@(g;1Cy1UH~3MYhOng&`wpxTG1<_H^Da8nx_>^D zAA{ltcZUl`-1lIO)wqva(SOI?nEiL$jh`5IV_-uOCDc-y!9Dd#1V00J zbGQ#(aj~C7=&?Sz~Zja;TBjBF*(zVuDRHG zaqF5NU9115+b=-Z)!bgRBJ=&8`db+LRm}RW2fqZR6>6XP&A~5&1%tJ{?%-FzLcnGc zy9yQxc8b_Fu-3$6zd~-f*flZpMkxOcN*lNj+%Wicu(n`6Hw}IRtQ}Ymv72D+!L|_l z9W0C(wN&!Ei%z{Veh=lhAasCv!S4qD11ucuBC*?G9l<)>GWZ>^2(ze|dCSG_h%>kR z=)mj#EuH@f{aNI+{lnn*z&e2y6Z;FSGuTmL_rbb=1>83H-(X$A3W+@cdk*Zt?Fjx5 ztQ#>ot)6#W?4iiI6Ka11B~sn!f2;@_`yHJ<7RTsXE*{;vD!-y!zWYDtHJOy9&TGp5 zTqJ+Rt#*|tG{5GaVW--P8LAPR6`75A{H5C}*+iSag185yXe1B%%ixv4V!(D1^8||p z^Sp2HDqs$WiBX!~7dSNm9OsRwR9NCKdUpJ!>RJKMJEiiZX9d zvNATdBD3JZM`6q^?mY_g_lM$Cz9v?Lf<6984-WuLVe;EqQ;L|)Q|m?h@I zw$==;Udq*69R0`7rv+Fl-57Od_VAyceiD|^7rj(EH_X-Yw0!!{SACLBd&|b+?1CO* z3+VsH<>lq_e>Z-9TfT11eTTK9#TluUT<}n>r!o2W7=dUhO%0=^6=4`}J`SS4AldU+ z4+$bkerlKB^dq%qznVqTRS_L&>1rL(bn@~j8)KqZc_W`z(0W&BFP2BKV6nH{&nE;@ zp9<-6d6Z8mpbJA^7{U6m(1r6@sDEon8LF>stjO%^!XKEwI$h3C3#6@W;h!wXza3ne zDyO{_nK|w*3`vnH{TXAre+0zmmGxOGg0+SRSv$Eq zdNAFmGsJ!vuX~gSi}L9L+P{MCm$YI9WK~dJnMLug@Mf#YY3k0Z%o12v_qxh###6tZ z9fXa@9plNCJ#`2@inON>p$oy>)v7Rg((Im5g&ns)hxT&R;JR6n99&cP*s4rtk?v*m z5?rx7a@F$4^Qf%WSgu+gQOL_xV`=KXU6mQ!0L%l7_97S!m=9P&Fjzvl@&-_8mv*VT z`TiV0r8Be`Bn-fWJoaKP7UQO02ZY*Vp$$}>cUY0x`4!&GJmMLs?tFKfd!IK8it7Q} zAeB_HUIv-{p$^DTiG!Z_BsJ)XPf~+awK$u*Ni`N^k4Lq^s#?W58jR5ms7CYG(>;$~ z>8=_Tb-OvcLBZd6llXxWleRO;$DEm0q;pz zv93k{cCW!Acq*JD3DT3&J+}rewp9128Z0zE4O)TfM7kBJPGFh}XqsNKK4=#_F--+D zO~qPoo96CWlZD&+pui|q&SgdBn3mLJ=E3$T%6d`DpsYhOD-*s#mDSgZ%&dAGS%s>t z=P9cjXYF`D_=?ni+uuEvGe4dMI2vPJ%UKVW<-WyPD9?sA29p!wLo=2GI2LfSgt>s@ z01p$i=K+paz09{FvzM)Eu_obiQH@s%X8_4^t&eB&*I4pRY-%;=&t(Q$sq%3$$X!^A zIzAZi1=aB(?!~oO8XpQcLG@#Z`%x|G+%Uk2fQi0zk1M8d5@3mh!{K}pHBb3c%@Kf; z;p|+SoFf6J02bF~^fyWFCADcs7zJ&rsaer~zi&-dgD!O6q6A(9%S&d$uAn+p%&RS( zLDgbj+H3B1fvonf?7FNq^GYD-uH>byG2sXGq_Zo1-U_jKY44cuTz%GzdF5*!nkT^v zCZu004P{;z=d{R2$e(>ITdzugKx4K3LjcQUULOD9IQ)cWFGG|Z`tb#ZTL$=dpNp%p;A(z-DDlbyD0%}H}6k&`)hJ#NWtOtkf=xig5> z@u(3&LKOY4y>jh?dhVtntVz}4QEz-xJoy_Yrg=QOt2l(+W$Z2YxYlfj&A0ik2d$ZB GrT+(s>c|rS