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 2013-12-20 11:33:11 -05:00
parent 654623549c c1e857b4b8
commit e778d77eb2
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
View File

@ -139,6 +139,19 @@ public class Doc_MatchPO extends Doc
return facts;
}
if (m_M_InOutLine_ID == 0)
{
MMatchPO[] matchPOs = MMatchPO.getOrderLine(getCtx(), m_oLine.getC_OrderLine_ID(), getTrxName());
for (MMatchPO matchPO : matchPOs)
{
if (matchPO.getM_InOutLine_ID() > 0 && matchPO.getC_InvoiceLine_ID() == 0)
{
m_M_InOutLine_ID = matchPO.getM_InOutLine_ID();
break;
}
}
}
if (m_M_InOutLine_ID == 0) // No posting if not matched to Shipment
{
p_Error = "No posting if not matched to Shipment";

5
org.adempiere.base/src/org/compiere/model/GridTable.java
View File

@ -2965,6 +2965,11 @@ public class GridTable extends AbstractTableModel
m_changed = false;
m_rowChanged = -1;
m_inserting = false;
if (m_lastSortColumnIndex >= 0)
{
loadComplete();
sort(m_lastSortColumnIndex, m_lastSortedAscending);
}
if (fireEvents) {
fireTableDataChanged();
fireDataStatusIEvent(DATA_REFRESH_MESSAGE, "");

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java
View File

@ -123,7 +123,7 @@ public class DunningPrint extends SvrProcess
int count = 0;
int errors = 0;
MDunningRunEntry[] entries = run.getEntries(false);
List<File> pdfList = new ArrayList<File>();
final List<File> pdfList = new ArrayList<File>();
for (int i = 0; i < entries.length; i++)
{
MDunningRunEntry entry = entries[i];
@ -258,6 +258,18 @@ public class DunningPrint extends SvrProcess
return msgreturn.toString();
}
AEnv.executeAsyncDesktopTask(new Runnable() {
@Override
public void run() {
showReports(pdfList);
}
});
StringBuilder msgreturn = new StringBuilder("@Printed@=").append(count);
return msgreturn.toString();
} // doIt
private void showReports(List<File> pdfList) {
if (pdfList.size() > 1) {
try {
File outFile = File.createTempFile("DunningPrint", ".pdf");
@ -278,8 +290,6 @@ public class DunningPrint extends SvrProcess
log.log(Level.SEVERE, e.getLocalizedMessage(), e);
}
}
StringBuilder msgreturn = new StringBuilder("@Printed@=").append(count);
return msgreturn.toString();
} // doIt
}
} // DunningPrint