Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 11 Aug 2016 07:58:39 +0200
changeset 29853 541e897fe626
parent 29852 88ea14de1a84 (current diff)
parent 29747 b90d4366a598 (diff)
child 29854 ebdb891c7b5e
Merge back from main
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
modules/org.openbravo.utility.cleanup.log/referencedata/standard/Log_Clean_Up_Default_Configuration.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/costing/CostAdjustmentUtils.java
src/org/openbravo/costing/CostingUtils.java
src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java
src/org/openbravo/erpCommon/security/Login.html
src/org/openbravo/erpCommon/utility/CashVATUtil.java
src/org/openbravo/service/importprocess/ImportEntryManager.java
--- a/.hgsigs	Wed Aug 10 15:51:33 2016 +0200
+++ b/.hgsigs	Thu Aug 11 07:58:39 2016 +0200
@@ -196,3 +196,4 @@
 008d208ba1f60804fd852570f0cd7e985a4220da 0 iEYEABECAAYFAldQUXwACgkQCX/oGf+2qkOtLQCdEZMKf7VfsSt6iVUl59GzwNdr7C4AoK4B3pbbW23fqYd1qplclO3aGm1B
 91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd
 ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW
+159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82
--- a/.hgtags	Wed Aug 10 15:51:33 2016 +0200
+++ b/.hgtags	Thu Aug 11 07:58:39 2016 +0200
@@ -207,3 +207,4 @@
 208b773131650c3806cefa65b4d5df9bf1992821 3.0PR16Q1.3
 cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2
 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1
+ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3