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

IDEMPIERE-159 Allow creation of combinations with Org * / based on patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2013-10-02 12:44:11 -05:00
parent e4def14426
commit d664f2ad84
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration/i1.0z/oracle/201310012030_IDEMPIERE-159.sql Normal file
View File

@ -0,0 +1,16 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Oct 1, 2013 8:22:41 PM CEST
-- IDEMPIERE-159 - Allow creation of combinations with Org *
INSERT INTO AD_Val_Rule (AD_Client_ID,AD_Org_ID,AD_Val_Rule_ID,AD_Val_Rule_UU,Code,Created,CreatedBy,EntityType,IsActive,Name,Type,Updated,UpdatedBy) VALUES (0,0,200054,'a1f042c3-77df-4292-b515-89d77c959000','AD_Org.AD_Org_ID = 0 OR (AD_Org.AD_Client_ID=@AD_Client_ID@ AND AD_Org.IsSummary=''N'')',TO_DATE('2013-10-01 20:22:39','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','AD_Org of Client not parent (incl 0)','S',TO_DATE('2013-10-01 20:22:39','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Oct 1, 2013 8:23:09 PM CEST
-- IDEMPIERE-159 - Allow creation of combinations with Org *
UPDATE AD_Column SET AD_Reference_ID=19, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=200054,Updated=TO_DATE('2013-10-01 20:23:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=1016
;
SELECT register_migration_script('201310012030_IDEMPIERE-159.sql') FROM dual
;

12
migration/i1.0z/postgresql/201310012030_IDEMPIERE-159.sql Normal file
View File

@ -0,0 +1,12 @@
-- Oct 1, 2013 8:22:41 PM CEST
-- IDEMPIERE-159 - Allow creation of combinations with Org *
INSERT INTO AD_Val_Rule (AD_Client_ID,AD_Org_ID,AD_Val_Rule_ID,AD_Val_Rule_UU,Code,Created,CreatedBy,EntityType,IsActive,Name,Type,Updated,UpdatedBy) VALUES (0,0,200054,'a1f042c3-77df-4292-b515-89d77c959000','AD_Org.AD_Org_ID = 0 OR (AD_Org.AD_Client_ID=@AD_Client_ID@ AND AD_Org.IsSummary=''N'')',TO_TIMESTAMP('2013-10-01 20:22:39','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','AD_Org of Client not parent (incl 0)','S',TO_TIMESTAMP('2013-10-01 20:22:39','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Oct 1, 2013 8:23:09 PM CEST
-- IDEMPIERE-159 - Allow creation of combinations with Org *
UPDATE AD_Column SET AD_Reference_ID=19, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=200054,Updated=TO_TIMESTAMP('2013-10-01 20:23:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=1016
;
SELECT register_migration_script('201310012030_IDEMPIERE-159.sql') FROM dual
;

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

@ -574,7 +574,7 @@ public class MAccount extends X_C_ValidCombination
{ {
combiStr = "*"; combiStr = "*";
descrStr = "*"; descrStr = "*";
fullyQualified = false; //fullyQualified = false; IDEMPIERE 159 - allow combination with org *
} }
} }
else if (MAcctSchemaElement.ELEMENTTYPE_Account.equals(element.getElementType())) else if (MAcctSchemaElement.ELEMENTTYPE_Account.equals(element.getElementType()))

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
View File

@ -191,10 +191,11 @@ public final class WAccountDialog extends Window
// //
Caption caption = new Caption(Msg.getMsg(Env.getCtx(),"Parameter")); Caption caption = new Caption(Msg.getMsg(Env.getCtx(),"Parameter"));
parameterPanel.appendChild(caption); parameterPanel.appendChild(caption);
parameterPanel.setHflex("1"); parameterPanel.setHflex("95");
parameterPanel.setStyle("background-color: transparent;"); parameterPanel.setStyle("background-color: transparent;");
toolBar.setOrient("vertical"); toolBar.setOrient("vertical");
toolBar.setStyle("border: none; margin: 5px"); toolBar.setStyle("border: none; margin: 5px");
toolBar.setHflex("5");
bSave.setImage(ThemeManager.getThemeResource("images/Save24.png")); bSave.setImage(ThemeManager.getThemeResource("images/Save24.png"));
bSave.setTooltiptext(Msg.getMsg(Env.getCtx(),"AccountNewUpdate")); bSave.setTooltiptext(Msg.getMsg(Env.getCtx(),"AccountNewUpdate"));