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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-01-08 22:03:33 -05:00
parent 8097e21fba 8ef1250754
commit 536f700fa4
5 changed files with 3196 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1595
migration/i2.0/oracle/201401020938_GWPeriods2014.sql Normal file
View File

File diff suppressed because it is too large Load Diff

1592
migration/i2.0/postgresql/201401020938_GWPeriods2014.sql Normal file
View File

File diff suppressed because it is too large Load Diff

1
org.adempiere.base/src/org/compiere/acct/Doc.java
View File

@ -266,6 +266,7 @@ public abstract class Doc
log.severe(msg); log.severe(msg);
throw new IllegalArgumentException(msg); throw new IllegalArgumentException(msg);
} }
p_po.load(p_po.get_TrxName()); // reload the PO to get any virtual column that was not obtained using the rs (IDEMPIERE-775)
// DocStatus // DocStatus
int index = p_po.get_ColumnIndex("DocStatus"); int index = p_po.get_ColumnIndex("DocStatus");

8
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -1623,9 +1623,15 @@ public final class MPayment extends X_C_Payment
if (pAllocs.length > 0) { if (pAllocs.length > 0) {
for (MPaymentAllocate pAlloc : pAllocs) for (MPaymentAllocate pAlloc : pAllocs)
sumPaymentAllocates = sumPaymentAllocates.add(pAlloc.getAmount()); sumPaymentAllocates = sumPaymentAllocates.add(pAlloc.getAmount());
if (getPayAmt().compareTo(sumPaymentAllocates) != 0) if (getPayAmt().compareTo(sumPaymentAllocates) != 0) {
if (isReceipt() && getPayAmt().compareTo(sumPaymentAllocates) < 0) {
if (MSysConfig.getBooleanValue("ALLOW_OVER_APPLIED_PAYMENT", false, Env.getAD_Client_ID(Env.getCtx()))) {
return true;
}
}
return false; return false;
} }
}
return true; return true;
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -1597,7 +1597,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
adTabbox.evaluate(e); adTabbox.evaluate(e);
} }
toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted()); toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted() && !adTabbox.getSelectedGridTab().isNew());
toolbar.enableReport(true); toolbar.enableReport(true);
toolbar.enableExport(!adTabbox.getSelectedGridTab().isSortTab()); toolbar.enableExport(!adTabbox.getSelectedGridTab().isSortTab());
toolbar.enableFileImport(!changed && !adTabbox.getSelectedGridTab().isSortTab() && adTabbox.getSelectedGridTab().isInsertRecord()); toolbar.enableFileImport(!changed && !adTabbox.getSelectedGridTab().isSortTab() && adTabbox.getSelectedGridTab().isInsertRecord());