Openbravo ERP

details:   https://code.openbravo.com/erp/devel/pi/rev/ed0b8ba5a684
changeset: 13351:ed0b8ba5a684
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Fri Jul 29 16:51:04 2011 +0200
summary:   Improved Mercurial hook to check only files that are part of the changeset

diffstat:

 modules/org.openbravo.client.kernel/jslint/jscheck-hg |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (10 lines):

diff -r 540b30e15ffa -r ed0b8ba5a684 modules/org.openbravo.client.kernel/jslint/jscheck-hg
--- a/modules/org.openbravo.client.kernel/jslint/jscheck-hg	Fri Jul 29 14:05:01 2011 +0200
+++ b/modules/org.openbravo.client.kernel/jslint/jscheck-hg	Fri Jul 29 16:51:04 2011 +0200
@@ -1,3 +1,5 @@
 #!/bin/sh
+
+# Mercurial pretxncommit hook
 echo "Performing jslint check on modified js resources"
-hg st -man  | awk '/.js$/ && ! /^web/' | xargs -rn1 ./modules/org.openbravo.client.kernel/jslint/jslint || exit 1
+hg log -r $HG_NODE --template '{files}'  | awk '/.js$/ && ! /^web/' | xargs -rn1 ./modules/org.openbravo.client.kernel/jslint/jslint || exit 1

details:   https://code.openbravo.com/erp/devel/pi/rev/540b30e15ffa
changeset: 13350:540b30e15ffa
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 29 14:05:01 2011 +0200
summary:   fixed bug 18122: When the filter returns selected record, toolbar buttons dissapear

  Do not update button state when data arrives. This action should only be performed in
  record selection/deselection which is already properly managed.

diffstat:

 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r e6b8aac30d68 -r 540b30e15ffa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Fri Jul 29 13:03:23 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Fri Jul 29 14:05:01 2011 +0200
@@ -667,7 +667,6 @@
     
     var record, ret = this.Super('dataArrived', arguments);
     this.updateRowCountDisplay();
-    this.view.toolBar.updateButtonState(true);
     if (this.getSelectedRecords() && this.getSelectedRecords().length > 0) {
       this.selectionUpdated();
     }

details:   https://code.openbravo.com/erp/stable/2.50/rev/3dfbee5689ff
changeset: 9600:3dfbee5689ff
user:      Jon Alegría <jon.alegria <at> openbravo.com>
date:      Fri Jul 29 13:49:22 2011 +0200
summary:   Fixes issue 0017768: General ledge report is not showing correctly the
information

diffstat:

 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql |  24 ++++++---
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r e8b3cacc2fa1 -r 3dfbee5689ff src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql	Fri Jul 29 13:03:50 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql	Fri Jul 29 13:49:22 2011 +0200
@@ -35,7 +35,8 @@
               0 AS PREVIOUSDEBIT, 0 AS PREVIOUSCREDIT, 0 AS PREVIOUSTOTAL,
               0 AS FINALDEBIT, 0 AS FINALCREDIT, 0 AS FINALTOTAL,
               TO_CHAR(DATEACCT,'J') AS DATEACCTNUMBER,
-              ? AS groupby, '' as bpid, '' as bpname, '' as pdid, '' as pdname, '' as pjid, '' as pjname
+              ? AS groupby, '' as bpid, '' as bpname, '' as pdid, '' as pdname, '' as pjid, '' as pjname,
+              CASE WHEN FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACTACCTTYPE = 'R' THEN 3 ELSE (CASE WHEN FACTACCTTYPE = 'C' THEN 4 END) END) END) END AS FACTACCTTYPE
           FROM
             (SELECT FACT_ACCT.ACCTVALUE AS VALUE, FACT_ACCT.ACCTDESCRIPTION AS NAME,
                 DATEACCT, AMTACCTDR, AMTACCTCR,
@@ -50,7 +51,7 @@
                   WHEN 'Product' THEN (case  AD_COLUMN_IDENTIFIER('M_Product',m_product.m_product_id, ?) when '**' then '' else AD_COLUMN_IDENTIFIER('M_Product',m_product.m_product_id, ?) end)
                   WHEN 'Project' THEN (case  AD_COLUMN_IDENTIFIER('C_Project',c_project.c_project_id, ?) when '**' then '' else AD_COLUMN_IDENTIFIER('C_Project',c_project.c_project_id, ?) end)
                   ELSE '' END AS groupbyname,
-                CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT
+                CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT, FACT_ACCT.FACTACCTTYPE
             FROM FACT_ACCT
               LEFT JOIN C_BPARTNER ON FACT_ACCT.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
               LEFT JOIN M_PRODUCT ON FACT_ACCT.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
@@ -76,12 +77,16 @@
               AND 2=2
               AND 3=3) D
             WHERE 6=6
-            GROUP BY groupbyname, groupbyid, VALUE, NAME, ID, DATEACCT, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
+            GROUP BY groupbyname, groupbyid, VALUE, NAME, ID,
+            CASE WHEN FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACTACCTTYPE = 'R' THEN 3 ELSE (CASE WHEN FACTACCTTYPE = 'C' THEN 4 END) END) END) END,
+            DATEACCT, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
             HAVING SUM(AMTACCTDR) - SUM(AMTACCTCR) <> 0
-            ORDER  BY groupbyname, groupbyid, VALUE, NAME, ID, DATEACCT,  FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
+            ORDER  BY groupbyname, groupbyid, VALUE, NAME, ID, DATEACCT,
+            CASE WHEN FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACTACCTTYPE = 'R' THEN 3 ELSE (CASE WHEN FACTACCTTYPE = 'C' THEN 4 END) END) END) END
+	    ,  FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
           ) C
         ) B WHERE 1=1
-      ) A ORDER BY  groupbyname, groupbyid, VALUE, DATEACCT, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
+      ) A ORDER BY  groupbyname, groupbyid, VALUE, DATEACCT, FACTACCTTYPE, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
       ]]></Sql>
     <Field name="rownum" value="count"/>
     <Parameter name="rownum" type="replace" optional="true" after="FROM ( SELECT " text="'0'" />
@@ -126,14 +131,15 @@
       SELECT VALUE, NAME, DATEACCT,
           SUM(AMTACCTDR) AS AMTACCTDR, SUM(AMTACCTCR) AS AMTACCTCR,
           FACT_ACCT_GROUP_ID, ID, bpid, bpname, pdid, pdname, pjid, pjname,
-          DESCRIPTION
+          DESCRIPTION, FACTACCTTYPE
       FROM
         (SELECT FACT_ACCT.ACCTVALUE AS VALUE, FACT_ACCT.ACCTDESCRIPTION AS NAME,
             DATEACCT, AMTACCTDR, AMTACCTCR,
             FACT_ACCT_GROUP_ID, FACT_ACCT.ACCOUNT_ID AS ID, FACT_ACCT.DESCRIPTION,
             c_bpartner.c_bpartner_id as bpid, m_product.m_product_id as pdid, c_project.c_project_id as pjid,
             (case AD_COLUMN_IDENTIFIER('C_Bpartner',c_bpartner.c_bpartner_id, ?) when '**' then '' else AD_COLUMN_IDENTIFIER('C_Bpartner',c_bpartner.c_bpartner_id, ?) end) as bpname, (case AD_COLUMN_IDENTIFIER('M_Product',m_product.m_product_id, ?) when '**' then '' else AD_COLUMN_IDENTIFIER('M_Product',m_product.m_product_id, ?) end) as pdname, (case AD_COLUMN_IDENTIFIER('C_Project',c_project.c_project_id, ?) when '**' then '' else AD_COLUMN_IDENTIFIER('C_Project',c_project.c_project_id, ?) end)  as pjname,
-            CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT
+            CASE WHEN AMTACCTDR <> 0 THEN 'Y' ELSE 'N' END AS ISDEBIT,
+            CASE WHEN FACT_ACCT.FACTACCTTYPE = 'O' THEN 1 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE = 'N' THEN 2 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE = 'R' THEN 3 ELSE (CASE WHEN FACT_ACCT.FACTACCTTYPE = 'C' THEN 4 END) END) END) END AS FACTACCTTYPE
         FROM FACT_ACCT
           LEFT JOIN C_BPARTNER ON FACT_ACCT.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
           LEFT JOIN M_PRODUCT ON FACT_ACCT.M_PRODUCT_ID = M_PRODUCT.M_PRODUCT_ID
@@ -159,9 +165,9 @@
           AND 2=2
           AND 3=3) D
         WHERE 6=6
-        GROUP BY VALUE, NAME, ID, DATEACCT, FACT_ACCT_GROUP_ID, description, bpname, bpid, pdname, pdid, pjname, pjid, ISDEBIT
+        GROUP BY VALUE, NAME, ID, FACTACCTTYPE, DATEACCT, FACT_ACCT_GROUP_ID, description, bpname, bpid, pdname, pdid, pjname, pjid, ISDEBIT
         HAVING SUM(AMTACCTDR) - SUM(AMTACCTCR) <> 0
-        ORDER BY VALUE, NAME, ID, DATEACCT, FACT_ACCT_GROUP_ID, description,  bpname, bpid, pdname, pdid, pjname, pjid, ISDEBIT
+        ORDER BY VALUE, NAME, ID, DATEACCT, FACTACCTTYPE, FACT_ACCT_GROUP_ID, description,  bpname, bpid, pdname, pdid, pjname, pjid, ISDEBIT
       ]]></Sql>
     <Field name="rownum" value="count"/>
     <Parameter name="adLanguage"/>

details:   https://code.openbravo.com/erp/stable/2.50/rev/e8b3cacc2fa1
changeset: 9599:e8b3cacc2fa1
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Fri Jul 29 13:03:50 2011 +0200
summary:   Fixes issue 18130: Ant smartbuild does not detect timeout change

diffstat:

 src-wad/src/org/openbravo/wad/Wad_data.xsql |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 6c93b3dcded0 -r e8b3cacc2fa1 src-wad/src/org/openbravo/wad/Wad_data.xsql
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql	Thu Jul 28 18:27:21 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql	Fri Jul 29 13:03:50 2011 +0200
@@ -192,7 +192,11 @@
                                        from ad_model_object
                                       union
                                      select max(updated) 
-                                       from ad_model_object_mapping) upd) 
+                                       from ad_model_object_mapping
+                                      union
+                                     select max(updated)
+                                       from ad_model_object_para) upd) 
+                                      
       ]]>
     </Sql>
   </SqlMethod>

details:   https://code.openbravo.com/erp/devel/pi/rev/e6b8aac30d68
changeset: 13349:e6b8aac30d68
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Fri Jul 29 13:03:23 2011 +0200
summary:   Fixes issue 18129: Ant smartbuild does not detect timeout change

diffstat:

 src-wad/src/org/openbravo/wad/Wad_data.xsql |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 1b2e5c4bae72 -r e6b8aac30d68 src-wad/src/org/openbravo/wad/Wad_data.xsql
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql	Fri Jul 29 11:42:06 2011 +0200
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql	Fri Jul 29 13:03:23 2011 +0200
@@ -201,7 +201,11 @@
                                        from ad_model_object
                                       union
                                      select max(updated) 
-                                       from ad_model_object_mapping) upd) 
+                                       from ad_model_object_mapping
+                                      union
+                                     select max(updated)
+                                       from ad_model_object_para) upd) 
+                                      
       ]]>
     </Sql>
   </SqlMethod>

details:   https://code.openbravo.com/erp/devel/pi/rev/1b2e5c4bae72
changeset: 13348:1b2e5c4bae72
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Fri Jul 29 11:42:06 2011 +0200
summary:   Issue 18077: Updated revision number

diffstat:

 src/org/openbravo/erpCommon/security/Login.html |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 2d138204577c -r 1b2e5c4bae72 src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html	Fri Jul 29 11:29:14 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html	Fri Jul 29 11:42:06 2011 +0200
@@ -375,7 +375,7 @@
     }
     catch (e) { }
 
-    if ((!revisionControl('11665')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('11666')) || (isOpsInstance() != isOpsInstanceCached())) {
       maskLoginWindow(cacheMsg);
       setLoginMessage('Warning', '', cacheMsg);
     }

