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

hg merge release-3.1 (merge release3.1 into development)

This commit is contained in:
Carlos Ruiz 2016-07-27 15:54:02 +02:00
parent 37c04c5396 ab552fb5a1
commit fb70ffc87d
11 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/adempiere/pdf/Document.java
View File

@ -74,13 +74,14 @@ public class Document {
document.newPage(); document.newPage();
} }
final PdfTemplate tp = cb.createTemplate(w, h); PdfTemplate tp = cb.createTemplate(w, h);
final Graphics2D g2 = tp.createGraphics(w, h, mapper); Graphics2D g2 = tp.createGraphics(w, h, mapper);
tp.setWidth(w); tp.setWidth(w);
tp.setHeight(h); tp.setHeight(h);
pageable.getPrintable(page).print(g2, pf, page); pageable.getPrintable(page).print(g2, pf, page);
g2.dispose(); g2.dispose();
cb.addTemplate(tp, 0, 0); cb.addTemplate(tp, 0, 0);
writer.releaseTemplate(tp);
} }
document.close(); document.close();

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

@ -2826,7 +2826,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
public String processCallout (GridField field) public String processCallout (GridField field)
{ {
// //
if (isProcessed() && !field.isAlwaysUpdateable()) // only active records if (isProcessed() && !field.isAlwaysUpdateable() && !field.isKey()) // only active records
return ""; // "DocProcessed"; return ""; // "DocProcessed";
Object value = field.getValue(); Object value = field.getValue();

94
org.adempiere.base/src/org/compiere/print/ReportEngine.java
View File

@ -631,8 +631,47 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
table.setNeedClosingTag(false); table.setNeedClosingTag(false);
PrintWriter w = new PrintWriter(writer); PrintWriter w = new PrintWriter(writer);
if (onlyTable)
table.output(w);
else
{
XhtmlDocument doc = new XhtmlDocument();
doc.getHtml().setNeedClosingTag(false);
doc.getBody().setNeedClosingTag(false);
doc.appendHead("<meta charset=\"UTF-8\" />");
doc.appendBody(table);
appendInlineCss (doc);
if (extension != null && extension.getStyleURL() != null)
{
// maybe cache style content with key is path
String pathStyleFile = extension.getFullPathStyle(); // creates a temp file - delete below
Path path = Paths.get(pathStyleFile);
List<String> styleLines = Files.readAllLines(path, Ini.getCharset());
Files.delete(path); // delete temp file
StringBuilder styleBuild = new StringBuilder();
for (String styleLine : styleLines){
styleBuild.append(styleLine); //.append("\n");
}
appendInlineCss (doc, styleBuild);
}
if (extension != null && extension.getScriptURL() != null && !isExport)
{
script jslink = new script();
jslink.setLanguage("javascript");
jslink.setSrc(extension.getScriptURL());
doc.appendHead(jslink);
}
if (extension != null && !isExport){
extension.setWebAttribute(doc.getBody());
}
doc.output(w);
}
thead thead = new thead(); thead thead = new thead();
tbody tbody = new tbody(); tbody tbody = new tbody();
tbody.setNeedClosingTag(false);
Boolean [] colSuppressRepeats = m_layout == null || m_layout.colSuppressRepeats == null? LayoutEngine.getColSuppressRepeats(m_printFormat):m_layout.colSuppressRepeats; Boolean [] colSuppressRepeats = m_layout == null || m_layout.colSuppressRepeats == null? LayoutEngine.getColSuppressRepeats(m_printFormat):m_layout.colSuppressRepeats;
Object [] preValues = new Object [colSuppressRepeats.length]; Object [] preValues = new Object [colSuppressRepeats.length];
@ -654,7 +693,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
tr.setClass(cssPrefix + "-lastgrouprow"); tr.setClass(cssPrefix + "-lastgrouprow");
} }
// add row to table body // add row to table body
tbody.addElement(tr); //tbody.addElement(tr);
} else { } else {
// add row to table header // add row to table header
thead.addElement(tr); thead.addElement(tr);
@ -792,50 +831,21 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
} }
} // printed } // printed
} // for all columns } // for all columns
/* output table header */
if (row == -1){
thead.output(w);
// output open of tbody
tbody.output(w);
}else{
// output row by row
tr.output(w);
}
} // for all rows } // for all rows
if (onlyTable)
table.output(w);
else
{
XhtmlDocument doc = new XhtmlDocument();
doc.getHtml().setNeedClosingTag(false);
doc.getBody().setNeedClosingTag(false);
doc.appendHead("<meta charset=\"UTF-8\" />");
doc.appendBody(table);
appendInlineCss (doc);
if (extension != null && extension.getStyleURL() != null)
{
// maybe cache style content with key is path
String pathStyleFile = extension.getFullPathStyle(); // creates a temp file - delete below
Path path = Paths.get(pathStyleFile);
List<String> styleLines = Files.readAllLines(path, Ini.getCharset());
Files.delete(path); // delete temp file
StringBuilder styleBuild = new StringBuilder();
for (String styleLine : styleLines){
styleBuild.append(styleLine); //.append("\n");
}
appendInlineCss (doc, styleBuild);
}
if (extension != null && extension.getScriptURL() != null && !isExport)
{
script jslink = new script();
jslink.setLanguage("javascript");
jslink.setSrc(extension.getScriptURL());
doc.appendHead(jslink);
}
if (extension != null && !isExport){
extension.setWebAttribute(doc.getBody());
}
doc.output(w);
}
thead.output(w);
tbody.output(w);
w.println(); w.println();
w.println("</tbody>");
w.println("</table>"); w.println("</table>");
if (!onlyTable) if (!onlyTable)
{ {

9
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/PrintFormatElementHandler.java
View File

@ -20,6 +20,7 @@ package org.adempiere.pipo2.handler;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.List; import java.util.List;
import java.util.logging.Level;
import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.sax.TransformerHandler;
@ -63,6 +64,7 @@ public class PrintFormatElementHandler extends AbstractElementHandler {
return; return;
} }
element.recordId = mPrintFormat.getAD_PrintFormat_ID();
if (mPrintFormat.is_new() || mPrintFormat.is_Changed()) { if (mPrintFormat.is_new() || mPrintFormat.is_Changed()) {
X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, X_AD_PrintFormat.Table_Name, X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, X_AD_PrintFormat.Table_Name,
X_AD_PrintFormat.Table_ID); X_AD_PrintFormat.Table_ID);
@ -134,6 +136,13 @@ public class PrintFormatElementHandler extends AbstractElementHandler {
addTypeName(atts, "table"); addTypeName(atts, "table");
document.startElement("", "", I_AD_PrintFormat.Table_Name, atts); document.startElement("", "", I_AD_PrintFormat.Table_Name, atts);
createPrintFormatBinding(ctx, document, m_Printformat); createPrintFormatBinding(ctx, document, m_Printformat);
PackOut packOut = ctx.packOut;
packOut.getCtx().ctx.put("Table_Name",I_AD_PrintFormat.Table_Name);
try {
new CommonTranslationHandler().packOut(packOut,document,null,m_Printformat.get_ID());
} catch(Exception e) {
if (log.isLoggable(Level.INFO)) log.info(e.toString());
}
} }
String sql = "SELECT AD_PrintFormatItem_ID FROM AD_PrintFormatItem WHERE AD_PrintFormat_ID= " String sql = "SELECT AD_PrintFormatItem_ID FROM AD_PrintFormatItem WHERE AD_PrintFormat_ID= "

