midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4282 Error creating a Price List - using -DPostgreSQLNative=Y (#131) 

Starting point is the open source version of Compiere org/compiere/process/PriceListCreate.java
This version adds column M_DiscountSchemaLine.Description and rounding options for Hundred and Thousand
Then added to this version the iDempiere changes related to use correctly the T_Selection with AD_PInstance_ID,
and the changes related to Ticket #1002354: Price List Enhancement - which added Product Costs as an option for getting the initial price
This commit is contained in:
Carlos Ruiz 2020-06-24 11:53:49 +02:00 committed by GitHub
parent 03fda36934
commit f5518a9b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 711 additions and 808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
migration/i7.1z/oracle/202006231508_IDEMPIERE-4282.sql Normal file
View File

@ -0,0 +1,155 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-4282 Error creating a Price List - using -DPostgreSQLNative=Y
-- Jun 23, 2020, 2:27:55 PM CEST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,IsHtml) VALUES (214211,0,'Description','Optional short description of the record','A description is limited to 255 characters.',477,'Description',255,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_DATE('2020-06-23 14:27:55','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-06-23 14:27:55','YYYY-MM-DD HH24:MI:SS'),100,275,'Y','Y','D','N','N','N','Y','d305e928-d7de-4af1-9048-e9b5b4439a9e','Y',10,'N','N','N')
;
-- Jun 23, 2020, 2:27:58 PM CEST
ALTER TABLE M_DiscountSchemaLine ADD Description VARCHAR2(255) DEFAULT NULL
;
-- Jun 23, 2020, 2:29:22 PM CEST
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206416,'Description','Optional short description of the record','A description is limited to 255 characters.',405,214211,'Y',255,350,'N','N','N','N',0,0,'Y',TO_DATE('2020-06-23 14:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-06-23 14:29:22','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9e955794-3db2-4c57-b708-79aa96008255','Y',350,5)
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=40, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5246
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=60, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206416
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8642
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5253
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5250
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5251
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5249
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54331
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54332
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54333
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5254
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5258
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5255
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5259
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5256
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5257
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5349
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5260
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5264
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5261
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5265
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5262
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5263
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5350
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5266
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5270
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5267
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5271
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5268
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5269
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5348
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204886
;
-- Jun 23, 2020, 2:33:10 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200493,'Hundred',155,'h',0,0,'Y',TO_DATE('2020-06-23 14:33:10','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-06-23 14:33:10','YYYY-MM-DD HH24:MI:SS'),100,'D','db44cf2a-5e62-42de-b714-2871757c2d81')
;
-- Jun 23, 2020, 2:33:20 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200494,'Thousand',155,'t',0,0,'Y',TO_DATE('2020-06-23 14:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-06-23 14:33:20','YYYY-MM-DD HH24:MI:SS'),100,'D','ed450a1b-e56a-4101-be04-2936d85fae0a')
;
SELECT register_migration_script('202006231508_IDEMPIERE-4282.sql') FROM dual
;

152
migration/i7.1z/postgresql/202006231508_IDEMPIERE-4282.sql Normal file
View File

@ -0,0 +1,152 @@
-- IDEMPIERE-4282 Error creating a Price List - using -DPostgreSQLNative=Y
-- Jun 23, 2020, 2:27:55 PM CEST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,IsHtml) VALUES (214211,0,'Description','Optional short description of the record','A description is limited to 255 characters.',477,'Description',255,'N','N','N','N','N',0,'N',10,0,0,'Y',TO_TIMESTAMP('2020-06-23 14:27:55','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-06-23 14:27:55','YYYY-MM-DD HH24:MI:SS'),100,275,'Y','Y','D','N','N','N','Y','d305e928-d7de-4af1-9048-e9b5b4439a9e','Y',10,'N','N','N')
;
-- Jun 23, 2020, 2:27:58 PM CEST
ALTER TABLE M_DiscountSchemaLine ADD COLUMN Description VARCHAR(255) DEFAULT NULL
;
-- Jun 23, 2020, 2:29:22 PM CEST
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206416,'Description','Optional short description of the record','A description is limited to 255 characters.',405,214211,'Y',255,350,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2020-06-23 14:29:22','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-06-23 14:29:22','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9e955794-3db2-4c57-b708-79aa96008255','Y',350,5)
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=40, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, ColumnSpan=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5246
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=60, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206416
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=70, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8642
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=80, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5253
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=90, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5250
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=100, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5251
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=110, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5249
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=120, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54331
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54332
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=140, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54333
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5254
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=160, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5258
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=170, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5255
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=180, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5259
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=190, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5256
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=200, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5257
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=210, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5349
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=220, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5260
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5264
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5261
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5265
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5262
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5263
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5350
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5266
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5270
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5267
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5271
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5268
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5269
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5348
;
-- Jun 23, 2020, 2:30:10 PM CEST
UPDATE AD_Field SET SeqNo=0, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2020-06-23 14:30:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204886
;
-- Jun 23, 2020, 2:33:10 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200493,'Hundred',155,'h',0,0,'Y',TO_TIMESTAMP('2020-06-23 14:33:10','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-06-23 14:33:10','YYYY-MM-DD HH24:MI:SS'),100,'D','db44cf2a-5e62-42de-b714-2871757c2d81')
;
-- Jun 23, 2020, 2:33:20 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200494,'Thousand',155,'t',0,0,'Y',TO_TIMESTAMP('2020-06-23 14:33:20','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-06-23 14:33:20','YYYY-MM-DD HH24:MI:SS'),100,'D','ed450a1b-e56a-4101-be04-2936d85fae0a')
;
SELECT register_migration_script('202006231508_IDEMPIERE-4282.sql') FROM dual
;