details:   https://code.openbravo.com/erp/devel/pi/rev/c4af7f9e6aaa
changeset: 13345:c4af7f9e6aaa
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Fri Jul 29 11:26:09 2011 +0200
summary:   Related to issue 17880. Related to issue 17819. Added recordTime property. Also, added getTimePassedInterval() method to support it.

details:   https://code.openbravo.com/erp/devel/pi/rev/11de85d32280
changeset: 13346:11de85d32280
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Fri Jul 29 11:27:42 2011 +0200
summary:   Fixed issue 17819. Notes timestamp will be calculated in the server to prevent clock synchronization problems

details:   https://code.openbravo.com/erp/devel/pi/rev/2d138204577c
changeset: 13347:2d138204577c
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Fri Jul 29 11:29:14 2011 +0200
summary:   Fixed issue 17880. Attachments 'age' will be calculated in the server to prevent clock synchronization issues

diffstat:

 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java               |  12 +++------
 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java |  12 +++------
 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js     |   2 +-
 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js           |   2 +-
 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js            |  11 ++++++--
 modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java                            |   1 +
 6 files changed, 19 insertions(+), 21 deletions(-)

diffs (141 lines):

diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java	Fri Jul 29 11:29:14 2011 +0200
@@ -19,8 +19,8 @@
 package org.openbravo.client.application.window;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -104,19 +104,15 @@
     String tableId = (String) DalUtil.getId(tab.getTable());
     OBCriteria<Attachment> attachmentFiles = OBDao.getFilteredCriteria(Attachment.class,
         Restrictions.eq("table.id", tableId), Restrictions.in("record", recordIds.split(",")));
+    attachmentFiles.addOrderBy("creationDate", false);
     List<JSONObject> attachments = new ArrayList<JSONObject>();
     for (Attachment attachment : attachmentFiles.list()) {
       JSONObject attachmentobj = new JSONObject();
       try {
         attachmentobj.put("id", attachment.getId());
         attachmentobj.put("name", attachment.getName());
-        final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
-        dateFormat.setLenient(true);
-        String date = dateFormat.format(attachment.getCreationDate());
-        String d1 = date.substring(0, date.length() - 2);
-        String d2 = date.substring(date.length() - 2, date.length());
-        attachmentobj.put("creationDate", d1 + ":" + d2);
-        attachmentobj.put("createdby", attachment.getCreatedBy().getName());
+        attachmentobj.put("age", (new Date().getTime() - attachment.getUpdated().getTime()));
+        attachmentobj.put("createdby", attachment.getUpdatedBy().getName());
       } catch (Exception e) {
         throw new OBException("Error while reading attachments:", e);
       }
diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Fri Jul 29 11:29:14 2011 +0200
@@ -22,8 +22,8 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -292,18 +292,14 @@
       attachments = OBDao.getFilteredCriteria(Attachment.class,
           Restrictions.eq("table.id", tableId), Restrictions.in("record", multipleRowIds));
     }
+    attachments.addOrderBy("creationDate", false);
     for (Attachment attachment : attachments.list()) {
       JSONObject obj = new JSONObject();
       try {
         obj.put("name", attachment.getName());
         obj.put("id", attachment.getId());
-        final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
-        dateFormat.setLenient(true);
-        String date = dateFormat.format(attachment.getCreationDate());
-        String d1 = date.substring(0, date.length() - 2);
-        String d2 = date.substring(date.length() - 2, date.length());
-        obj.put("creationDate", d1 + ":" + d2);
-        obj.put("createdby", attachment.getCreatedBy().getName());
+        obj.put("age", (new Date().getTime() - attachment.getUpdated().getTime()));
+        obj.put("createdby", attachment.getUpdatedBy().getName());
       } catch (JSONException e) {
         log.error("Error while reading attachments", e);
       }
diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js	Fri Jul 29 11:29:14 2011 +0200
@@ -392,7 +392,7 @@
         height: 20,
         wrap: false
       });
-      var creationDate = OB.Utilities.getTimePassed(isc.Date.parseSchemaDate(attachment.creationDate));
+      var creationDate = OB.Utilities.getTimePassedInterval(attachment.age);
       var attachmentBy = isc.Label.create({
         height:  1,
         className: 'OBNoteListGridAuthor',
diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js	Fri Jul 29 11:29:14 2011 +0200
@@ -274,7 +274,7 @@
         }
 
         value =  value + ' <span class="OBNoteListGridAuthor">' +
-                OB.Utilities.getTimePassed(record.creationDate) +
+                OB.Utilities.getTimePassedInterval(record.recordTime-record.creationDate.getTime()) +
             ' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' +
             record['createdBy._identifier']+'</span>';
 
diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Fri Jul 29 11:29:14 2011 +0200
@@ -830,7 +830,12 @@
       n;
   
   // time difference in days
-  var diffDays = Math.floor((msNow - msCreated) / (1000 * 60 * 60 * 24));
+  return OB.Utilities.getTimePassedInterval(msNow - msCreated);
+};
+
+OB.Utilities.getTimePassedInterval = function(
+  /* amount of time in miliseconds */ timeInMiliseconds) {
+  var diffDays = Math.floor((timeInMiliseconds) / (1000 * 60 * 60 * 24));
   if (diffDays >= 30) {
     n = Math.floor(diffDays / 30);
     return OB.Utilities.formatTimePassedMessage(n,
@@ -846,7 +851,7 @@
   }
 
   // time difference in hours
-  var diffHours = Math.floor((msNow - msCreated) / (1000 * 60 * 60));
+  var diffHours = Math.floor((timeInMiliseconds) / (1000 * 60 * 60));
   if (diffHours >= 1) {
     n = diffHours;
     return OB.Utilities.formatTimePassedMessage(n,
@@ -854,7 +859,7 @@
   }
 
   // time difference in minutes
-  n = Math.floor((msNow - msCreated) / (1000 * 60));
+  n = Math.floor((timeInMiliseconds) / (1000 * 60));
   return OB.Utilities.formatTimePassedMessage(n,
       'OBUIAPP_minutes_ago');
   };
diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Fri Jul 29 10:56:10 2011 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java	Fri Jul 29 11:29:14 2011 +0200
@@ -179,6 +179,7 @@
         }
       }
 
+      jsonObject.put("recordTime", new Date().getTime());
       return jsonObject;
     } catch (JSONException e) {
       throw new IllegalStateException(e);

details:   https://code.openbravo.com/erp/devel/pi/rev/52f07f8abaa9
changeset: 13333:52f07f8abaa9
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Jul 28 17:57:07 2011 +0200
summary:   Fixes bug 18118: Posting is broken while mixing invoices and GL items whenever the result payment is posted while being deposited

details:   https://code.openbravo.com/erp/devel/pi/rev/038a1d151bb0
changeset: 13334:038a1d151bb0
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Jul 28 17:57:43 2011 +0200
summary:   Reformatting file

diffstat:

 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java |  54 ++++-----
 1 files changed, 26 insertions(+), 28 deletions(-)

diffs (93 lines):

diff -r 951aa8d5e79f -r 038a1d151bb0 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Jul 28 17:33:23 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Jul 28 17:57:43 2011 +0200
@@ -30,7 +30,6 @@
 
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Restrictions;
-import org.openbravo.advpaymentmngt.APRM_FinaccTransactionV;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
@@ -42,8 +41,6 @@
 import org.openbravo.erpCommon.utility.FieldProviderFactory;
 import org.openbravo.erpCommon.utility.SequenceIdData;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.currency.ConversionRateDoc;
-import org.openbravo.model.common.currency.Currency;
 import org.openbravo.model.common.enterprise.AcctSchemaTableDocType;
 import org.openbravo.model.financialmgmt.accounting.FIN_FinancialAccountAccounting;
 import org.openbravo.model.financialmgmt.accounting.coa.AccountingCombination;
@@ -145,13 +142,12 @@
         FieldProviderFactory.setField(data[i], "cGlItemId",
             paymentDetails.get(i).getGLItem() != null ? paymentDetails.get(i).getGLItem().getId()
                 : "");
-        FieldProviderFactory.setField(data[i], "cInvoiceId",
-        		paymentDetails.get(i)
-                .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() != null
-                && paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
-                    .getInvoicePaymentSchedule().getInvoice() != null ? paymentDetails
-                .get(i).getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule()
-                .getInvoice().getId(): "");
+        FieldProviderFactory.setField(data[i], "cInvoiceId", paymentDetails.get(i)
+            .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule() != null
+            && paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
+                .getInvoicePaymentSchedule().getInvoice() != null ? paymentDetails.get(i)
+            .getFINPaymentScheduleDetailList().get(0).getInvoicePaymentSchedule().getInvoice()
+            .getId() : "");
         // Calculate Business Partner from payment header or from details if header is null
         BusinessPartner bPartner = payment.getBusinessPartner() != null ? payment
             .getBusinessPartner() : (paymentDetails.get(i).getFINPaymentScheduleDetailList().get(0)
@@ -431,9 +427,9 @@
           fact.createLine(
               line,
               getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.getCGlItemId()), as,
-                  isReceipt, conn), paymentCurrencyId, line.getPaymentAmount(), line
-                  .getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, null,
-              paymentToSchemaConversionRate, conn);
+                  isReceipt, conn), paymentCurrencyId, isReceipt ? "" : line.getAmount(),
+              isReceipt ? line.getAmount() : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+              DocumentType, null, paymentToSchemaConversionRate, conn);
         } else {
           fact.createLine(
               line,
@@ -458,22 +454,24 @@
       }
     } else {
       fact.createLine(
-		  null, 
-		  getAccountPayment(conn, txnFinPayment.getPaymentMethod(), txnFinPayment.getAccount(), as,
-			  txnFinPayment.isReceipt()), 
-			  txnFinPayment.getCurrency().getId(),
-    	      !txnFinPayment.isReceipt() ? txnFinPayment.getAmount().toString()
-    	          : "", txnFinPayment.isReceipt() ? txnFinPayment.getAmount()
-    	          .toString() : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, paymentDate,
-    	      docToSchemaConversionRate, EXCHANGE_DOCTYPE_Payment, txnFinPayment.getId(), conn);
+          null,
+          getAccountPayment(conn, txnFinPayment.getPaymentMethod(), txnFinPayment.getAccount(), as,
+              txnFinPayment.isReceipt()), txnFinPayment.getCurrency().getId(), !txnFinPayment
+              .isReceipt() ? txnFinPayment.getAmount().toString() : "",
+          txnFinPayment.isReceipt() ? txnFinPayment.getAmount().toString() : "",
+          Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, paymentDate,
+          docToSchemaConversionRate, EXCHANGE_DOCTYPE_Payment, txnFinPayment.getId(), conn);
     }
