diff -r 7d0e4f6fe554 src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql	Wed Jan 13 17:56:19 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/GenerateModel347_data.xsql	Wed Jan 13 18:13:25 2010 +0100
@@ -167,7 +167,7 @@
       COALESCE(LPAD(replace(translate((SELECT MAX(TAXID) FROM AD_ORGINFO),'.-_/'||CHR(92),' '),' ',''), 9, '0'), '000000000') AS NIF_DECLARANTE,
       COALESCE(LPAD((CASE BP.TAXID WHEN NULL THEN '0' ELSE replace(translate(BP.TAXID,'.-_/'||CHR(92),' '),' ','') END), 9, '0'), '000000000') AS NIF_DECLARADO,
       COALESCE(LPAD(' ', 9, ' '), '         ') AS NIF_REPRESENTANTE,
-      COALESCE(TO_CHAR(RPAD(UPPER((CASE WHEN MIN(BP.NAME) IS NULL THEN MIN(BP.NAME2) WHEN MIN(BP.NAME)='' THEN MIN(BP.NAME2) ELSE MIN(BP.NAME) END)), 40, ' ')), '                                        ') AS NOMBRE_SOCIAL,
+      COALESCE(TO_CHAR(RPAD(UPPER((CASE WHEN MIN(BP.NAME2) IS NULL THEN MIN(BP.NAME) WHEN MIN(BP.NAME2)='' THEN MIN(BP.NAME) ELSE MIN(BP.NAME2) END)), 40, ' ')), '                                        ') AS NOMBRE_SOCIAL,
       'D' AS TIPO_DECLARACION,
       /*LPAD(R.value,2,'0') AS CODIGO_PROVINCIA, this should be like this when region.value is added*/
       COALESCE(SUBSTR(MIN(L.POSTAL),1,2), '  ') AS CODIGO_PROVINCIA,
@@ -432,7 +432,7 @@
       COALESCE(LPAD(replace(translate((SELECT MAX(TAXID) FROM AD_ORGINFO),'.-_/'||CHR(92),' '),' ',''), 9, '0'), '         ') AS NIF_DECLARANTE,
       COALESCE(LPAD((CASE BP.TAXID WHEN NULL THEN '0' ELSE replace(translate(BP.TAXID,'.-_/'||CHR(92),' '),' ','') END), 9, '0'), '         ') AS NIF_DECLARADO,
       COALESCE(LPAD(' ', 9, ' '), '         ') AS NIF_REPRESENTANTE,
-      COALESCE(TO_CHAR(RPAD(UPPER((CASE WHEN MIN(BP.NAME) IS NULL THEN MIN(BP.NAME2) WHEN MIN(BP.NAME)='' THEN MIN(BP.NAME2) ELSE MIN(BP.NAME) END)), 40, ' ')), '                                        ') AS NOMBRE_SOCIAL,
+      COALESCE(TO_CHAR(RPAD(UPPER((CASE WHEN MIN(BP.NAME2) IS NULL THEN MIN(BP.NAME) WHEN MIN(BP.NAME2)='' THEN MIN(BP.NAME) ELSE MIN(BP.NAME2) END)), 40, ' ')), '                                        ') AS NOMBRE_SOCIAL,
       'D' AS TIPO_DECLARACION,
       COALESCE(SUBSTR(MAX(BPL.ISTAXLOCATION||L.POSTAL),2,2), '  ') AS CODIGO_PROVINCIA,
       '  ' AS CODIGO_PAIS, ' ' AS ESPACIO,