Menu
▾
▴
[Compiere-cvslog] CVS: client/Src/org/compiere/apps/form VInvoiceGen.java,1.37,1.38 VInOutGen.java,1.20,1.21 VAllocation.java,1.35,1.36
|
From: Jorg J. <jj...@us...> - 2004-06-19 02:11:56
|
Update of /cvsroot/compiere/client/Src/org/compiere/apps/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25394/Src/org/compiere/apps/form Modified Files: VInvoiceGen.java VInOutGen.java VAllocation.java Log Message: . Index: VInvoiceGen.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/form/VInvoiceGen.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** VInvoiceGen.java 12 Jun 2004 00:59:30 -0000 1.37 --- VInvoiceGen.java 19 Jun 2004 02:11:44 -0000 1.38 *************** *** 99,103 **** private CPanel genPanel = new CPanel(); private BorderLayout genLayout = new BorderLayout(); ! private CTextArea info = new CTextArea(); private JScrollPane scrollPane = new JScrollPane(); private MiniTable miniTable = new MiniTable(); --- 99,103 ---- private CPanel genPanel = new CPanel(); private BorderLayout genLayout = new BorderLayout(); ! private CTextPane info = new CTextPane(); private JScrollPane scrollPane = new JScrollPane(); private MiniTable miniTable = new MiniTable(); *************** *** 141,146 **** genPanel.add(info, BorderLayout.CENTER); genPanel.setEnabled(false); - info.setWrapStyleWord(true); - info.setLineWrap(true); info.setBackground(CompierePLAF.getFieldBackground_Inactive()); info.setEditable(false); --- 141,144 ---- *************** *** 456,464 **** // ProcessInfoUtil.setLogFromDB(pi); info.setText(pi.getSummary()); - info.append("\n("); - info.append(Msg.getMsg(Env.getCtx(), "InvGenerateInfo")); - // Invoices are generated depending on the Invoicing Rule selection in the Order - info.append(")"); // Reset Selection --- 454,466 ---- // ProcessInfoUtil.setLogFromDB(pi); + StringBuffer iText = new StringBuffer(); + iText.append("<b>").append(pi.getSummary()) + .append("</b><br>(") + .append(Msg.getMsg(Env.getCtx(), "InvGenerateInfo")) + //Invoices are generated depending on the Invoicing Rule selection in the Order + .append(")<br>") + .append(pi.getLogInfo(true)); + info.setText(iText.toString()); info.setText(pi.getSummary()); // Reset Selection *************** *** 476,480 **** if (ADialog.ask(m_WindowNo, this, "PrintInvoices")) { ! info.append("\n\n" + Msg.getMsg(Env.getCtx(), "PrintInvoices")); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); int retValue = ADialogDialog.A_CANCEL; --- 478,482 ---- if (ADialog.ask(m_WindowNo, this, "PrintInvoices")) { ! // info.append("\n\n" + Msg.getMsg(Env.getCtx(), "PrintInvoices")); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); int retValue = ADialogDialog.A_CANCEL; Index: VInOutGen.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/form/VInOutGen.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** VInOutGen.java 16 May 2004 06:05:07 -0000 1.20 --- VInOutGen.java 19 Jun 2004 02:11:44 -0000 1.21 *************** *** 99,103 **** private CPanel genPanel = new CPanel(); private BorderLayout genLayout = new BorderLayout(); ! private CTextArea info = new CTextArea(); private JScrollPane scrollPane = new JScrollPane(); private MiniTable miniTable = new MiniTable(); --- 99,103 ---- private CPanel genPanel = new CPanel(); private BorderLayout genLayout = new BorderLayout(); ! private CTextPane info = new CTextPane(); private JScrollPane scrollPane = new JScrollPane(); private MiniTable miniTable = new MiniTable(); *************** *** 141,146 **** genPanel.add(info, BorderLayout.CENTER); genPanel.setEnabled(false); - info.setWrapStyleWord(true); - info.setLineWrap(true); info.setBackground(CompierePLAF.getFieldBackground_Inactive()); info.setEditable(false); --- 141,144 ---- *************** *** 399,404 **** String sql = "UPDATE C_Order SET IsSelected = 'N' " + "WHERE IsSelected='Y'" ! + " AND AD_Client_ID=" + Env.getAD_Client_ID(Env.getCtx()) ! + " AND AD_Org_ID=" + Env.getAD_Org_ID(Env.getCtx()); int no = DB.executeUpdate(sql); Log.trace(Log.l3_Util, "VInOutGen.generateShipments - Reset=" + no); --- 397,401 ---- String sql = "UPDATE C_Order SET IsSelected = 'N' " + "WHERE IsSelected='Y'" ! + " AND AD_Client_ID=" + Env.getAD_Client_ID(Env.getCtx()); int no = DB.executeUpdate(sql); Log.trace(Log.l3_Util, "VInOutGen.generateShipments - Reset=" + no); *************** *** 458,466 **** // ProcessInfoUtil.setLogFromDB(pi); ! info.setText(pi.getSummary()); ! info.append("\n("); ! info.append(Msg.getMsg(Env.getCtx(), "InOutGenerateInfo")); ! // Shipments are generated depending on the Delivery Rule selection in the Order ! info.append(")"); // Reset Selection --- 455,466 ---- // ProcessInfoUtil.setLogFromDB(pi); ! StringBuffer iText = new StringBuffer(); ! iText.append("<b>").append(pi.getSummary()) ! .append("</b><br>(") ! .append(Msg.getMsg(Env.getCtx(), "InOutGenerateInfo")) ! // Shipments are generated depending on the Delivery Rule selection in the Order ! .append(")<br>") ! .append(pi.getLogInfo(true)); ! info.setText(iText.toString()); // Reset Selection *************** *** 479,483 **** if (ADialog.ask(m_WindowNo, this, "PrintShipments")) { ! info.append("\n\n" + Msg.getMsg(Env.getCtx(), "PrintShipments")); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); int retValue = ADialogDialog.A_CANCEL; // see also ProcessDialog.printShipments/Invoices --- 479,483 ---- if (ADialog.ask(m_WindowNo, this, "PrintShipments")) { ! // info.append("\n\n" + Msg.getMsg(Env.getCtx(), "PrintShipments")); setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); int retValue = ADialogDialog.A_CANCEL; // see also ProcessDialog.printShipments/Invoices Index: VAllocation.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/form/VAllocation.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** VAllocation.java 14 Jun 2004 17:20:38 -0000 1.35 --- VAllocation.java 19 Jun 2004 02:11:44 -0000 1.36 *************** *** 377,383 **** + "c.ISO_Code,i.GrandTotal*i.MultiplierAP, " // 4..5 Orig Currency + "C_Currency_Convert(i.GrandTotal*i.MultiplierAP,i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID), " // 6 #1 Converted ! + "C_Currency_Convert(C_Invoice_Open(C_Invoice_ID),i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID)*i.MultiplierAP, " // 7 #2 Converted Open + "C_Currency_Convert(C_Invoice_Discount" // 8 AllowedDiscount ! + "(i.C_Invoice_ID,?),i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID)*i.MultiplierAP," // #3, #4 + "i.MultiplierAP " + "FROM C_Invoice_v i" // corrected for CM --- 377,383 ---- + "c.ISO_Code,i.GrandTotal*i.MultiplierAP, " // 4..5 Orig Currency + "C_Currency_Convert(i.GrandTotal*i.MultiplierAP,i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID), " // 6 #1 Converted ! + "C_Currency_Convert(C_Invoice_Open(C_Invoice_ID,C_InvoicePaySchedule_ID),i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID)*i.MultiplierAP, " // 7 #2 Converted Open + "C_Currency_Convert(C_Invoice_Discount" // 8 AllowedDiscount ! + "(i.C_Invoice_ID,?,C_InvoicePaySchedule_ID),i.C_Currency_ID,?,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID)*i.MultiplierAP," // #3, #4 + "i.MultiplierAP " + "FROM C_Invoice_v i" // corrected for CM |