-    fact.createLine(null, getAccountUponDepositWithdrawal(conn, txnFinPayment.getPaymentMethod(),
-            transaction.getAccount(), as, txnFinPayment.isReceipt()), C_Currency_ID, 
-            transaction.getDepositAmount().toString(), transaction.getPaymentAmount().toString(),
-            Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, null, docToSchemaConversionRate, EXCHANGE_DOCTYPE_Transaction, transaction.getId(), conn);
-    if(!transaction.getForeignCurrency().equals(as.getC_Currency_ID())){
-    	MultiCurrency=true;
-    	createFactCurrencyBalancing(as, conn, fact, Fact_Acct_Group_ID, transaction);
+    fact.createLine(
+        null,
+        getAccountUponDepositWithdrawal(conn, txnFinPayment.getPaymentMethod(),
+            transaction.getAccount(), as, txnFinPayment.isReceipt()), C_Currency_ID, transaction
+            .getDepositAmount().toString(), transaction.getPaymentAmount().toString(),
+        Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, null, docToSchemaConversionRate,
+        EXCHANGE_DOCTYPE_Transaction, transaction.getId(), conn);
+    if (!transaction.getForeignCurrency().equals(as.getC_Currency_ID())) {
+      MultiCurrency = true;
+      createFactCurrencyBalancing(as, conn, fact, Fact_Acct_Group_ID, transaction);
     }
     SeqNo = "0";
     return fact;

details:   https://code.openbravo.com/erp/devel/pi/rev/de5d084560bb
changeset: 13342:de5d084560bb
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Fri Jul 29 09:52:21 2011 +0200
summary:   Issue 18077: Changes in Login page to add the sign-in button
- New feature, the login process can add a new startup message that will be
	shown as a dialog box
- Moved the errorMsgTitle and errorMsgContent to be in the html page instead
	of created dynamically using JavaScript
- Show the 'Sign in using: G' when the module is available

diffstat:

 src/index.jsp                                   |  11 ++++++
 src/org/openbravo/erpCommon/security/Login.html |   8 ++--
 src/org/openbravo/erpCommon/security/Login.java |  40 +++++++++++++++++++++---
 src/org/openbravo/erpCommon/security/Login.xml  |   4 ++
 web/skins/Default/Openbravo_ERP_250.css         |  12 +++---
 5 files changed, 59 insertions(+), 16 deletions(-)

diffs (201 lines):

diff -r 39cca0f426d8 -r de5d084560bb src/index.jsp
--- a/src/index.jsp	Fri Jul 29 10:12:35 2011 +0200
+++ b/src/index.jsp	Fri Jul 29 09:52:21 2011 +0200
@@ -155,6 +155,17 @@
   // get rid of the loading stuff
   document.body.removeChild(document.getElementById('OBLoadingDiv'));
   OB.GlobalHiddenForm = document.forms.OBGlobalHiddenForm;
+<%
+  if (session.getAttribute("STARTUP-MESSAGE") != null) {
+    String text = (String) session.getAttribute("STARTUP-MESSAGE");
+    String title = (String) session.getAttribute("STARTUP-MESSAGE-TITLE");
+    session.removeAttribute("STARTUP-MESSAGE");
+    session.removeAttribute("STARTUP-MESSAGE-TITLE");
+%>
+  isc.say('<%=text%>', null, {title: '<%=title%>'});
+<%
+  }
+%>
 }
 </script>
 <script type="text/javascript" src="./web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js"></script>
diff -r 39cca0f426d8 -r de5d084560bb src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html	Fri Jul 29 10:12:35 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html	Fri Jul 29 09:52:21 2011 +0200
@@ -255,9 +255,6 @@
     }
     topLogos.style.display = '';
     bottomLogos.style.display = '';