1149
org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java
View File

File diff suppressed because it is too large Load Diff

13
org.adempiere.base/src/org/compiere/model/I_M_DiscountSchemaLine.java
View File

@ -134,6 +134,19 @@ public interface I_M_DiscountSchemaLine
*/
public int getCreatedBy();
/** Column name Description */
public static final String COLUMNNAME_Description = "Description";
/** Set Description.
* Optional short description of the record
*/
public void setDescription (String Description);
/** Get Description.
* Optional short description of the record
*/
public String getDescription();
/** Column name Group1 */
public static final String COLUMNNAME_Group1 = "Group1";

11
org.adempiere.base/src/org/compiere/model/MProductPO.java
View File

@ -95,16 +95,7 @@ public class MProductPO extends X_M_Product_PO
@Override
protected boolean beforeSave(boolean newRecord)
{
if ((newRecord && isActive() && isCurrentVendor()) ||
(!newRecord &&
(
(is_ValueChanged("IsActive") && isActive()) // now active
|| (is_ValueChanged("IsCurrentVendor") && isCurrentVendor()) // now current vendor
|| is_ValueChanged("C_BPartner_ID")
|| is_ValueChanged("M_Product_ID")
)
)
)
if (isActive() && isCurrentVendor())
{
int cnt = DB.getSQLValue(get_TrxName(),
"SELECT COUNT(*) FROM M_Product_PO WHERE IsActive='Y' AND IsCurrentVendor='Y' AND C_BPartner_ID!=? AND M_Product_ID=?",

31
org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
View File

@ -33,7 +33,7 @@ public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine
/**
*
*/
private static final long serialVersionUID = 20200413L;
private static final long serialVersionUID = 20200623L;
/** Standard Constructor */
public X_M_DiscountSchemaLine (Properties ctx, int M_DiscountSchemaLine_ID, String trxName)
@ -193,6 +193,23 @@ public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine
return (Timestamp)get_Value(COLUMNNAME_ConversionDate);
}
/** Set Description.
@param Description
Optional short description of the record
*/
public void setDescription (String Description)
{
set_Value (COLUMNNAME_Description, Description);
}
/** Get Description.
@return Optional short description of the record
*/
public String getDescription ()
{
return (String)get_Value(COLUMNNAME_Description);
}
/** Set Group1.
@param Group1 Group1 */
public void setGroup1 (String Group1)
@ -369,6 +386,10 @@ public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine
public static final String LIMIT_ROUNDING_CurrencyPrecision = "C";
/** Ending in 9/5 = 9 */
public static final String LIMIT_ROUNDING_EndingIn95 = "9";
/** Hundred = h */
public static final String LIMIT_ROUNDING_Hundred = "h";
/** Thousand = t */
public static final String LIMIT_ROUNDING_Thousand = "t";
/** Set Limit price Rounding.
@param Limit_Rounding
Rounding of the final result
@ -535,6 +556,10 @@ public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine
public static final String LIST_ROUNDING_CurrencyPrecision = "C";
/** Ending in 9/5 = 9 */
public static final String LIST_ROUNDING_EndingIn95 = "9";
/** Hundred = h */
public static final String LIST_ROUNDING_Hundred = "h";
/** Thousand = t */
public static final String LIST_ROUNDING_Thousand = "t";
/** Set List price Rounding.
@param List_Rounding
Rounding rule for final list price
@ -850,6 +875,10 @@ public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine
public static final String STD_ROUNDING_CurrencyPrecision = "C";
/** Ending in 9/5 = 9 */
public static final String STD_ROUNDING_EndingIn95 = "9";
/** Hundred = h */
public static final String STD_ROUNDING_Hundred = "h";
/** Thousand = t */
public static final String STD_ROUNDING_Thousand = "t";
/** Set Standard price Rounding.
@param Std_Rounding
Rounding rule for calculated price