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

IDEMPIERE-4086: Allow Product without price list on some document type (#974)

This commit is contained in:
Deepak Pansheriya 2021-11-12 15:27:30 +05:30 committed by GitHub
parent 149a47b044
commit 9c747a6f0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 196 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
migration/i8.2z/oracle/202110090932_IDEMPIERE-4086.sql Normal file
View File

@ -0,0 +1,82 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-4086 avoid product dependency on price list
-- Oct 9, 2021, 12:13:26 AM IST
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Help,PrintName,EntityType,AD_Element_UU) VALUES (203543,0,0,'Y',TO_DATE('2021-10-09 00:13:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2021-10-09 00:13:25','YYYY-MM-DD HH24:MI:SS'),100,'IsNoPriceListCheck','Allow Product Without Pricelist','Allow product without pricelist on this document type.','Allow Product Without Pricelist','D','a82fd279-9714-457b-8723-5bf8b5f58c63')
;
-- Oct 9, 2021, 12:17:03 AM IST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,FKConstraintType,IsHtml) VALUES (214593,0,'Allow Product Without Pricelist','Allow product without pricelist on this document type.',217,'IsNoPriceListCheck','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_DATE('2021-10-09 00:17:02','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2021-10-09 00:17:02','YYYY-MM-DD HH24:MI:SS'),100,203543,'Y','N','D','N','N','N','Y','ff5dcc56-c1da-47d6-b233-c7e7308bf6e2','Y',0,'N','N','N','N')
;
-- Oct 9, 2021, 1:04:07 AM IST
ALTER TABLE C_DocType ADD IsNoPriceListCheck CHAR(1) DEFAULT 'N' CHECK (IsNoPriceListCheck IN ('Y','N'))
;
-- Oct 9, 2021, 12:21:45 AM IST
INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (206753,'Allow Product Without Pricelist','Allow product without pricelist on this document type.',167,214593,'Y',1,240,'N','N','N','N',0,0,'Y',TO_DATE('2021-10-09 00:21:45','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2021-10-09 00:21:45','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9b91a693-daa0-4402-b1ff-cb9a9502ed7d','Y',240,5,2)
;
-- 09-Oct-2021, 9:21:21 AM IST
UPDATE AD_Field SET DisplayLogic='@DocBaseType@=''SOO'' | @DocBaseType@=''POO''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 09:21:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206753
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206753
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10345
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10346
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10481
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10480
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58859
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10371
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10528
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10340
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200004
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205278
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206430
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6567
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3125
;
SELECT register_migration_script('202110090932_IDEMPIERE-4086.sql') FROM dual
;

78
migration/i8.2z/postgresql/202110090932_IDEMPIERE-4086.sql Normal file
View File

@ -0,0 +1,78 @@
-- IDEMPIERE-4086 avoid product dependency on price list
-- Oct 9, 2021, 12:13:26 AM IST
INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Help,PrintName,EntityType,AD_Element_UU) VALUES (203543,0,0,'Y',TO_TIMESTAMP('2021-10-09 00:13:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2021-10-09 00:13:25','YYYY-MM-DD HH24:MI:SS'),100,'IsNoPriceListCheck','Allow Product Without Pricelist','Allow product without pricelist on this document type.','Allow Product Without Pricelist','D','a82fd279-9714-457b-8723-5bf8b5f58c63')
;
-- Oct 9, 2021, 12:17:03 AM IST
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Help,AD_Table_ID,ColumnName,DefaultValue,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,FKConstraintType,IsHtml) VALUES (214593,0,'Allow Product Without Pricelist','Allow product without pricelist on this document type.',217,'IsNoPriceListCheck','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_TIMESTAMP('2021-10-09 00:17:02','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2021-10-09 00:17:02','YYYY-MM-DD HH24:MI:SS'),100,203543,'Y','N','D','N','N','N','Y','ff5dcc56-c1da-47d6-b233-c7e7308bf6e2','Y',0,'N','N','N','N')
;
ALTER TABLE C_DocType ADD COLUMN IsNoPriceListCheck CHAR(1) DEFAULT 'N' CHECK (isNoPriceListCheck IN ('Y','N'))
;
-- Oct 9, 2021, 12:21:45 AM IST
INSERT INTO AD_Field (AD_Field_ID,Name,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,XPosition,ColumnSpan) VALUES (206753,'Allow Product Without Pricelist','Allow product without pricelist on this document type.',167,214593,'Y',1,240,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2021-10-09 00:21:45','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2021-10-09 00:21:45','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','D','9b91a693-daa0-4402-b1ff-cb9a9502ed7d','Y',240,5,2)
;
-- 09-Oct-2021, 9:21:21 AM IST
UPDATE AD_Field SET DisplayLogic='@DocBaseType@=''SOO'' | @DocBaseType@=''POO''', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 09:21:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206753
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=230, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=5, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206753
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=240, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10345
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10346
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=260, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10481
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=270, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10480
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=280, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=58859
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=290, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10371
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=300, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10528
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=310, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10340
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=320, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200004
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=330, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205278
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=206430
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6567
;
-- Oct 9, 2021, 10:51:52 PM IST
UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2021-10-09 22:51:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3125
;
SELECT register_migration_script('202110090932_IDEMPIERE-4086.sql') FROM dual
;

9
org.adempiere.base/src/org/compiere/model/I_C_DocType.java
View File

@ -420,6 +420,15 @@ public interface I_C_DocType
*/ */
public boolean isInTransit(); public boolean isInTransit();
/** Column name isNoPriceListCheck */
public static final String COLUMNNAME_IsNoPriceListCheck = "IsNoPriceListCheck";
/** Set Allow Product Without Pricelist */
public void setIsNoPriceListCheck (boolean IsNoPriceListCheck);
/** Get Allow Product Without Pricelist */
public boolean IsNoPriceListCheck();
/** Column name IsOverwriteDateOnComplete */ /** Column name IsOverwriteDateOnComplete */
public static final String COLUMNNAME_IsOverwriteDateOnComplete = "IsOverwriteDateOnComplete"; public static final String COLUMNNAME_IsOverwriteDateOnComplete = "IsOverwriteDateOnComplete";

2
org.adempiere.base/src/org/compiere/model/MDocType.java
View File

@ -42,7 +42,7 @@ public class MDocType extends X_C_DocType implements ImmutablePOSupport
/** /**
* *
*/ */
private static final long serialVersionUID = -7313617271586412889L; private static final long serialVersionUID = 1830844263371227816L;
/** /**
* Return the first Doc Type for this BaseType * Return the first Doc Type for this BaseType

6
org.adempiere.base/src/org/compiere/model/MOrderLine.java
View File

@ -56,7 +56,7 @@ public class MOrderLine extends X_C_OrderLine
/** /**
* *
*/ */
private static final long serialVersionUID = 7207471169113857831L; private static final long serialVersionUID = -7152360636393521683L;
/** /**
* Get Order Unreserved Qty * Get Order Unreserved Qty
@ -825,8 +825,10 @@ public class MOrderLine extends X_C_OrderLine
log.saveError("UnderLimitPrice", "PriceEntered=" + getPriceEntered() + ", PriceLimit=" + getPriceLimit()); log.saveError("UnderLimitPrice", "PriceEntered=" + getPriceEntered() + ", PriceLimit=" + getPriceLimit());
return false; return false;
} }
int C_DocType_ID = getParent().getDocTypeID();
MDocType docType = MDocType.get(getCtx(), C_DocType_ID);
// //
if (!m_productPrice.isCalculated()) if (!docType.IsNoPriceListCheck() && !m_productPrice.isCalculated())
{ {
throw new ProductNotOnPriceListException(m_productPrice, getLine()); throw new ProductNotOnPriceListException(m_productPrice, getLine());
} }

23
org.adempiere.base/src/org/compiere/model/X_C_DocType.java
View File

@ -31,7 +31,7 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20210917L; private static final long serialVersionUID = -5399795467312254567L;
/** Standard Constructor */ /** Standard Constructor */
public X_C_DocType (Properties ctx, int C_DocType_ID, String trxName) public X_C_DocType (Properties ctx, int C_DocType_ID, String trxName)
@ -772,6 +772,27 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent
return false; return false;
} }
/** Set Allow Product Without Pricelist.
@param isNoPriceListCheck Allow Product Without Pricelist */
public void setIsNoPriceListCheck (boolean IsNoPriceListCheck)
{
set_Value (COLUMNNAME_IsNoPriceListCheck, Boolean.valueOf(IsNoPriceListCheck));
}
/** Get Allow Product Without Pricelist.
@return Allow Product Without Pricelist */
public boolean IsNoPriceListCheck ()
{
Object oo = get_Value(COLUMNNAME_IsNoPriceListCheck);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set Overwrite Date on Complete. /** Set Overwrite Date on Complete.
@param IsOverwriteDateOnComplete Overwrite Date on Complete */ @param IsOverwriteDateOnComplete Overwrite Date on Complete */
public void setIsOverwriteDateOnComplete (boolean IsOverwriteDateOnComplete) public void setIsOverwriteDateOnComplete (boolean IsOverwriteDateOnComplete)