-
-    var msgContainer = document.getElementById('errorMsg');
-    msgContainer.innerHTML = '<span id="errorMsgTitle" class="Login_ErrorMsg_Title">xx</span><br><span id="errorMsgContent" class="Login_ErrorMsg_Content">xx</span>';
   }
 
   function maskLoginWindow(errorMsg) {
@@ -426,7 +423,9 @@
                   <input class="dojoValidateValid Login_TextBox" type="password" maxlength="40" name="password" id="password"/>
                 </dd>
               </dl>
-              <div id="errorMsg" class="LabelText Login_ErrorMsg_Container" style="display: none"><!-- xxChild tags developed in javascript --></div>
+              <div id="errorMsg" class="LabelText Login_ErrorMsg_Container" style="display:none;">
+                <span id="errorMsgTitle" class="Login_ErrorMsg_Title">xx</span><br><span id="errorMsgContent" class="Login_ErrorMsg_Content">xx</span>
+              </div>
             </div>
             <div class="Login_LogForm_Button_Container">
               <div class="Login_LogForm_Button">
@@ -452,6 +451,7 @@
                   </table>
                 </button>
               </div>
+              <div id="sign-in" style="margin-top:12px;">xxxSignIn</div>
             </div>
 
         </form>
diff -r 39cca0f426d8 -r de5d084560bb src/org/openbravo/erpCommon/security/Login.java
--- a/src/org/openbravo/erpCommon/security/Login.java	Fri Jul 29 10:12:35 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.java	Fri Jul 29 09:52:21 2011 +0200
@@ -31,9 +31,11 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.obps.ActivationKey;
+import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.OBVersion;
 import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.module.Module;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.model.ad.system.SystemInformation;
 import org.openbravo.xmlEngine.XmlDocument;
@@ -41,6 +43,8 @@
 public class Login extends HttpBaseServlet {
   private static final long serialVersionUID = 1L;
 
+  private static final String GOOGLE_INTEGRATION_MODULE_ID = "FF8080813129ADA401312CA1222A0005";
+
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
       ServletException {
     VariablesSecureApp vars = new VariablesSecureApp(request);
@@ -48,7 +52,6 @@
     if (vars.commandIn("LOGIN")) {
       log4j.debug("Command: Login");
       String strTheme = vars.getTheme();
-      vars.clearSession(false);
 
       OBContext.setAdminMode();
       try {
@@ -65,12 +68,13 @@
             .getLanguage().getLanguage());
 
         if (OBVersion.getInstance().is30()) {
-          printPageLogin30(response, strTheme, cacheMsg, validBrowserMsg, orHigherMsg,
+          printPageLogin30(vars, response, strTheme, cacheMsg, validBrowserMsg, orHigherMsg,
               recBrowserMsgTitle, recBrowserMsgText);
         } else {
           printPageLogin250(response, strTheme, cacheMsg, validBrowserMsg, orHigherMsg);
         }
       } finally {
+        vars.clearSession(false);
         OBContext.restorePreviousMode();
       }
 
@@ -226,17 +230,23 @@
   /**
    * Shows 3.0 login page
    */
-  private void printPageLogin30(HttpServletResponse response, String strTheme, String cacheMsg,
-      String validBrowserMsg, String orHigherMsg, String recBrowserMsgTitle,
-      String recBrowserMsgText) throws IOException, ServletException {
+  private void printPageLogin30(VariablesSecureApp vars, HttpServletResponse response,
+      String strTheme, String cacheMsg, String validBrowserMsg, String orHigherMsg,
+      String recBrowserMsgTitle, String recBrowserMsgText) throws IOException, ServletException {
 
     boolean showForgeLogo = true;
     boolean showITLogo = false;
     boolean showCompanyLogo = false;
+    boolean showGoogleIcon = false;
+
     String itLink = "";
     String companyLink = "";
     SystemInformation sysInfo = OBDal.getInstance().get(SystemInformation.class, "0");
 
+    Module module = OBDal.getInstance().get(Module.class, GOOGLE_INTEGRATION_MODULE_ID);
+
+    showGoogleIcon = (module != null);
+
     if (sysInfo == null) {
       log4j.error("System information not found");
     } else {
@@ -288,10 +298,28 @@
     xmlDocument.setParameter("recBrowserMsgTitle", recBrowserMsgTitleFinal.replaceAll("\\n", "\n"));
     xmlDocument.setParameter("recBrowserMsgText", recBrowserMsgTextFinal.replaceAll("\\n", "\n"));
 
+    if (showGoogleIcon) {
+
+      String authServlet = "../org.openbravo.service.integration.google/auth.html";
+      String link = "<p class=\"LabelText Login_LabelText\" style=\"line-height:24px;\">Sign in using:&nbsp; <a href=\""
+          + authServlet
+          + "\" title=\"Sign in using your Google Account\" target=\"_top\" "
+          + "><img style=\"vertical-align:middle;\" src=\"../web/images/google.png\" alt=\"Sign in using your Google Account\" width=\"24\" height=\"24\" border=\"0\"/></a></p>";
+
+      xmlDocument.setParameter("sign-in", link);
+    }
+
+    OBError error = (OBError) vars.getSessionObject("LoginErrorMsg");
+    if (error != null) {
+      vars.removeSessionValue("LoginErrorMsg");
+      xmlDocument.setParameter("errorMsgStyle", ""); // clear style
+      xmlDocument.setParameter("errorMsgTitle", error.getTitle());
+      xmlDocument.setParameter("errorMsgContent", error.getMessage());
+    }
+
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
     out.close();
   }
-
 }
diff -r 39cca0f426d8 -r de5d084560bb src/org/openbravo/erpCommon/security/Login.xml
--- a/src/org/openbravo/erpCommon/security/Login.xml	Fri Jul 29 10:12:35 2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.xml	Fri Jul 29 09:52:21 2011 +0200
@@ -28,4 +28,8 @@
   <PARAMETER id="validBrowserMsgOrHigher" name="validBrowserMsgOrHigher" default=""/>
   <PARAMETER id="recBrowserMsgTitle" name="recBrowserMsgTitle" default=""/>
   <PARAMETER id="recBrowserMsgText" name="recBrowserMsgText" default=""/>
+  <PARAMETER id="errorMsg" name="errorMsgStyle" attribute="style" default="display:none;" />
+  <PARAMETER id="errorMsgTitle" name="errorMsgTitle" default="" />
+  <PARAMETER id="errorMsgContent" name="errorMsgContent" default="" />
+  <PARAMETER id="sign-in" name="sign-in" default=""/>
 </REPORT>
diff -r 39cca0f426d8 -r de5d084560bb web/skins/Default/Openbravo_ERP_250.css
--- a/web/skins/Default/Openbravo_ERP_250.css	Fri Jul 29 10:12:35 2011 +0200
+++ b/web/skins/Default/Openbravo_ERP_250.css	Fri Jul 29 09:52:21 2011 +0200
@@ -4,14 +4,14 @@
  * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
  * Version 1.1  with a permitted attribution clause; you may not  use this
  * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
+ * the License at http://www.openbravo.com/legal/license.html
  * Software distributed under the License  is  distributed  on  an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
  * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2008-2010 Openbravo SLU 
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2008-2011 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -5567,7 +5567,7 @@
 }
 
 .Login_LogForm_Button {
-  margin-top: 28px;
+  margin-top: 10px;
 }
 
 .Login_TopLogos_Container_Support_Forge,

details:   https://code.openbravo.com/erp/devel/pi/rev/39cca0f426d8
changeset: 13341:39cca0f426d8
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Fri Jul 29 10:12:35 2011 +0200
summary:   Fixes int-dbcons-pgsql build #2246

diffstat:

 src-db/database/sourcedata/AD_FIELD.xml |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 736087383d76 -r 39cca0f426d8 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Jul 29 05:52:45 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Jul 29 10:12:35 2011 +0200
@@ -190049,7 +190049,7 @@
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <NAME><![CDATA[Financial account transaction]]></NAME>
+<!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <NAME><![CDATA[Financial Account Transaction]]></NAME>
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <AD_TAB_ID><![CDATA[FF808181309036230130905A9AAC0025]]></AD_TAB_ID>
 <!--B5B19E73B9AF4A7F8BDF45C44CAF0A90-->  <AD_COLUMN_ID><![CDATA[35AFE074271647AE830192953835C695]]></AD_COLUMN_ID>
@@ -190151,7 +190151,7 @@
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <NAME><![CDATA[Financial account transaction]]></NAME>
+<!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <NAME><![CDATA[Financial Account Transaction]]></NAME>
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <AD_TAB_ID><![CDATA[FF808181308EA4230130901D313D00A5]]></AD_TAB_ID>
 <!--B8C947608F1D4EA18BB86E4CA41B3A51-->  <AD_COLUMN_ID><![CDATA[35AFE074271647AE830192953835C695]]></AD_COLUMN_ID>
@@ -190781,7 +190781,7 @@
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C77A73D75FAB4CCC9F7833FC182E243E-->  <NAME><![CDATA[Financial account transaction]]></NAME>
+<!--C77A73D75FAB4CCC9F7833FC182E243E-->  <NAME><![CDATA[Financial Account Transaction]]></NAME>
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <AD_TAB_ID><![CDATA[FF808181309036230130905FCB450044]]></AD_TAB_ID>
 <!--C77A73D75FAB4CCC9F7833FC182E243E-->  <AD_COLUMN_ID><![CDATA[35AFE074271647AE830192953835C695]]></AD_COLUMN_ID>

details:   https://code.openbravo.com/erp/devel/pi/rev/736087383d76
changeset: 13340:736087383d76
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Fri Jul 29 05:52:45 2011 +0200
summary:   Fixes issue 17936 Using Internet Explorer, I can not change the Tax in Sales Invoice lines
Disabled the disabled-event-mask used by SC in some cases, works fine for IE9 now

diffstat:

 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js |  14 +++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r a7a2befbb130 -r 736087383d76 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Jul 28 20:43:04 2011 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Fri Jul 29 05:52:45 2011 +0200
@@ -50,6 +50,18 @@
 
 isc.StaticTextItem.getPrototype().getCanFocus = function() {return false;};
 
+isc.TextItem.addProperties({
+  // see comments in super type for useDisabledEventMask
+  // http://forums.smartclient.com/showthread.php?p=70160#post70160
+  // https://issues.openbravo.com/view.php?id=17936
+  useDisabledEventMask: function() {
+    if (isc.Browser.isIE) {
+      return false;
+    }
+    return this.Super('useDisabledEventMask', arguments);
+  }
+});
+
 // NOTE BEWARE: methods/props added here will overwrite and NOT extend FormItem
 // properties! 
 isc.FormItem.addProperties({
@@ -130,7 +142,7 @@
       this.selectValue();
     }
   },
-
+  
   blur: function(form, item){
     if (item._hasChanged && form && form.handleItemChange) {
       form.handleItemChange(this);

details:   https://code.openbravo.com/erp/devel/pi/rev/a7a2befbb130
changeset: 13339:a7a2befbb130
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Thu Jul 28 20:43:04 2011 +0200
summary:   Fixed issue 18112: Now print button works in IE

diffstat:

 src/org/openbravo/erpCommon/businessUtility/PrinterReports.html |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 583e489e4fcc -r a7a2befbb130 src/org/openbravo/erpCommon/businessUtility/PrinterReports.html
--- a/src/org/openbravo/erpCommon/businessUtility/PrinterReports.html	Thu Jul 28 19:30:46 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/PrinterReports.html	Thu Jul 28 20:43:04 2011 +0200
@@ -27,8 +27,12 @@
 <script language="JavaScript" type="text/javascript" id="paramLanguage">    defaultLang = "en_US";</script>
 <script language="JavaScript" type="text/javascript" id="isPrintPreview">
 function printReport(pagina) {
-    if (top.OB && top.OB.Layout) {
-      top.OB.Layout.ClassicOBCompatibility.Popup.open('printpdf', 600, 300, pagina + "?Commnad=PDF", '', window, false, false, true);
+    if (isWindowInMDIContext) {
+      var LayoutMDI = getFrame('LayoutMDI');
+      if (pagina.indexOf('../') === 0) {
+        pagina = pagina.substring(3, pagina.length);
+      }
+      LayoutMDI.OB.Layout.ClassicOBCompatibility.Popup.open('printpdf', 600, 300, LayoutMDI.OB.Application.contextUrl + pagina + "?Commnad=PDF", '', window, false, false, true);
     } else {
       openPDF(pagina, 'PDF');
     }

details:   https://code.openbravo.com/erp/devel/pi/rev/583e489e4fcc
changeset: 13338:583e489e4fcc
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Thu Jul 28 19:30:46 2011 +0200
summary:   [imageBLOB] Hack to ensure the item is displayed properly in IE and Firefox

diffstat:

 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (18 lines):

diff -r ae706b58215e -r 583e489e4fcc modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Jul 28 18:05:26 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Jul 28 19:30:46 2011 +0200
@@ -403,7 +403,14 @@
   titleStyle: 'OBFormFieldLabel'
 });
 
+if (navigator.userAgent.toUpperCase().indexOf("MSIE") >= 0) { //IE hack to avoid item be 12 px below the title
+  OBImageCanvas.addProperties({
+    layoutTopMargin: -12
+  });
+}
+
 isc.OBImageCanvas.addProperties({
+  height: '0px', // Hack to avoid second line be desplaced in Firefox and IE
   zoomInCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomIn.cur',
   zoomOutCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomOut.cur',
   imageNotAvailableSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/imageNotAvailable.png',

details:   https://code.openbravo.com/erp/devel/pi/rev/597a83fddc53
changeset: 13335:597a83fddc53
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Thu Jul 28 18:29:55 2011 +0200
summary:   Added top vertical align for all form items

diffstat:

 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 038a1d151bb0 -r 597a83fddc53 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Jul 28 17:57:43 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Jul 28 18:29:55 2011 +0200
@@ -53,6 +53,7 @@
 .OBFormFieldError {
   font-family: 'lucida sans', sans-serif;
   padding: 4px 8px 4px 8px;
+  vertical-align: top;
 }
 
 .OBFormFieldLabel,

details:   https://code.openbravo.com/erp/stable/2.50/rev/6c93b3dcded0
changeset: 9598:6c93b3dcded0
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Jul 28 18:27:21 2011 +0200
summary:   Fixes 18119: Posting is broken while mixing invoices and GL items whenever the result payment is posted while being deposited

diffstat:

 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r 14d4b608ea33 -r 6c93b3dcded0 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Jul 28 17:30:37 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Jul 28 18:27:21 2011 +0200
@@ -405,8 +405,9 @@
           fact.createLine(
               line,
               getAccountGLItem(OBDal.getInstance().get(GLItem.class, line.getCGlItemId()), as,
-                  isReceipt, conn), C_Currency_ID, line.getPaymentAmount(),
-              line.getDepositAmount(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+                  isReceipt, conn), C_Currency_ID, isReceipt ? "" : line.getAmount(),
+              isReceipt ? line.getAmount() : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+              DocumentType, conn);
         } else {
           String bpAmountConverted = bpamount.toString();
           Invoice invoice = line.getInvoice();

details:   https://code.openbravo.com/erp/devel/pi/rev/951aa8d5e79f
changeset: 13332:951aa8d5e79f
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Jul 28 17:33:23 2011 +0200
summary:   fixed bug 18120: Dependency error when packaging a module

diffstat:

 src/org/openbravo/erpCommon/modules/VersionUtility.java |  40 ++++++++++
 src/org/openbravo/service/system/ModuleValidator.java   |  68 ++++++++++++----
 2 files changed, 89 insertions(+), 19 deletions(-)

diffs (141 lines):

diff -r 6b145146b223 -r 951aa8d5e79f src/org/openbravo/erpCommon/modules/VersionUtility.java
--- a/src/org/openbravo/erpCommon/modules/VersionUtility.java	Thu Jul 28 14:45:19 2011 +0200
+++ b/src/org/openbravo/erpCommon/modules/VersionUtility.java	Thu Jul 28 17:33:23 2011 +0200
@@ -503,6 +503,46 @@
       return -1;
   }
 
+  /**
+   * Compares 2 versions taking into account just their major versions.
+   * 
+   * @return<ul> <li>-1 in case ver1 is lower than ver2 <li>0 in case ver1 equals ver2 <li>1 in case
+   *             ver1 is higher than ver2 </ul>
+   */
+  static public int versionCompareStrictMajorVersion(String ver1, String ver2) {
+    if ((ver1 == null || ver1.equals("")) && (ver2 == null || ver2.equals("")))
+      return 0;
+    if ((ver1 == null || ver1.equals("")))
+      return 1;
+    if ((ver2 == null || ver2.equals("")))
+      return -1;
+
+    String s1[] = ver1.split("[.]");
+    String s2[] = ver2.split("[.]");
+
+    int n1[] = new int[3];
+    int n2[] = new int[3];
+
+    for (int i = 0; i < 3; i++) {
+      if (s1.length - 1 < i || s1[i] == null || s1[i].equals(""))
+        n1[i] = 0;
+      else
+        n1[i] = Integer.parseInt(s1[i]);
+
+      if (s2.length - 1 < i || s2[i] == null || s2[i].equals(""))
+        n2[i] = 0;
+      else
+        n2[i] = Integer.parseInt(s2[i]);
+    }
+
+    if (n1[0] > n2[0] || (n1[0] == n2[0] && n1[1] > n2[1]))
+      return 1;
+    else if (n1[0] == n2[0] && n1[1] == n2[1])
+      return 0;
+    else
+      return -1;
+  }
+
   @SuppressWarnings("unchecked")
   static private HashMap<String, Mod> modules2mods(Module[] modules) {
     HashMap<String, Mod> mods = new HashMap<String, Mod>();
diff -r 6b145146b223 -r 951aa8d5e79f src/org/openbravo/service/system/ModuleValidator.java
--- a/src/org/openbravo/service/system/ModuleValidator.java	Thu Jul 28 14:45:19 2011 +0200
+++ b/src/org/openbravo/service/system/ModuleValidator.java	Thu Jul 28 17:33:23 2011 +0200
@@ -233,38 +233,68 @@
    */
   private void checkDependencyVersion(Module module, SystemValidationResult result) {
     for (ModuleDependency dependentModule : module.getModuleDependencyList()) {
-      String depDefinedVersion = dependentModule.getFirstVersion();
+      String firstVer = dependentModule.getFirstVersion();
+      String lastVer = dependentModule.getLastVersion();
       String depActualVersion = dependentModule.getDependentModule().getVersion();
 
       if (dependentModule.isIncluded()) {
         // for inclusions check the dependency matches exactly with the defined one
-        if (!depActualVersion.equals(depDefinedVersion)) {
+        if (!depActualVersion.equals(firstVer)) {
           result.addWarning(SystemValidationType.MODULE_ERROR, module.getName()
               + " defines inclussion of module " + dependentModule.getDependentModule().getName()
-              + " in version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion + ". They must exactly match.");
+              + " in version " + firstVer + ", but actual version in DB is " + depActualVersion
+              + ". They must exactly match.");
         }
         // check dependencies for included modules recursively
         checkDependencyVersion(dependentModule.getDependentModule(), result);
       } else {
         VersionUtility.VersionComparator vc = new VersionComparator();
-        if (vc.compare(depDefinedVersion, depActualVersion) == 1) {
+        String enforcement = dependentModule.getDependencyEnforcement();
+
+        if (lastVer != null && vc.compare(firstVer, lastVer) > 0) {
           result.addError(SystemValidationType.MODULE_ERROR, module.getName()
               + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " start version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion);
-        } else if (dependentModule.getLastVersion() == null
-            && vc.compareMajorVersions(depDefinedVersion, depActualVersion) != 0) {
-          result.addError(SystemValidationType.MODULE_ERROR, module.getName()
-              + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " start version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion + ". Which has a different major version.");
-        } else if (dependentModule.getLastVersion() != null
-            && vc.compare(depActualVersion, dependentModule.getLastVersion()) == 1) {
-          result.addError(SystemValidationType.MODULE_ERROR, module.getName()
-              + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " end version " + dependentModule.getLastVersion()
-              + ", but actual version in DB is " + depActualVersion);
+              + ". It is incorrect beacuase first version (" + firstVer
+              + ") is higher than last version (" + lastVer + ")");
+        }
+
+        if ("MAJOR".equals(enforcement)) {
+          if (vc.compare(firstVer, depActualVersion) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " start version " + firstVer + ", but actual version in DB is "
+                + depActualVersion + ".");
+          } else if (lastVer == null && vc.compareMajorVersions(firstVer, depActualVersion) != 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " start version " + firstVer + ", but actual version in DB is "
+                + depActualVersion + ". Which has a different major version.");
+          } else if (lastVer != null
+              && VersionUtility.versionCompareStrictMajorVersion(depActualVersion, lastVer) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " end version " + lastVer + ", but actual version in DB is " + depActualVersion);
+          }
+        } else if ("MINOR".equals(enforcement)) {
+          if (lastVer == null && vc.compare(firstVer, depActualVersion) != 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines a MINOR enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " version " + firstVer
+                + ", but actual version in DB is " + depActualVersion
+                + ". Both versions must be exactly the same.");
+          } else if (lastVer != null && vc.compare(depActualVersion, lastVer) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines a MINOR enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " end version " + lastVer
+                + ", but actual version in DB is " + depActualVersion);
+          }
+        } else { // NONE
+          if (vc.compare(firstVer, depActualVersion) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines NONE enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " start version " + firstVer
+                + ", but actual version in DB is " + depActualVersion + ".");
+          }
         }
       }
     }

details:   https://code.openbravo.com/erp/stable/2.50/rev/14d4b608ea33
changeset: 9597:14d4b608ea33
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Jul 28 17:30:37 2011 +0200
summary:   fixed bug 17909: Dependency error when packaging a module

diffstat:

 src/org/openbravo/erpCommon/modules/VersionUtility.java |  40 ++++++++++
 src/org/openbravo/service/system/ModuleValidator.java   |  68 ++++++++++++----
 2 files changed, 89 insertions(+), 19 deletions(-)

diffs (141 lines):

diff -r 443cc0cba6da -r 14d4b608ea33 src/org/openbravo/erpCommon/modules/VersionUtility.java
--- a/src/org/openbravo/erpCommon/modules/VersionUtility.java	Tue Jul 26 16:50:19 2011 +0200
+++ b/src/org/openbravo/erpCommon/modules/VersionUtility.java	Thu Jul 28 17:30:37 2011 +0200
@@ -508,6 +508,46 @@
       return -1;
   }
 
+  /**
+   * Compares 2 versions taking into account just their major versions.
+   * 
+   * @return<ul> <li>-1 in case ver1 is lower than ver2 <li>0 in case ver1 equals ver2 <li>1 in case
+   *             ver1 is higher than ver2 </ul>
+   */
+  static public int versionCompareStrictMajorVersion(String ver1, String ver2) {
+    if ((ver1 == null || ver1.equals("")) && (ver2 == null || ver2.equals("")))
+      return 0;
+    if ((ver1 == null || ver1.equals("")))
+      return 1;
+    if ((ver2 == null || ver2.equals("")))
+      return -1;
+
+    String s1[] = ver1.split("[.]");
+    String s2[] = ver2.split("[.]");
+
+    int n1[] = new int[3];
+    int n2[] = new int[3];
+
+    for (int i = 0; i < 3; i++) {
+      if (s1.length - 1 < i || s1[i] == null || s1[i].equals(""))
+        n1[i] = 0;
+      else
+        n1[i] = Integer.parseInt(s1[i]);
+
+      if (s2.length - 1 < i || s2[i] == null || s2[i].equals(""))
+        n2[i] = 0;
+      else
+        n2[i] = Integer.parseInt(s2[i]);
+    }
+
+    if (n1[0] > n2[0] || (n1[0] == n2[0] && n1[1] > n2[1]))
+      return 1;
+    else if (n1[0] == n2[0] && n1[1] == n2[1])
+      return 0;
+    else
+      return -1;
+  }
+
   @SuppressWarnings("unchecked")
   static private HashMap<String, Mod> modules2mods(Module[] modules) {
     HashMap<String, Mod> mods = new HashMap<String, Mod>();
diff -r 443cc0cba6da -r 14d4b608ea33 src/org/openbravo/service/system/ModuleValidator.java
--- a/src/org/openbravo/service/system/ModuleValidator.java	Tue Jul 26 16:50:19 2011 +0200
+++ b/src/org/openbravo/service/system/ModuleValidator.java	Thu Jul 28 17:30:37 2011 +0200
@@ -238,38 +238,68 @@
    */
   private void checkDependencyVersion(Module module, SystemValidationResult result) {
     for (ModuleDependency dependentModule : module.getModuleDependencyList()) {
-      String depDefinedVersion = dependentModule.getFirstVersion();
+      String firstVer = dependentModule.getFirstVersion();
+      String lastVer = dependentModule.getLastVersion();
       String depActualVersion = dependentModule.getDependentModule().getVersion();
 
       if (dependentModule.isIncluded()) {
         // for inclusions check the dependency matches exactly with the defined one
-        if (!depActualVersion.equals(depDefinedVersion)) {
+        if (!depActualVersion.equals(firstVer)) {
           result.addWarning(SystemValidationType.MODULE_ERROR, module.getName()
               + " defines inclussion of module " + dependentModule.getDependentModule().getName()
-              + " in version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion + ". They must exactly match.");
+              + " in version " + firstVer + ", but actual version in DB is " + depActualVersion
+              + ". They must exactly match.");
         }
         // check dependencies for included modules recursively
         checkDependencyVersion(dependentModule.getDependentModule(), result);
       } else {
         VersionUtility.VersionComparator vc = new VersionComparator();
-        if (vc.compare(depDefinedVersion, depActualVersion) == 1) {
+        String enforcement = dependentModule.getDependencyEnforcement();
+
+        if (lastVer != null && vc.compare(firstVer, lastVer) > 0) {
           result.addError(SystemValidationType.MODULE_ERROR, module.getName()
               + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " start version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion);
-        } else if (dependentModule.getLastVersion() == null
-            && vc.compareMajorVersions(depDefinedVersion, depActualVersion) != 0) {
-          result.addError(SystemValidationType.MODULE_ERROR, module.getName()
-              + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " start version " + depDefinedVersion + ", but actual version in DB is "
-              + depActualVersion + ". Which has a different major version.");
-        } else if (dependentModule.getLastVersion() != null
-            && vc.compare(depActualVersion, dependentModule.getLastVersion()) == 1) {
-          result.addError(SystemValidationType.MODULE_ERROR, module.getName()
-              + " defines dependency on " + dependentModule.getDependentModule().getName()
-              + " end version " + dependentModule.getLastVersion()
-              + ", but actual version in DB is " + depActualVersion);
+              + ". It is incorrect beacuase first version (" + firstVer
+              + ") is higher than last version (" + lastVer + ")");
+        }
+
+        if ("MAJOR".equals(enforcement)) {
+          if (vc.compare(firstVer, depActualVersion) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " start version " + firstVer + ", but actual version in DB is "
+                + depActualVersion + ".");
+          } else if (lastVer == null && vc.compareMajorVersions(firstVer, depActualVersion) != 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " start version " + firstVer + ", but actual version in DB is "
+                + depActualVersion + ". Which has a different major version.");
+          } else if (lastVer != null
+              && VersionUtility.versionCompareStrictMajorVersion(depActualVersion, lastVer) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines dependency on " + dependentModule.getDependentModule().getName()
+                + " end version " + lastVer + ", but actual version in DB is " + depActualVersion);
+          }
+        } else if ("MINOR".equals(enforcement)) {
+          if (lastVer == null && vc.compare(firstVer, depActualVersion) != 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines a MINOR enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " version " + firstVer
+                + ", but actual version in DB is " + depActualVersion
+                + ". Both versions must be exactly the same.");
+          } else if (lastVer != null && vc.compare(depActualVersion, lastVer) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines a MINOR enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " end version " + lastVer
+                + ", but actual version in DB is " + depActualVersion);
+          }
+        } else { // NONE
+          if (vc.compare(firstVer, depActualVersion) > 0) {
+            result.addError(SystemValidationType.MODULE_ERROR, module.getName()
+                + " defines NONE enforcement dependency on "
+                + dependentModule.getDependentModule().getName() + " start version " + firstVer
+                + ", but actual version in DB is " + depActualVersion + ".");
+          }
         }
       }
     }

details:   https://code.openbravo.com/erp/stable/2.50/rev/5c6974c686d5
changeset: 9595:5c6974c686d5
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Fri Jul 22 10:39:32 2011 +0200
summary:   Fixes issue 17938: The error message is not clear

details:   https://code.openbravo.com/erp/stable/2.50/rev/443cc0cba6da
changeset: 9596:443cc0cba6da
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Tue Jul 26 16:50:19 2011 +0200
summary:   Fixes issue 15262: Copy lines button incorrect message

diffstat:

 src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java |  12 ++-
 src/org/openbravo/erpCommon/ad_forms/DocInOut.java             |  37 +++++----
 src/org/openbravo/erpCommon/ad_forms/Fact.java                 |   1 +
 3 files changed, 31 insertions(+), 19 deletions(-)

diffs (91 lines):

diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java	Thu Jul 28 12:39:21 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java	Tue Jul 26 16:50:19 2011 +0200
@@ -32,10 +32,12 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.SequenceIdData;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.utils.Replace;
 import org.openbravo.xmlEngine.XmlDocument;
 
@@ -62,8 +64,14 @@
       printPageDataSheet(response, vars, strKey, strWindowId, strTabId, strSOTrx, strBpartner,
           strmPricelistId);
     } else if (vars.commandIn("SAVE")) {
-      String strRownum = vars.getRequiredInStringParameter("inpRownumId",
-          IsPositiveIntFilter.instance);
+      String strRownum = null;
+      try {
+        strRownum = vars.getRequiredInStringParameter("inpRownumId", IsPositiveIntFilter.instance);
+      } catch (ServletException e) {
+        log4j.error("Error captured: ", e);
+        throw new ServletException(Utility.messageBD(new DalConnectionProvider(), "@JS1@",
+            OBContext.getOBContext().getLanguage().getLanguage()));
+      }
       String strKey = vars.getRequiredStringParameter("inpcOrderId");
       String strWindowId = vars.getStringParameter("inpWindowId");
       String strSOTrx = vars.getStringParameter("inpissotrx");
diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_forms/DocInOut.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInOut.java	Thu Jul 28 12:39:21 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInOut.java	Tue Jul 26 16:50:19 2011 +0200
@@ -223,23 +223,26 @@
           dr = fact.createLine(line, line.getAccount(ProductInfo.ACCTTYPE_P_Asset, as, conn), as
               .getC_Currency_ID(), strCosts, "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
               DocumentType, conn);
-          dr.setM_Locator_ID(line.m_M_Locator_ID);
-          dr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from
-          // Loc
-          dr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to
-          // Loc
-          log4jDocInOut.debug("(matReceipt) - CR account: "
-              + line.getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn));
-          log4jDocInOut.debug("(matReceipt) - CR costs: " + strCosts);
-          // NotInvoicedReceipt CR
-          cr = fact.createLine(line, getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn),
-              as.getC_Currency_ID(), "", strCosts, Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-              DocumentType, conn);
-          cr.setM_Locator_ID(line.m_M_Locator_ID);
-          cr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from
-          // Loc
-          cr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to
-          // Loc
+          if (!getStatus().equals("i")) {
+            dr.setM_Locator_ID(line.m_M_Locator_ID);
+            dr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from
+            // Loc
+            dr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to
+            // Loc
+            log4jDocInOut.debug("(matReceipt) - CR account: "
+                + line.getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn));
+            log4jDocInOut.debug("(matReceipt) - CR costs: " + strCosts);
+            // NotInvoicedReceipt CR
+            cr = fact.createLine(line,
+                getAccount(AcctServer.ACCTTYPE_NotInvoicedReceipts, as, conn),
+                as.getC_Currency_ID(), "", strCosts, Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+                DocumentType, conn);
+            cr.setM_Locator_ID(line.m_M_Locator_ID);
+            cr.setLocationFromBPartner(C_BPartner_Location_ID, true, conn); // from
+            // Loc
+            cr.setLocationFromLocator(line.m_M_Locator_ID, false, conn); // to
+            // Loc
+          }
         }
       }
     } else {
diff -r acc438f3d59a -r 443cc0cba6da src/org/openbravo/erpCommon/ad_forms/Fact.java
--- a/src/org/openbravo/erpCommon/ad_forms/Fact.java	Thu Jul 28 12:39:21 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/Fact.java	Tue Jul 26 16:50:19 2011 +0200
@@ -125,6 +125,7 @@
     // Data Check
     if (account == null) {
       log4jFact.debug("end of create line");
+      m_doc.setStatus(AcctServer.STATUS_InvalidAccount);
       return null;
     }
     //

details:   https://code.openbravo.com/erp/devel/pi/rev/f5c1f04bb7ac
changeset: 13323:f5c1f04bb7ac
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Wed Jun 22 22:08:26 2011 +0200
summary:   Exchange rate at document level

details:   https://code.openbravo.com/erp/devel/pi/rev/4c67babc7810
changeset: 13324:4c67babc7810
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Wed Jun 22 22:09:10 2011 +0200
summary:   added Exchange rate table

details:   https://code.openbravo.com/erp/devel/pi/rev/c2d21db7bb30
changeset: 13325:c2d21db7bb30
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Fri Jun 24 16:31:50 2011 +0200
summary:   Validation rule and tab restrictions

details:   https://code.openbravo.com/erp/devel/pi/rev/ecd741920f59
changeset: 13326:ecd741920f59
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Fri Jun 24 16:33:21 2011 +0200
summary:   Exchange rate callout

details:   https://code.openbravo.com/erp/devel/pi/rev/354aa0b865ad
changeset: 13327:354aa0b865ad
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Mon Jul 04 16:01:18 2011 +0200
summary:   Fixed bug 17823, Fixed bug 17825, Fixed bug 17828, Fixed bug 17841, Fixed bug 17842, Fixed bug 17843, Fixed bug 17844, Fixed bug 17848, Fixed bug 17852

details:   https://code.openbravo.com/erp/devel/pi/rev/887a041f92a6
changeset: 13328:887a041f92a6
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Mon Jul 04 17:44:29 2011 +0200
summary:   Fixed bug 17826 Fixed bug 17827

details:   https://code.openbravo.com/erp/devel/pi/rev/0ab8d290c95a
changeset: 13329:0ab8d290c95a
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Wed Jul 13 16:49:45 2011 +0200
summary:   Fixed bug 17842

details:   https://code.openbravo.com/erp/devel/pi/rev/fb50d884949b
changeset: 13330:fb50d884949b
user:      Salvador Zapata <salvador.zapata <at> openbravo.com>
date:      Wed Jul 27 15:34:23 2011 +0200
summary:   fixed bug 18084

details:   https://code.openbravo.com/erp/devel/pi/rev/6b145146b223
changeset: 13331:6b145146b223
user:      szapata <sza <at> openbravo.com>
date:      Thu Jul 28 14:45:19 2011 +0200
summary:   Transaction ID column as search instead of tabledir

diffstat:

 .settings/org.eclipse.jdt.core.prefs                                                                  |     2 +-
 eclipse.compile.complete.launch                                                                       |    24 +-
 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java |     4 +
 src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml                                           |    94 +
 src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml                                     |   125 +
 src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml                                              |    33 +-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml                                                       |    22 +
 src-db/database/sourcedata/AD_CALLOUT.xml                                                             |     9 +
 src-db/database/sourcedata/AD_COLUMN.xml                                                              |   513 +++
 src-db/database/sourcedata/AD_ELEMENT.xml                                                             |    11 +
 src-db/database/sourcedata/AD_FIELD.xml                                                               |  1405 ++++++++++
 src-db/database/sourcedata/AD_MESSAGE.xml                                                             |    11 +
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml                                                        |    12 +
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml                                                |    10 +
 src-db/database/sourcedata/AD_TAB.xml                                                                 |   125 +
 src-db/database/sourcedata/AD_TABLE.xml                                                               |    22 +
 src-db/database/sourcedata/AD_VAL_RULE.xml                                                            |    22 +
 src/org/openbravo/erpCommon/ad_callouts/SE_CalculateExchangeRate.java                                 |    78 +
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                                                  |   131 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java                                     |    44 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java                                               |    27 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java                                        |    99 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java                                                  |   162 +-
 src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java                                |    16 +
 src/org/openbravo/erpCommon/ad_forms/DocLine_FINReconciliation.java                                   |    15 +-
 src/org/openbravo/erpCommon/ad_forms/Fact.java                                                        |   130 +-
 src/org/openbravo/erpCommon/ad_forms/FactLine.java                                                    |    77 +-
 27 files changed, 3052 insertions(+), 171 deletions(-)

diffs (truncated from 4185 to 300 lines):

diff -r 1dca0763b990 -r 6b145146b223 .settings/org.eclipse.jdt.core.prefs
--- a/.settings/org.eclipse.jdt.core.prefs	Thu Jul 28 13:55:10 2011 +0200
+++ b/.settings/org.eclipse.jdt.core.prefs	Thu Jul 28 14:45:19 2011 +0200
@@ -1,4 +1,4 @@
-#Wed Jan 14 12:27:06 CET 2009
+#Wed Jun 22 21:40:12 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
diff -r 1dca0763b990 -r 6b145146b223 eclipse.compile.complete.launch
--- a/eclipse.compile.complete.launch	Thu Jul 28 13:55:10 2011 +0200
+++ b/eclipse.compile.complete.launch	Thu Jul 28 14:45:19 2011 +0200
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_BUILD_SCOPE" value="${none}"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/openbravo/build.xml"/>
+</listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbravo"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="eclipse.compile.complete,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/openbravo/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/openbravo}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="eclipse.compile.complete,"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="openbravo"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/openbravo/build.xml"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/openbravo/build.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 </launchConfiguration>
diff -r 1dca0763b990 -r 6b145146b223 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Jul 28 13:55:10 2011 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Jul 28 14:45:19 2011 +0200
@@ -39,6 +39,7 @@
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.invoice.Invoice;
+import org.openbravo.model.common.currency.ConversionRateDoc;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
@@ -371,6 +372,7 @@
             }
           }
           List<FIN_PaymentDetail> paymentDetails = payment.getFINPaymentDetailList();