1
org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java
View File

@ -143,6 +143,7 @@ public class PackInProcess extends SvrProcess {
adPackageImp.setDateProcessed(new Timestamp(System.currentTimeMillis())); adPackageImp.setDateProcessed(new Timestamp(System.currentTimeMillis()));
adPackageImp.setP_Msg(msg); adPackageImp.setP_Msg(msg);
adPackageImp.saveEx(); adPackageImp.saveEx();
commitEx(); // we need to commit to capture HERE when the deferred validation of foreign keys can fail
} catch (Exception e) { } catch (Exception e) {
adPackageImp.setP_Msg(e.getLocalizedMessage()); adPackageImp.setP_Msg(e.getLocalizedMessage());
packIn.getNotifier().addStatusLine(e.getLocalizedMessage()); packIn.getNotifier().addStatusLine(e.getLocalizedMessage());

2
org.adempiere.server-feature/utils.unix/unix/DebianInstaller/etc/init.d/idempiere
View File

@ -632,7 +632,7 @@ stop () {
if [ $IDEMPIERESTATUS -ne 0 ] ; then if [ $IDEMPIERESTATUS -ne 0 ] ; then
log_success_msg "Service stopped with kill -15" log_success_msg "Service stopped with kill -15"
else else
echo "Trying direct kill with signal -9" log_warning_msg "Trying direct kill with signal -9"
kill -9 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u` kill -9 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u`
sleep 5 sleep 5
getidempierestatus getidempierestatus

2
org.adempiere.server-feature/utils.unix/unix/idempiere_Debian.sh
View File

@ -102,7 +102,7 @@ stop () {
if [ $IDEMPIERESTATUS -ne 0 ] ; then if [ $IDEMPIERESTATUS -ne 0 ] ; then
log_success_msg "Service stopped with kill -15" log_success_msg "Service stopped with kill -15"
else else
echo "Trying direct kill with signal -9" log_warning_msg "Trying direct kill with signal -9"
kill -9 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u` kill -9 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u`
sleep 5 sleep 5
getidempierestatus getidempierestatus

4
org.adempiere.server-feature/utils.unix/unix/idempiere_RedHat.sh
View File

@ -85,13 +85,13 @@ stop () {
cd $IDEMPIERE_HOME/utils cd $IDEMPIERE_HOME/utils
source $ENVFILE source $ENVFILE
# try shutdown from OSGi console, then direct kill with signal 15, then signal 9 # try shutdown from OSGi console, then direct kill with signal 15, then signal 9
log_warning_msg "Trying shutdown from OSGi console" echo "Trying shutdown from OSGi console"
( echo exit; echo y; sleep 5 ) | telnet localhost 12612 > /dev/null 2>&1 ( echo exit; echo y; sleep 5 ) | telnet localhost 12612 > /dev/null 2>&1
getidempierestatus getidempierestatus
if [ $IDEMPIERESTATUS -ne 0 ] ; then if [ $IDEMPIERESTATUS -ne 0 ] ; then
echo_success echo_success
else else
log_warning_msg "Trying direct kill with signal -15" echo "Trying direct kill with signal -15"
kill -15 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u` kill -15 -`ps ax o pgid,command | grep -v grep | grep $IDEMPIERE_HOME | sed -e 's/^ *//g' | cut -f 1 -d " " | sort -u`
sleep 5 sleep 5
getidempierestatus getidempierestatus

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java
View File

@ -190,7 +190,5 @@ public class WImageEditor extends WEditor
*/ */
@Override @Override
public void fillHorizontal() { public void fillHorizontal() {
// getComponent().setWidth(defaultWidth);
// getComponent().setHeight(defaultHeight);
} }
} }

2
org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp
View File

@ -180,6 +180,8 @@ span.grid-combobox-editor {
.image-field { .image-field {
cursor: pointer; cursor: pointer;
border: 1px solid #C5C5C5; border: 1px solid #C5C5C5;
height: 24px;
width: 24px;
} }
.image-field.image-field-readonly { .image-field.image-field-readonly {
cursor: default; cursor: default;

27
org.idempiere.eclipse.platform-feature/update.bat
View File

@ -1,43 +1,46 @@
@Title ... p2 director @Title ... p2 director
@Echo off @Echo on
cd %~dp0 cd %~dp0
set DESTINATION=%cd%
@echo %DESTINATION%
@echo %1%
copy idempiere.ini idempiere.ini.sav copy idempiere.ini idempiere.ini.sav
if exist jetty.xml.sav del /q jetty.xml.sav if exist jetty.xml.sav del /q jetty.xml.sav
if exist jettyhome/etc/jetty.xml ( if exist jettyhome\etc\jetty.xml (
copy jettyhome/etc/jetty.xml jetty.xml.sav copy jettyhome\etc\jetty.xml jetty.xml.sav
) )
if exist jetty-ssl.xml.sav del /q jetty-ssl.xml.sav if exist jetty-ssl.xml.sav del /q jetty-ssl.xml.sav
if exist jettyhome/etc/jetty-ssl.xml ( if exist jettyhome\etc\jetty-ssl.xml (
copy jettyhome/etc/jetty-ssl.xml jetty-ssl.xml.sav copy jettyhome\etc\jetty-ssl.xml jetty-ssl.xml.sav
) )
if exist jetty-selector.xml.sav del /q jetty-selector.xml.sav if exist jetty-selector.xml.sav del /q jetty-selector.xml.sav
if exist jettyhome/etc/jetty-selector.xml ( if exist jettyhome\etc\jetty-selector.xml (
copy jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav copy jettyhome\etc\jetty-selector.xml jetty-selector.xml.sav
) )
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u org.adempiere.server.product
java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i org.adempiere.server.product java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i org.adempiere.server.product
copy idempiere.ini.sav idempiere.ini copy idempiere.ini.sav idempiere.ini
if exist jetty.xml.sav ( if exist jetty.xml.sav (
copy jetty.xml.sav jettyhome/etc/jetty.xml copy jetty.xml.sav jettyhome\etc\jetty.xml
del /q jetty.xml.sav del /q jetty.xml.sav
) )
if exist jetty-ssl.xml.sav ( if exist jetty-ssl.xml.sav (
copy jetty-ssl.xml.sav jettyhome/etc/jetty-ssl.xml copy jetty-ssl.xml.sav jettyhome\etc\jetty-ssl.xml
del /q jetty-ssl.xml.sav del /q jetty-ssl.xml.sav
) )
if exist jetty-selector.xml.sav ( if exist jetty-selector.xml.sav (
copy jetty-selector.xml.sav jettyhome/etc/jetty-selector.xml copy jetty-selector.xml.sav jettyhome\etc\jetty-selector.xml
del /q jetty-selector.xml.sav del /q jetty-selector.xml.sav
) )