0021809: It is not possible to attached another document than a PO while sending a PO by email.

Issue: 18745  

1.1 --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Tue Feb 28 12:29:55 2012 +0100
     1.2 +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Mon Mar 12 11:54:45 2012 +0100
     1.3 @@ -46,6 +46,7 @@
     1.4  import org.openbravo.base.exception.OBException;
     1.5  import org.openbravo.base.secureApp.HttpSecureAppServlet;
     1.6  import org.openbravo.base.secureApp.VariablesSecureApp;
     1.7 +import org.openbravo.base.session.OBPropertiesProvider;
     1.8  import org.openbravo.dal.core.OBContext;
     1.9  import org.openbravo.dal.service.OBCriteria;
    1.10  import org.openbravo.dal.service.OBDal;
    1.11 @@ -842,7 +843,6 @@
    1.12        isTheFirstEntry = new Boolean(true);
    1.13      }
    1.14  
    1.15 -    final AttachContent file = new AttachContent();
    1.16      if (vars.getMultiFile("inpFile") != null && !vars.getMultiFile("inpFile").getName().equals("")) {
    1.17        final AttachContent content = new AttachContent();
    1.18        final FileItem file1 = vars.getMultiFile("inpFile");
 
Issue: 20287

     1.1 --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Wed Apr 18 17:44:50 2012 +0200
     1.2 +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Wed Apr 18 18:13:37 2012 +0200
     1.3 @@ -1294,8 +1294,8 @@
     1.4     */
     1.5    private File prepareFile(AttachContent content, String documentId) throws ServletException {
     1.6      try {
     1.7 -      final String attachPath = new OBPropertiesProvider().getOpenbravoProperties().getProperty(
     1.8 -          "attach.path")
     1.9 +      final String attachPath = OBPropertiesProvider.getInstance().getOpenbravoProperties()
    1.10 +          .getProperty("attach.path")
    1.11 +          + "/tmp";
    1.12        final File f = new File(attachPath, content.getFileName());
    1.13        final InputStream inputStream = content.getFileItem().getInputStream();

issue: 18745
     1.1 --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Mon Mar 12 15:35:18 2012 +0100
     1.2 +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Mon Mar 12 15:53:52 2012 +0100
     1.3 @@ -744,7 +744,7 @@
     1.4        final Vector<Object> vector = (Vector<Object>) object;
     1.5        for (int i = 0; i < vector.size(); i++) {
     1.6 +        final AttachContent objContent = (AttachContent) vector.get(i); //AQUÍ SE ESPECIFICA EL NUEVO NOMBRE objContent
     1.7 -        final File file = prepareFile(objContent);
     1.8 +        final File file = prepareFile(objContent);
     1.9          attachments.add(file);
    1.12 @@ -846,9 +846,10 @@
    1.13      if (vars.getMultiFile("inpFile") != null && !vars.getMultiFile("inpFile").getName().equals("")) {
    1.14        final AttachContent content = new AttachContent();
    1.15        final FileItem file1 = vars.getMultiFile("inpFile");
    1.16 -      content.setFileName(file1.getName());
    1.17 +      content.setFileName(pocData[0].ourreference.replace('/', '_') + '-'
    1.18 +          + Utility.formatDate(new Date(), "yyyyMMdd-HHmmss") + '.' + file1.getName());
    1.19        content.setFileItem(file1);
    1.20 -      content.setId(file1.getName());
    1.21 +      content.setId(Utility.formatDate(new Date(), "yyyyMMdd-HHmmss") + '.' + file1.getName());
    1.22        content.visible = "hidden";
    1.23        if (vars.getStringParameter("inpArchive") == "Y") {
    1.24          content.setSelected("true");