+          List<ConversionRateDoc> conversionRates = payment.getCurrencyConversionRateDocList();
           for (FIN_PaymentDetail paymentDetail : paymentDetails) {
             removedPDS = new ArrayList<FIN_PaymentScheduleDetail>();
             for (FIN_PaymentScheduleDetail paymentScheduleDetail : paymentDetail
@@ -421,6 +423,8 @@
             OBDal.getInstance().remove(OBDal.getInstance().get(FIN_PaymentDetail.class, pdToRm));
           }
           payment.getFINPaymentDetailList().removeAll(removedPD);
+          payment.getCurrencyConversionRateDocList().removeAll(conversionRates);
+          payment.setFinancialTransactionConvertRate(BigDecimal.ZERO);
           OBDal.getInstance().save(payment);
 
           if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0
diff -r 1dca0763b990 -r 6b145146b223 src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/C_CONVERSION_RATE_DOCUMENT.xml	Thu Jul 28 14:45:19 2011 +0200
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+  <database name="TABLE C_CONVERSION_RATE_DOCUMENT">
+    <table name="C_CONVERSION_RATE_DOCUMENT" primaryKey="C_CURRENCYRATEDOC_KEY">
+      <column name="C_CONVERSION_RATE_DOCUMENT_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_CURRENCY_ID_TO" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="FIN_PAYMENT_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="APRM_FINACC_TRANSACTION_V_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="RATE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="FOREIGN_AMOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="FIN_FINACC_TRANSACTION" name="C_CONVERSIONRATEDOC_TXN">
+        <reference local="APRM_FINACC_TRANSACTION_V_ID" foreign="FIN_FINACC_TRANSACTION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYRATEDOC_C_CURRENCY">
+        <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_CLIENT" name="C_CURRENCYRATEDOC_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="C_CURRENCYRATEDOC_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_INVOICE" name="C_CURRENCYRATEDOCINV">
+        <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="FIN_PAYMENT" name="C_CURRENCYRATEDOCPAY">
+        <reference local="FIN_PAYMENT_ID" foreign="FIN_PAYMENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYRATEDOCRATETO">
+        <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
+      <unique name="C_CONVERSIONRATEDOC_ONCE">
+        <unique-column name="C_CURRENCY_ID"/>
+        <unique-column name="C_CURRENCY_ID_TO"/>
+        <unique-column name="C_INVOICE_ID"/>
+        <unique-column name="FIN_PAYMENT_ID"/>
+        <unique-column name="APRM_FINACC_TRANSACTION_V_ID"/>
+      </unique>
+      <check name="C_CONVERSIONRATEDOC_ACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
diff -r 1dca0763b990 -r 6b145146b223 src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml	Thu Jul 28 14:45:19 2011 +0200
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER C_CONVERSION_RATE_DOCUMENT_TRG">
+    <trigger name="C_CONVERSION_RATE_DOCUMENT_TRG" table="C_CONVERSION_RATE_DOCUMENT" fires="before" insert="true" update="true" delete="true" foreach="row">
+      <body><![CDATA[
+
+
+
+
+
+    /*************************************************************************
+    * The contents of this file are subject to the Openbravo  Public  License
+    * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+    * Version 1.1  with a permitted attribution clause; you may not  use this
+    * file except in compliance with the License. You  may  obtain  a copy of
+    * the License at http://www.openbravo.com/legal/license.html
+    * Software distributed under the License  is  distributed  on  an "AS IS"
+    * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+    * License for the specific  language  governing  rights  and  limitations
+    * under the License.
+    * The Original Code is Openbravo ERP.
+    * The Initial Developer of the Original Code is Openbravo SLU
+    * All portions are Copyright (C) 2001-2008 Openbravo SLU
+    * All Rights Reserved.
+    * Contributor(s):  ______________________________________.
+    ************************************************************************/
+    /*************************************************************************
+    * Title: Check in deleting, invoice not processed
+    ************************************************************************/
+   v_Posted VARCHAR2(32) ;
+   v_HasReversal CHAR(1);
+        
+BEGIN
+    
+    IF AD_isTriggerEnabled()='N' THEN RETURN;
+    END IF;
+
+
+    -- If invoice is posted, CRUD is not allowed
+    IF INSERTING
+    THEN
+	IF :NEW.C_INVOICE_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM C_INVOICE
+		WHERE C_INVOICE_ID = :NEW.C_INVOICE_ID;
+	END IF;
+
+	IF :NEW.FIN_PAYMENT_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM FIN_PAYMENT
+		WHERE FIN_PAYMENT_ID = :NEW.FIN_PAYMENT_ID;
+	END IF;
+
+	IF :NEW.aprm_finacc_transaction_v_id IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM aprm_finacc_transaction_v
+		WHERE aprm_finacc_transaction_v_id = :NEW.aprm_finacc_transaction_v_id;
+	END IF;
+
+	IF(v_Posted='Y')
+		THEN  RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted');
+	END IF;
+    END IF;
+    IF UPDATING THEN
+	IF :OLD.C_INVOICE_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM C_INVOICE
+		WHERE C_INVOICE_ID = :OLD.C_INVOICE_ID;
+	END IF;
+
+	IF :OLD.FIN_PAYMENT_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM FIN_PAYMENT
+		WHERE FIN_PAYMENT_ID = :OLD.FIN_PAYMENT_ID;
+	END IF;
+
+	IF :OLD.aprm_finacc_transaction_v_id IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM aprm_finacc_transaction_v
+		WHERE aprm_finacc_transaction_v_id = :OLD.aprm_finacc_transaction_v_id;
+	END IF;
+	IF(v_Posted='Y')
+		THEN  RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted');
+	END IF;
+    END IF;
+    IF DELETING THEN
+	IF :OLD.C_INVOICE_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM C_INVOICE
+		WHERE C_INVOICE_ID = :OLD.C_INVOICE_ID;
+
+		-- Looking if the invoice has reversal invoices
+		SELECT 'Y' as hasreversal
+		INTO v_HasReversal
+		FROM DUAL 
+		WHERE EXISTS (SELECT 1 FROM C_INVOICE_REVERSE WHERE C_INVOICE_ID = :OLD.C_INVOICE_ID);
+	END IF;
+
+	IF :OLD.FIN_PAYMENT_ID IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM FIN_PAYMENT
+		WHERE FIN_PAYMENT_ID = :OLD.FIN_PAYMENT_ID;
+	END IF;
+
+	IF :OLD.aprm_finacc_transaction_v_id IS NOT NULL THEN
+		SELECT POSTED INTO v_Posted 
+		FROM aprm_finacc_transaction_v
+		WHERE aprm_finacc_transaction_v_id = :OLD.aprm_finacc_transaction_v_id;
+	END IF;
+
+	IF(v_Posted='Y')
+		THEN  RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted');
+	END IF;
+	IF (v_HasReversal='Y') THEN
+		  RAISE_APPLICATION_ERROR(-20000, '@InvoiceHasReversal@');
+	END IF;
+
+	
+	
+    END IF;
+    
+    
+END C_CONVERSION_RATE_DOCUMENT_TRG
+]]></body>

details:   https://code.openbravo.com/erp/devel/pi/rev/1dca0763b990
changeset: 13322:1dca0763b990
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Thu Jul 28 13:55:10 2011 +0200
summary:   [imageBLOB] added proper 'Image Not Available' image

diffstat:

 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js                                                             |  186 +++++----
 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png |    0 
 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css                |   13 -
 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js                 |   14 +-
 4 files changed, 110 insertions(+), 103 deletions(-)

diffs (290 lines):

diff -r 8ca5a1c79fda -r 1dca0763b990 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Thu Jul 28 12:48:25 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Thu Jul 28 13:55:10 2011 +0200
@@ -22,7 +22,7 @@
 isc.ClassFactory.defineClass('OBImageItemSmallImage', isc.Img);
 
 isc.OBImageItemSmallImage.addProperties({
-  imageType: "stretch"
+  showDisabled: false
 });
 
 //== OBImageItemSmallImageContainer ==
@@ -77,6 +77,13 @@
 //This class is used for the big image shown within the popup
 isc.ClassFactory.defineClass('OBImageItemBigImage', isc.Img);
 
+isc.OBImageItemBigImage.addProperties({
+  initWidget: function() {
+    this.setCursor('url("' + this.zoomOutCursorSrc + '"), pointer');
+    return this.Super('initWidget', arguments);
+  }
+});
+
 //== OBImageItemButton ==
 //This class is used for the buttons shown in the OBImageItem
 isc.ClassFactory.defineClass('OBImageItemButton', isc.ImgButton);
@@ -94,93 +101,98 @@
 isc.ClassFactory.defineClass('OBImageCanvas', isc.HLayout);
 
 OBImageCanvas.addProperties({
-    height: '0px',
-    initWidget: function(){
-      var imageLayout = isc.OBImageItemSmallImageContainer.create({
-        imageItem: this.creator
-      });
-      if (this.creator.required) {
-        imageLayout.setStyleName(imageLayout.styleName + 'Required');
-      } else {
-        imageLayout.setStyleName(imageLayout.styleName);
+  height: '0px',
+  initWidget: function(){
+    this.imageLayout = isc.OBImageItemSmallImageContainer.create({
+      imageItem: this.creator
+    });
+    if (this.creator.required) {
+      this.imageLayout.setStyleName(this.imageLayout.styleName + 'Required');
+    } else {
+      this.imageLayout.setStyleName(this.imageLayout.styleName);
+    }
+    this.addMember(this.imageLayout);
+    this.image=isc.OBImageItemSmallImage.create({
+      width: '100%'
+    });
+    this.imageLayout.addMember(this.image);
+    this.image.setSrc('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
+    var buttonLayout = isc.VLayout.create({
+      width: '1%'
+    });
+    var selectorButton = isc.OBImageItemButton.create({
+        buttonType: 'upload',
+        imageItem: this.creator,
+        action: function(){
+          var selector = isc.OBImageSelector.create({
+            columnName: this.imageItem.columnName,
+            form: this.imageItem.form,
+            imageItem: this.imageItem
+          });
+          selector.show();
+        }
+    });
+    var deleteButton = isc.OBImageItemButton.create({
+      buttonType: 'erase',
+      imageItem: this.creator,
+      deleteFunction: function(){
+        var imageId = this.imageItem.getValue();
+        var view = this.imageItem.form.view;
+        var d = {
+                inpimageId: this.imageItem.getValue(),
+                inpTabId: this.imageItem.form.view.tabId,
+                inpColumnName: this.imageItem.columnName,
+                parentObjectId: this.imageItem.form.values.id,
+                command: 'DELETE'
+        };
+        var imageItem = this.imageItem;
+        isc.confirm(OB.I18N.getLabel('OBUIAPP_ConfirmDeleteImage'), function(clickedOK){
+          if(clickedOK){
+            OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function(response, data, request){
+               imageItem.refreshImage();
+            });
+          }
+        });
+      },
+      click: function(form, item){
+        //On click, we autosave before showing the selector,
+        //because after delete we will reload the form
+        if (!this.imageItem.form.validateForm()) {
+          return;
+        }
+        var actionObject = {
+          target: this,
+          method: this.deleteFunction,
+          parameters: []
+        };
+        this.imageItem.form.view.standardWindow.doActionAfterAutoSave(actionObject, true, true);
+      },
+      updateState: function(value){
+        if(value){
+          this.setDisabled(false);
+        }else{
+          this.setDisabled(true);
+        }
       }
-      this.addMember(imageLayout);
-      this.image=isc.OBImageItemSmallImage.create({
-        width: '100%'
-      });
-      imageLayout.addMember(this.image);
-      this.image.setSrc('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
-      var buttonLayout = isc.VLayout.create({
-          width: '1%'
-      });
-      var selectorButton = isc.OBImageItemButton.create({
-          buttonType: 'upload',
-          imageItem: this.creator,
-          action: function(){
-            var selector = isc.OBImageSelector.create({
-              columnName: this.imageItem.columnName,
-              form: this.imageItem.form,
-              imageItem: this.imageItem
-            });
-            selector.show();
-          }
-      });
-      var deleteButton = isc.OBImageItemButton.create({
-        buttonType: 'erase',
-        imageItem: this.creator,
-        deleteFunction: function(){
-          var imageId = this.imageItem.getValue();
-          var view = this.imageItem.form.view;
-          var d = {
-                  inpimageId: this.imageItem.getValue(),
-                  inpTabId: this.imageItem.form.view.tabId,
-                  inpColumnName: this.imageItem.columnName,
-                  parentObjectId: this.imageItem.form.values.id,
-                  command: 'DELETE'
-          };
-          var imageItem = this.imageItem;
-          isc.confirm(OB.I18N.getLabel('OBUIAPP_ConfirmDeleteImage'), function(clickedOK){
-            if(clickedOK){
-              OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function(response, data, request){
-                 imageItem.refreshImage();
-              });
-            }
-          });
-        },
-        click: function(form, item){
-          //On click, we autosave before showing the selector,
-          //because after delete we will reload the form
-          if (!this.imageItem.form.validateForm()) {
-            return;
-          }
-          var actionObject = {
-            target: this,
-            method: this.deleteFunction,
-            parameters: []
-          };
-          this.imageItem.form.view.standardWindow.doActionAfterAutoSave(actionObject, true, true);
-        },
-        updateState: function(value){
-          if(value){
-            this.setDisabled(false);
-          }else{
-            this.setDisabled(true);
-          }
-        }
-      });
-      this.deleteButton = deleteButton;
-      buttonLayout.addMember(selectorButton);
-      buttonLayout.addMember(deleteButton);
-      this.addMember(buttonLayout);
-    },
-    setImage: function(url){
+    });
+    this.deleteButton = deleteButton;
+    buttonLayout.addMember(selectorButton);
+    buttonLayout.addMember(deleteButton);
+    this.addMember(buttonLayout);
+  },
+  setImage: function(url){
+    if (!url) {
+      this.image.setSrc(this.imageNotAvailableSrc);
+      this.image.setHeight(this.imageNotAvailableHeight);
+      this.image.setWidth(this.imageNotAvailableWidth);
+      this.image.setCursor('default');
+      this.imageLayout.setCursor('default');
+    } else {
       this.image.setSrc(url);
-      if(url.contains('ShowImage')){
-        this.image.setImageType('stretch');
-      }else{
-        this.image.setImageType('normal');
-      }
+      this.image.setCursor('url("' + this.zoomInCursorSrc + '"), pointer');
+      this.imageLayout.setCursor('url("' + this.zoomInCursorSrc + '"), pointer');
     }
+  }
 });
 
 // == OBImageItem ==
@@ -192,7 +204,7 @@
   canvasConstructor: 'OBImageCanvas',
   setValue: function(newValue){
     if(!newValue || newValue === '') {
-      this.canvas.setImage('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
+      this.canvas.setImage('');
     } else {
       this.canvas.setImage("../utility/ShowImage?id="+newValue+'&nocache='+Math.random());
       var d = {
@@ -200,7 +212,7 @@
         command: 'GETSIZE'
       };
       var image = this.canvas.image;
-      var imageLayout = this.canvas.getMember(0);
+      var imageLayout = this.canvas.imageLayout;
       OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler', {}, d, function(response, data, request){
         var maxHeight = imageLayout.getHeight() - 12;
         var maxWidth = imageLayout.getWidth() - 12;
diff -r 8ca5a1c79fda -r 1dca0763b990 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png
Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png has changed
diff -r 8ca5a1c79fda -r 1dca0763b990 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Jul 28 12:48:25 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css	Thu Jul 28 13:55:10 2011 +0200
@@ -734,19 +734,6 @@
  * Image Item
 =======================================================================*/
 
-.OBFormFieldImageInput,
-.OBFormFieldImageInputRequired {
-  cursor: url("images/system/zoomIn.cur"), pointer;
-}
-
-.OBImageItemSmallImage img {
-  cursor: url("images/system/zoomIn.cur"), pointer;
-}
-
-.OBImageItemBigImage img {
-  cursor: url("images/system/zoomOut.cur"), pointer;
-}
-
 /*=======================================================================
  * LinkButton Item
 =======================================================================*/
diff -r 8ca5a1c79fda -r 1dca0763b990 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Jul 28 12:48:25 2011 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Jul 28 13:55:10 2011 +0200
@@ -403,23 +403,31 @@
   titleStyle: 'OBFormFieldLabel'
 });
 
+isc.OBImageCanvas.addProperties({
+  zoomInCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomIn.cur',
+  zoomOutCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomOut.cur',
+  imageNotAvailableSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/imageNotAvailable.png',
+  imageNotAvailableHeight: 49,
+  imageNotAvailableWidth: 57
+});
+
 isc.OBImageItemSmallImageContainer.addProperties({
   styleName: 'OBFormFieldImageInput',
   height: 66,
   width:'100%',
-  cursor: '', //To allow set the cursor from the CSS
   align: 'center',
   defaultLayoutAlign: 'center'
 });
 
 isc.OBImageItemSmallImage.addProperties({
   styleName: 'OBImageItemSmallImage',
-  cursor: '' //To allow set the cursor from the CSS
+  imageType: 'stretch'
 });
 
 isc.OBImageItemBigImage.addProperties({
   styleName: 'OBImageItemBigImage',
-  cursor: '', //To allow set the cursor from the CSS
+  zoomInCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomIn.cur',
+  zoomOutCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomOut.cur',
   align: 'center'
 });

details:   https://code.openbravo.com/erp/devel/pi/rev/8ca5a1c79fda
changeset: 13321:8ca5a1c79fda
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Thu Jul 28 12:48:25 2011 +0200
summary:   Fixes issue 18015: Avoid network roundtrip in the test
- Use only Window.create, pure client side performace
- Remove the call to the server on each open tab

diffstat:

 modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/benchmark/index.html |  50 +++------
 1 files changed, 19 insertions(+), 31 deletions(-)

diffs (65 lines):

diff -r 021aea273863 -r 8ca5a1c79fda modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/benchmark/index.html
--- a/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/benchmark/index.html	Thu Jul 28 12:36:33 2011 +0200
+++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/benchmark/index.html	Thu Jul 28 12:48:25 2011 +0200
@@ -32,36 +32,24 @@
 var isomorphicDir='../../org.openbravo.userinterface.smartclient/isomorphic/';
 
 function OBStartApplication() {
-  var s = document.getElementById('summary');
-
-  if(OB.User.roleName.indexOf('System Administrator') == -1) {
-    s.innerHTML = 'Test must be executed with System Administrator role';
-    return;
-  }
-  OB.Layout.initialize();
-  // _101 = Reference view definition
-  $LAB.script('../../../org.openbravo.client.kernel/OBUIAPP_MainLayout/View?viewId=_101')
-      .wait(function() {
-
-        var viewName = OB.Layout.ViewManager.loadedWindowClassName,
-            suite = new Benchmark.Suite, summary = '', a = [], i = 0;
-
-        s.innerHTML = 'Executing...';
-
-        suite.add('ViewManager.openView', function() {
-          OB.ViewManager.openView(viewName, {});
-        })
-        .on('cycle', function(bench) {
-          summary += String(bench) + '<br />';
-          summary += 'Elapsed time: ' + bench.times.elapsed + '<br />';
-        })
-        .on('complete', function() {
-          summary += 'Client platform: ' + String(Benchmark.platform) + '<br />';
-          summary += 'Total tabs created: ' + OB.MainView.TabSet.tabs.length;
-          s.innerHTML = summary;
-        })
-        .run(true);
-      });
+  var s = document.getElementById('summary'),
+      suite = new Benchmark.Suite,
+      summary = '';
+  
+  s.innerHTML = 'Executing...';
+  
+  suite.add('Window.create', function() {
+    isc.Window.create({title: 'Test Window'});
+  })
+  .on('cycle', function(bench) {
+    summary += String(bench) + '<br />';
+    summary += 'Elapsed time: ' + bench.times.elapsed + '<br />';
+  })
+  .on('complete', function() {    
+    summary += 'Client platform: ' + String(Benchmark.platform) + '<br />';
+    s.innerHTML = summary;
+  })
+  .run(true);
 }
 </script>
 </head>
@@ -73,4 +61,4 @@
 <iframe name="background_target" id="background_target" height="0" width="0" style="display:none;"></iframe>
 <form name="OBGlobalHiddenForm" method="post" action="blank.html" target="background_target"></form>
 </body>
-</html>
+</html>
\ No newline at end of file

details:   https://code.openbravo.com/erp/stable/2.50/rev/6a214598625f
changeset: 9592:6a214598625f
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Tue Jul 19 17:53:25 2011 +0200
summary:   Fixes bug 0018031: Wrong accounting for write off amounts

details:   https://code.openbravo.com/erp/stable/2.50/rev/c74104cc32d9
changeset: 9593:c74104cc32d9
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Jul 21 18:05:01 2011 +0200
summary:   Fixes bug 0017551: the accouting of transaction of a payment is wrong with multicurrency

details:   https://code.openbravo.com/erp/stable/2.50/rev/acc438f3d59a
changeset: 9594:acc438f3d59a
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Thu Jul 28 12:39:21 2011 +0200
summary:   Fixes bug 17552: the accouting of reconciliate of a payment is wrong with multicurrency

diffstat:

 src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml                  |    7 +
 src-db/database/model/tables/C_BP_GROUP_ACCT.xml                       |    7 +
 src-db/database/sourcedata/AD_COLUMN.xml                               |  156 +++-
 src-db/database/sourcedata/AD_ELEMENT.xml                              |   13 +
 src-db/database/sourcedata/AD_FIELD.xml                                |   47 +
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                   |   42 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql              |   18 +
 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java      |  222 +++++-
 src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java                |    8 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java         |  311 +++++++--
 src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java |   10 +
 src/org/openbravo/erpCommon/ad_forms/DocPayment.java                   |   25 +-
 src/org/openbravo/erpCommon/ad_forms/Fact.java                         |   18 +-
 src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java   |    4 +
 14 files changed, 672 insertions(+), 216 deletions(-)

diffs (truncated from 1795 to 300 lines):

diff -r 086ee81793cf -r acc438f3d59a src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml
--- a/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml	Wed Jul 27 13:58:06 2011 +0200
+++ b/src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml	Thu Jul 28 12:39:21 2011 +0200
@@ -109,6 +109,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="WRITEOFF_REV_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="PAYDISCOUNT_REV_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -285,6 +289,9 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCHEMA_DEF_WRITEOFF_REV">
+        <reference local="WRITEOFF_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_ACCTSCHEMA_DEFAULT_A_ACCUMDE">
         <reference local="A_ACCUMDEPRECIATION_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
diff -r 086ee81793cf -r acc438f3d59a src-db/database/model/tables/C_BP_GROUP_ACCT.xml
--- a/src-db/database/model/tables/C_BP_GROUP_ACCT.xml	Wed Jul 27 13:58:06 2011 +0200
+++ b/src-db/database/model/tables/C_BP_GROUP_ACCT.xml	Thu Jul 28 12:39:21 2011 +0200
@@ -113,6 +113,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="WRITEOFF_REV_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_BP_GROUP_ACCT_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -173,6 +177,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_BP_GROUP_ACCT_WRITEOFF_ACCT">
         <reference local="WRITEOFF_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="C_BP_GROUP_ACCT_WRITEOFF_REV">
+        <reference local="WRITEOFF_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check name="C_BP_GROUP_ACCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
diff -r 086ee81793cf -r acc438f3d59a src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jul 27 13:58:06 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jul 28 12:39:21 2011 +0200
@@ -55869,7 +55869,7 @@
 <!--3449-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3449-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--3449-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3449-->  <POSITION><![CDATA[35]]></POSITION>
+<!--3449-->  <POSITION><![CDATA[36]]></POSITION>
 <!--3449-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3449-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3449-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -55902,7 +55902,7 @@
 <!--3450-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3450-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--3450-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3450-->  <POSITION><![CDATA[34]]></POSITION>
+<!--3450-->  <POSITION><![CDATA[35]]></POSITION>
 <!--3450-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3450-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3450-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -56100,7 +56100,7 @@
 <!--3456-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3456-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--3456-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3456-->  <POSITION><![CDATA[36]]></POSITION>
+<!--3456-->  <POSITION><![CDATA[37]]></POSITION>
 <!--3456-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3456-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3456-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79444,7 +79444,7 @@
 <!--4840-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4840-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4840-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4840-->  <POSITION><![CDATA[59]]></POSITION>
+<!--4840-->  <POSITION><![CDATA[60]]></POSITION>
 <!--4840-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4840-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4840-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79477,7 +79477,7 @@
 <!--4841-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4841-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4841-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4841-->  <POSITION><![CDATA[60]]></POSITION>
+<!--4841-->  <POSITION><![CDATA[61]]></POSITION>
 <!--4841-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4841-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4841-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79510,7 +79510,7 @@
 <!--4842-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4842-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4842-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4842-->  <POSITION><![CDATA[66]]></POSITION>
+<!--4842-->  <POSITION><![CDATA[67]]></POSITION>
 <!--4842-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4842-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4842-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79675,7 +79675,7 @@
 <!--4848-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4848-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4848-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4848-->  <POSITION><![CDATA[28]]></POSITION>
+<!--4848-->  <POSITION><![CDATA[29]]></POSITION>
 <!--4848-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4848-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4848-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79708,7 +79708,7 @@
 <!--4849-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4849-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4849-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4849-->  <POSITION><![CDATA[29]]></POSITION>
+<!--4849-->  <POSITION><![CDATA[30]]></POSITION>
 <!--4849-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4849-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4849-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79741,7 +79741,7 @@
 <!--4850-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4850-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4850-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4850-->  <POSITION><![CDATA[30]]></POSITION>
+<!--4850-->  <POSITION><![CDATA[31]]></POSITION>
 <!--4850-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4850-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4850-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79774,7 +79774,7 @@
 <!--4851-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4851-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4851-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4851-->  <POSITION><![CDATA[31]]></POSITION>
+<!--4851-->  <POSITION><![CDATA[32]]></POSITION>
 <!--4851-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4851-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4851-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79807,7 +79807,7 @@
 <!--4852-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4852-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4852-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4852-->  <POSITION><![CDATA[32]]></POSITION>
+<!--4852-->  <POSITION><![CDATA[33]]></POSITION>
 <!--4852-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4852-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4852-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79840,7 +79840,7 @@
 <!--4853-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4853-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4853-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4853-->  <POSITION><![CDATA[33]]></POSITION>
+<!--4853-->  <POSITION><![CDATA[34]]></POSITION>
 <!--4853-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4853-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4853-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79873,7 +79873,7 @@
 <!--4854-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4854-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4854-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4854-->  <POSITION><![CDATA[37]]></POSITION>
+<!--4854-->  <POSITION><![CDATA[38]]></POSITION>
 <!--4854-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4854-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4854-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79906,7 +79906,7 @@
 <!--4855-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4855-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4855-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4855-->  <POSITION><![CDATA[38]]></POSITION>
+<!--4855-->  <POSITION><![CDATA[39]]></POSITION>
 <!--4855-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4855-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4855-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79939,7 +79939,7 @@
 <!--4856-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4856-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4856-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4856-->  <POSITION><![CDATA[39]]></POSITION>
+<!--4856-->  <POSITION><![CDATA[40]]></POSITION>
 <!--4856-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4856-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4856-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -79972,7 +79972,7 @@
 <!--4857-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4857-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4857-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4857-->  <POSITION><![CDATA[40]]></POSITION>
+<!--4857-->  <POSITION><![CDATA[41]]></POSITION>
 <!--4857-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4857-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4857-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80005,7 +80005,7 @@
 <!--4858-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4858-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4858-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4858-->  <POSITION><![CDATA[41]]></POSITION>
+<!--4858-->  <POSITION><![CDATA[42]]></POSITION>
 <!--4858-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4858-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4858-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80038,7 +80038,7 @@
 <!--4859-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4859-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4859-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4859-->  <POSITION><![CDATA[42]]></POSITION>
+<!--4859-->  <POSITION><![CDATA[43]]></POSITION>
 <!--4859-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4859-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4859-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80071,7 +80071,7 @@
 <!--4860-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4860-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4860-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4860-->  <POSITION><![CDATA[43]]></POSITION>
+<!--4860-->  <POSITION><![CDATA[44]]></POSITION>
 <!--4860-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4860-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4860-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80104,7 +80104,7 @@
 <!--4861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4861-->  <POSITION><![CDATA[44]]></POSITION>
+<!--4861-->  <POSITION><![CDATA[45]]></POSITION>
 <!--4861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80137,7 +80137,7 @@
 <!--4862-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4862-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4862-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4862-->  <POSITION><![CDATA[45]]></POSITION>
+<!--4862-->  <POSITION><![CDATA[46]]></POSITION>
 <!--4862-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4862-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4862-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80170,7 +80170,7 @@
 <!--4863-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4863-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4863-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4863-->  <POSITION><![CDATA[46]]></POSITION>
+<!--4863-->  <POSITION><![CDATA[47]]></POSITION>
 <!--4863-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4863-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4863-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80203,7 +80203,7 @@
 <!--4864-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4864-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4864-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4864-->  <POSITION><![CDATA[47]]></POSITION>
+<!--4864-->  <POSITION><![CDATA[48]]></POSITION>
 <!--4864-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4864-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4864-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80236,7 +80236,7 @@
 <!--4865-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4865-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4865-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4865-->  <POSITION><![CDATA[48]]></POSITION>
+<!--4865-->  <POSITION><![CDATA[49]]></POSITION>
 <!--4865-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4865-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4865-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80269,7 +80269,7 @@
 <!--4866-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4866-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4866-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4866-->  <POSITION><![CDATA[51]]></POSITION>
+<!--4866-->  <POSITION><![CDATA[52]]></POSITION>
 <!--4866-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4866-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4866-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80302,7 +80302,7 @@
 <!--4867-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4867-->  <DEVELOPMENTSTATUS><![CDATA[NI]]></DEVELOPMENTSTATUS>
 <!--4867-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4867-->  <POSITION><![CDATA[52]]></POSITION>
+<!--4867-->  <POSITION><![CDATA[53]]></POSITION>
 <!--4867-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4867-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4867-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80335,7 +80335,7 @@
 <!--4868-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4868-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4868-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4868-->  <POSITION><![CDATA[53]]></POSITION>
+<!--4868-->  <POSITION><![CDATA[54]]></POSITION>
 <!--4868-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--4868-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--4868-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -80368,7 +80368,7 @@
 <!--4869-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--4869-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--4869-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4869-->  <POSITION><![CDATA[54]]></POSITION>
+<!--4869-->  <POSITION><![CDATA[55]]></POSITION>

details:   https://code.openbravo.com/erp/devel/pi/rev/021aea273863
changeset: 13320:021aea273863
user:      Mikel Irurita <mikel.irurita <at> openbravo.com>
date:      Thu Jul 28 12:36:33 2011 +0200
summary:   Related to issue 18065: update year in the license text

diffstat:

 src-db/database/model/functions/MA_PC_CASE_CREATE.xml |  2 +-
 src-db/database/model/triggers/MA_PC_CASE_TRG.xml     |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 178a991820b0 -r 021aea273863 src-db/database/model/functions/MA_PC_CASE_CREATE.xml
--- a/src-db/database/model/functions/MA_PC_CASE_CREATE.xml	Thu Jul 28 09:53:03 2011 +0200
+++ b/src-db/database/model/functions/MA_PC_CASE_CREATE.xml	Thu Jul 28 12:36:33 2011 +0200
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2011 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
diff -r 178a991820b0 -r 021aea273863 src-db/database/model/triggers/MA_PC_CASE_TRG.xml
--- a/src-db/database/model/triggers/MA_PC_CASE_TRG.xml	Thu Jul 28 09:53:03 2011 +0200
+++ b/src-db/database/model/triggers/MA_PC_CASE_TRG.xml	Thu Jul 28 12:36:33 2011 +0200
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2011 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/