Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 05 Dec 2014 08:04:23 +0100
changeset 25550 f5b046cebc71
parent 25549 5bb50e44ea69 (current diff)
parent 25125 547ca19bda33 (diff)
child 25551 8c12e7511fd5
Merge back from main
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java
src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java
--- a/.hgsigs	Mon Dec 01 16:55:05 2014 +0100
+++ b/.hgsigs	Fri Dec 05 08:04:23 2014 +0100
@@ -158,3 +158,4 @@
 c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
 d8e24b51ba03c98d057048de5e86c1c8c977276f 0 iEYEABECAAYFAlRJO3UACgkQCX/oGf+2qkMMFQCeObdVCTDlec79H4alHs8t8SDMQ9YAoO4HfqRXTDGnDg5+LnLtuBxPsQDD
 924afa1490b09bc691895099f12204b2282b0ee9 0 iEYEABECAAYFAlRhoL8ACgkQCX/oGf+2qkNHkwCfeuBMGLqmtcdy8LxqPtcu8mRAlQIAnAjqdHUhM+pTFL5tdsaY1V9buvP9
+340ffd8d7a9d5f42c216d59bacb99a27253825b0 0 iEYEABECAAYFAlSAMJIACgkQCX/oGf+2qkPCvgCfUWYHrJ/CJAkuUbalTNWcKPdmipEAn0r9uP5bQjzfZG1qg1CqQPqyFeOk
--- a/.hgtags	Mon Dec 01 16:55:05 2014 +0100
+++ b/.hgtags	Fri Dec 05 08:04:23 2014 +0100
@@ -169,3 +169,4 @@
 a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1
 6af26661c789c5daa23e36e7367a05dfe291242e 3.0PR14Q3.2
 4ccbe7a7da1d0eed0677d7d0baf545607a192c87 3.0PR14Q3.3
+fc76bf00588598f913bd9a5bb1d45fdd692548fd 3.0PR14Q3.4