You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2009/12/12 00:11:51 UTC

svn commit: r889851 [2/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/data/helpdata/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/fina...

Modified: ofbiz/branches/addbirt/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/LICENSE?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/LICENSE (original)
+++ ofbiz/branches/addbirt/LICENSE Fri Dec 11 23:11:39 2009
@@ -8,7 +8,7 @@
 OFBiz and the full text of the license used for each.
 
 For additional details, see the NOTICE file and:
-http://docs.ofbiz.org/display/OFBADMIN/Libraries+Included+in+OFBiz
+http://cwiki.apache.org/confluence/display/OFBADMIN/Libraries+Included+in+OFBiz
 ==========================================================================
 The following libraries are licensed under the Apache License Version 2.0:
 ofbiz/trunk/framework/base/lib/ant-launcher-1.7.0.jar
@@ -59,7 +59,7 @@
 ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar
 ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
 ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
-ofbiz/trunk/framework/base/lib/scripting/groovy-1.6.0.jar
+ofbiz/trunk/framework/base/lib/scripting/groovy-1.7-rc-2.jar
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar
 ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar
@@ -98,28 +98,45 @@
 ofbiz/trunk/framework/webapp/lib/ws-commons-util-1.0.1.jar
 ofbiz/trunk/framework/geronimo/lib/geronimo-connector-2.1.1.jar
 ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-2.1.1.jar
-ofbiz/trunk/framework/base/lib/webslinger-base-invoker-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-cache-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-arrays-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-concurrent-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-junit-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-lang-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-logging-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-base-resolver-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-embryo-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-bsf-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-code-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-groovy-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-image-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-janino-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-servlet-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-template-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-velocity-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-extension-wiki-20090630-3606-466aec2fb8ad.jar
-ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20090630-3606-466aec2fb8ad.jar
+ofbiz/trunk/framework/base/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-cache-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-collections-arrays-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-concurrent-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-html-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-invoker-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-io-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-javacc-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-junit-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-lang-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-logging-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-resolver-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-util-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-base-xml-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-catalina-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-cgi-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-embryo-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-beanshell-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-bsf-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-code-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-commonsvfs-object-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-directory-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-freemarker-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-groovy-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-image-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-janino-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-jruby-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-jython-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-nutch-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-plan9-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-quercus-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-rhino-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-servlet-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-template-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-velocity-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-extension-wiki-20091211-3897-7ab22baea4b6.jar
+ofbiz/trunk/framework/webslinger/lib/webslinger-launcher-20091211-3897-7ab22baea4b6.jar
 ofbiz/trunk/applications/content/lib/lucene-core-2.4.1.jar
 ofbiz/trunk/applications/content/lib/poi-3.2-FINAL-20081019.jar
 ofbiz/trunk/specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar
@@ -456,10 +473,10 @@
 ofbiz/trunk/framework/base/lib/junitperf.jar
 ofbiz/trunk/framework/base/lib/owasp-esapi-full-java-1.4.jar
 ofbiz/trunk/framework/base/lib/scripting/antlr-2.7.6.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-2.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-analysis-2.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-tree-2.2.jar
-ofbiz/trunk/framework/base/lib/scripting/asm-util-2.2.jar
+ofbiz/trunk/framework/base/lib/scripting/asm-3.2.jar
+ofbiz/trunk/framework/base/lib/scripting/asm-analysis-3.2.jar
+ofbiz/trunk/framework/base/lib/scripting/asm-tree-3.2.jar
+ofbiz/trunk/framework/base/lib/scripting/asm-util-3.2.jar
 ofbiz/trunk/framework/base/lib/scripting/janino-2.5.15.jar
 ofbiz/trunk/framework/images/webapp/images/jsgantt.css
 ofbiz/trunk/framework/images/webapp/images/jsgantt.js
@@ -1227,7 +1244,7 @@
 ofbiz/trunk/framework/jetty/lib/slf4j-api-1.3.1.jar
 ofbiz/trunk/framework/jetty/lib/slf4j-log4j12-1.3.1.jar
 ofbiz/trunk/framework/images/webapp/images/htmledit/whizzywig_v55i.js
-ofbiz/trunk/framework/images/webapp/images/calendar_date_select.js
+ofbiz/trunk/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js
 =========================================================================
 The MIT License
 

Modified: ofbiz/branches/addbirt/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/README?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/README (original)
+++ ofbiz/branches/addbirt/README Fri Dec 11 23:11:39 2009
@@ -1,14 +1,16 @@
 
 Welcome to Apache OFBiz!
 
-If you have a release build all you need to run OFBiz is a 1.5 series
-JDK (not just the JRE, the full J2SDK).
+If you have a release build all you need to run OFBiz is a 
+1.6 (version 6) JDK (not just the JRE, the full JDK).
+http://java.sun.com/javase/downloads/index.jsp
 
 However if you have downloaded ofbiz from SVN then you should
 load the demo data (strongly advised) with the following command
-on the command line:
+on the command line: (being in the OFbiz directory)
 
-ant run-install
+linux: ./ant run-install
+windows: ant run-install 
 
 Once that is properly setup just run the executable jar file
 that comes with OFBiz, which is ofbiz.jar. To do this on the
@@ -16,14 +18,14 @@
 
 java -Xms128M -Xmx512M -jar ofbiz.jar
 
-There are also start scripts for Windows and Unix-based
+Even better use the startup scripts for Windows and Unix-based
 operating systems, namely startofbiz.bat and startofbiz.sh.
 
 Once OFBiz starts, you can look at the demo storefront at:
-http://localhost:8080/ecommerce/
+http://localhost:8080/ecommerce
 
 and the administration interface at:
-http://localhost:8080/webtools/
+https://localhost:8443/webtools
 
 You can log in with the user "admin" and password "ofbiz".
 
@@ -31,7 +33,7 @@
 getting, building, and running the source please see the
 Apache OFBiz Setup Guide:
 
-http://docs.ofbiz.org/x/rwM
+http://cwiki.apache.org/confluence/display/OFBADMIN/Demo+and+Test+Setup+Guide
 
 Note that running with the default configuration uses an
 embedded Java database (Apache Derby), and embedded application
@@ -40,7 +42,7 @@
 To prepare OFBiz for production use the Basic Production Setup Guide
 is a great place to start. It is available here:
 
-http://docs.ofbiz.org/x/j
+http://cwiki.apache.org/confluence/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide
 
 For additional resources please see the OFBiz web site.
 

Modified: ofbiz/branches/addbirt/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/config/AccountingEntityLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/config/AccountingEntityLabels.xml Fri Dec 11 23:11:39 2009
@@ -2859,7 +2859,7 @@
         <value xml:lang="fr">Carte de crédit</value>
         <value xml:lang="hi_IN">क्रेडिट कार्ड</value>
         <value xml:lang="it">Carta Credito</value>
-        <value xml:lang="nl">Credit Kaart</value>
+        <value xml:lang="nl">Creditcard</value>
         <value xml:lang="ro">Carte de Credit</value>
         <value xml:lang="ru">Кредитная карта</value>
         <value xml:lang="th">บัตรเครดิต</value>
@@ -2871,7 +2871,7 @@
         <value xml:lang="fr">Transfert de fonds électronique</value>
         <value xml:lang="hi_IN">इलेक्ट्रॉनिक निधि अंतरण(EFT)</value>
         <value xml:lang="it">Bonifico (EFT)</value>
-        <value xml:lang="nl">Bank transfer</value>
+        <value xml:lang="nl">Betaling per bank/giro</value>
         <value xml:lang="ro">Transfer Electronic de Fonduri(EFT)</value>
         <value xml:lang="ru">Банковский перевод</value>
         <value xml:lang="th">บัญชีธนาคาร</value>
@@ -2895,7 +2895,7 @@
         <value xml:lang="fr">Paiement à la livraison</value>
         <value xml:lang="hi_IN">सुपुर्दगी पर नकद</value>
         <value xml:lang="it">Contrassegno</value>
-        <value xml:lang="nl">Betaling bij aflevering</value>
+        <value xml:lang="nl">Rembours betaling</value>
         <value xml:lang="ro">Livrare Numerar</value>
         <value xml:lang="ru">Наличными при получении</value>
         <value xml:lang="th">เงินด่วน</value>
@@ -2906,6 +2906,7 @@
         <value xml:lang="en">eBay</value>
         <value xml:lang="fr">eBay</value>
         <value xml:lang="it">eBay</value>
+        <value xml:lang="nl">eBay</value>
         <value xml:lang="th">อีเบย์</value>
     </property>
     <property key="PaymentMethodType.description.EXT_OFFLINE">
@@ -2946,6 +2947,7 @@
         <value xml:lang="en">Financial Account</value>
         <value xml:lang="hi_IN">वित्तीय खाता</value>
         <value xml:lang="it">Conto finanziario</value>
+        <value xml:lang="nl">Financiële rekening</value>
         <value xml:lang="zh">金融账户</value>
     </property>
     <property key="PaymentMethodType.description.GIFT_CARD">
@@ -2966,7 +2968,7 @@
         <value xml:lang="fr">Bon d'achat</value>
         <value xml:lang="hi_IN">उपहार प्रमाण पत्र(GiftCertificate)</value>
         <value xml:lang="it">Certificato Omaggio</value>
-        <value xml:lang="nl">Geschenk certificaat</value>
+        <value xml:lang="nl">Cadeaubon</value>
         <value xml:lang="ro">Certificat Omagiu</value>
         <value xml:lang="ru">Подарочный сертификат</value>
         <value xml:lang="th">ใบรับรองของขวัญ</value>
@@ -2978,7 +2980,7 @@
         <value xml:lang="fr">Mandat</value>
         <value xml:lang="hi_IN">मनी ऑर्डर</value>
         <value xml:lang="it">Ordine Soldi</value>
-        <value xml:lang="nl">Betaal opdracht</value>
+        <value xml:lang="nl">Betaalopdracht</value>
         <value xml:lang="ro">Mandat postal</value>
         <value xml:lang="ru">Денежный перевод</value>
         <value xml:lang="th">รายการการเงิน</value>
@@ -2990,7 +2992,7 @@
         <value xml:lang="fr">Chèque</value>
         <value xml:lang="hi_IN">व्यक्तिगत चेक</value>
         <value xml:lang="it">Assegno Personale</value>
-        <value xml:lang="nl">Persoonlijke  Check</value>
+        <value xml:lang="nl">Persoonlijke  check</value>
         <value xml:lang="ro">Cec Personal</value>
         <value xml:lang="ru">Личный чек</value>
         <value xml:lang="th">เช็คส่วนบุคคล</value>
@@ -3002,6 +3004,7 @@
         <value xml:lang="fr">Paiement de commission</value>
         <value xml:lang="hi_IN">दलाली भुगतान</value>
         <value xml:lang="it">Pagamento Provvigioni</value>
+        <value xml:lang="nl">Commissie betaling</value>
         <value xml:lang="ru">Комиссионный платеж</value>
         <value xml:lang="th">การชำระเงินค่านายหน้า</value>
         <value xml:lang="zh">佣金付款</value>
@@ -3060,6 +3063,7 @@
         <value xml:lang="fr">Crédit de bons d'achat</value>
         <value xml:lang="hi_IN">उपहार प्रमाणपत्र(GiftCertificate) जमा</value>
         <value xml:lang="it">Deposito Certificato Omaggio</value>
+        <value xml:lang="nl">Tegoedbon</value>
         <value xml:lang="ro">Depozit Certificat Omagiu</value>
         <value xml:lang="ru">Депозит подарочного сертификата</value>
         <value xml:lang="th">เงินมัดจำใบรับรองของขวัญ</value>

Modified: ofbiz/branches/addbirt/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/config/AccountingUiLabels.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/config/AccountingUiLabels.xml Fri Dec 11 23:11:39 2009
@@ -1237,7 +1237,7 @@
         <value xml:lang="es">Hoja de Balance</value>
         <value xml:lang="fr">Bilan</value>
         <value xml:lang="hi_IN">पक्का-चिट्ठा/तुलन-पत्र</value>
-        <value xml:lang="it">Bilancio</value>
+        <value xml:lang="it">Stato Patrimoniale</value>
         <value xml:lang="nl">Balans</value>
         <value xml:lang="ru">Бухгалтерский баланс</value>
         <value xml:lang="th">งบดุล</value>
@@ -1811,6 +1811,14 @@
         <value xml:lang="th">ประเภทบัตร</value>
         <value xml:lang="zh">卡类型</value>
     </property>
+	<property key="AccountingCashBalance">
+        <value xml:lang="en">Cash Balance</value>
+        <value xml:lang="hi_IN">रोकड़ शेष</value>
+    </property>
+    <property key="AccountingCashFlowStatement">
+        <value xml:lang="en">Cash Flow Statement</value>
+        <value xml:lang="hi_IN">वक्तव्य नकद प्रवाह</value>
+    </property>
     <property key="AccountingChartOfAcctsFor">
         <value xml:lang="en">Chart of accounts for</value>
         <value xml:lang="hi_IN">लेखा-चित्र के लिए</value>
@@ -1843,6 +1851,10 @@
         <value xml:lang="th">ตรวจสอบจำนวน</value>
         <value xml:lang="zh">支票金额</value>
     </property>
+    <property key="AccountingCheckIsAlreadyIssued">
+        <value xml:lang="en">Check Is Already Issued</value>
+        <value xml:lang="hi_IN">जांच पहले से ही निर्गत किया जाता है</value>
+    </property>
     <property key="AccountingCheckNumber">
         <value xml:lang="en">Check Number</value>
         <value xml:lang="hi_IN">चेक/हुंडी नम्बर</value>
@@ -1888,6 +1900,10 @@
         <value xml:lang="th">ปิดช่วงเวลา</value>
         <value xml:lang="zh">已结束时段</value>
     </property>
+    <property key="AccountingClosingCashBalance">
+        <value xml:lang="en">Closing Cash Balance</value>
+        <value xml:lang="hi_IN">बंद नकदी शेष</value>
+    </property>
     <property key="AccountingComments">
         <value xml:lang="ar">تعاليق</value>
         <value xml:lang="de">Kommentare</value>
@@ -2029,7 +2045,7 @@
         <value xml:lang="en">Comparative Balance Sheet</value>
         <value xml:lang="fr">Bilan comparatif</value>
         <value xml:lang="hi_IN">तुलनात्मक तुलन-पत्र</value>
-        <value xml:lang="it">Bilancio Comparativo</value>
+        <value xml:lang="it">Stato Patrimoniale Comparativo</value>
         <value xml:lang="nl">Vergelijkingsbalans</value>
         <value xml:lang="th">เปรียบเทียบงบดุล</value>
         <value xml:lang="zh">比较资产负债表</value>
@@ -2037,6 +2053,7 @@
     <property key="AccountingComparativeIncomeStatement">
         <value xml:lang="de">Vergleichs-Ertragsrechnung</value>
         <value xml:lang="en">Comparative Income Statement</value>
+        <value xml:lang="it">Conto Economico Comparativo</value>
         <value xml:lang="hi_IN">तुलनात्मक आय विवरण</value>
     </property>
     <property key="AccountingCompleteAcctgTransFields">
@@ -2472,6 +2489,10 @@
         <value xml:lang="th">สกุลเงิน</value>
         <value xml:lang="zh">币种</value>
     </property>
+    <property key="AccountingCurrentAsset">
+        <value xml:lang="en">Currennt Asset</value>
+        <value xml:lang="hi_IN">चालू सम्पत्ति</value>
+    </property>
     <property key="AccountingCurrentBalance">
         <value xml:lang="de">Ihr aktueller Kontostand ist:</value>
         <value xml:lang="en">Your current balance is:</value>
@@ -2988,6 +3009,10 @@
         <value xml:lang="en">Ending Balance</value>
         <value xml:lang="hi_IN">अंतिम शेष</value>
     </property>
+    <property key="AccountingEndingCashBalance">
+        <value xml:lang="en">Ending Cash Balance</value>
+        <value xml:lang="hi_IN">अंतिम नकदी शेष</value>
+    </property>
     <property key="AccountingEnterGiftCardLink">
         <value xml:lang="de">Geben Sie Ihre Kartennummer (Physikalische und virtuelle) und den Pin-Code an um Sie mit Ihrem Konto zu verknüpfen</value>
         <value xml:lang="en">Enter your physical and virtual card and pin number to link your account</value>
@@ -3259,6 +3284,12 @@
         <value xml:lang="th">การอนุญาต</value>
         <value xml:lang="zh">授权</value>
     </property>
+    <property key="AccountingFinAccountInactiveStatusError">
+        <value xml:lang="en">FinAccount must be in active status</value>
+    </property>
+    <property key="AccountingFinAccountNotValidError">
+        <value xml:lang="en">FinAccount not in valid status</value>
+    </property>    
     <property key="AccountingFinAccountTransaction">
         <value xml:lang="en">Financial Account Transaction</value>
         <value xml:lang="hi_IN">वित्तीय खाता लेन-देन</value>
@@ -4507,7 +4538,7 @@
         <value xml:lang="fr">Configurations globales du GL</value>
         <value xml:lang="hi_IN">सार्विक जीएल(GL) सेटिंग्स</value>
         <value xml:lang="it">Configurazione Contabilità Generale</value>
-        <value xml:lang="nl">Algemene configuratie boekhouding</value>
+        <value xml:lang="nl">Algemene instellingen boekhouding</value>
         <value xml:lang="th">การกำหนดบัญชีแยกประเภททั่วไป</value>
         <value xml:lang="zh">全局总账设置</value>
     </property>
@@ -4582,7 +4613,7 @@
         <value xml:lang="es">Declaración de ingresos</value>
         <value xml:lang="fr">Déclaration de revenus</value>
         <value xml:lang="hi_IN">आय विवरण</value>
-        <value xml:lang="it">Estratto Conto in Entrata</value>
+        <value xml:lang="it">Conto Economico</value>
         <value xml:lang="nl">Inkomensoverzicht</value>
         <value xml:lang="ro">Extract Cont in Intrare</value>
         <value xml:lang="ru">Результативный счет</value>
@@ -6465,6 +6496,10 @@
         <value xml:lang="en">Opening Balance</value>
         <value xml:lang="hi_IN">प्रारंभिक शेष</value>
     </property>
+    <property key="AccountingOpeningCashBalance">
+        <value xml:lang="en">Opening Cash Balance</value>
+        <value xml:lang="hi_IN">प्रारंभिक नकदी शेष</value>
+    </property>
     <property key="AccountingOpenPayments">
         <value xml:lang="ar">مفتوح</value>
         <value xml:lang="de">Offen</value>
@@ -6489,6 +6524,10 @@
         <value xml:lang="th">เปิดช่วงเวลา</value>
         <value xml:lang="zh">打开时间段</value>
     </property>
+    <property key="AccountingOperationalCash">
+        <value xml:lang="en">Operational Cash</value>
+        <value xml:lang="hi_IN">क्रियाशील नकदी</value>
+    </property>
     <property key="AccountingOrderItemWithIdNotFound">
         <value xml:lang="de">Auftragsposition mit Nummer ${orderItemSeqId} nicht gefunden.</value>
         <value xml:lang="en">Order Item with id ${orderItemSeqId} not found.</value>
@@ -6555,6 +6594,7 @@
         <value xml:lang="de">Hauptbuch-Einstellungen des Unternehmens</value>
         <value xml:lang="en">Organization GL Settings</value>
         <value xml:lang="hi_IN">संगठन जीएल(Gl) सेटिंग्स</value>
+        <value xml:lang="nl">Organisatie grootboek instellingen</value>		
         <value xml:lang="zh">组织机构总账设置</value>
     </property>
     <property key="AccountingOrganizationPartyId">
@@ -7665,7 +7705,7 @@
     <property key="AccountingPaymentsReceived">
         <value xml:lang="ar">التسديدات المستلمة</value>
         <value xml:lang="de">Zahlungen erhalten</value>
-        <value xml:lang="en">Payments received</value>
+        <value xml:lang="en">Payments Received</value>
         <value xml:lang="es">Pagos recibidos</value>
         <value xml:lang="fr">Paiements reçus</value>
         <value xml:lang="hi_IN">भुगतान प्राप्त</value>
@@ -7786,6 +7826,10 @@
         <value xml:lang="en">Period2 Total Amount</value>
         <value xml:lang="hi_IN">अवधि 2 कुल राशि</value>
     </property>
+    <property key="AccountingPeriodCashBalance">
+        <value xml:lang="en">Period Cash Balance</value>
+        <value xml:lang="hi_IN">अवधि नकदी शेष</value>
+    </property>
     <property key="AccountingPeriodName">
         <value xml:lang="de">Name des Zeitraums</value>
         <value xml:lang="en">Period Name</value>
@@ -8764,6 +8808,18 @@
         <value xml:lang="en">Total amountPercentage is not equal 100.</value>
         <value xml:lang="hi_IN">कुल amountPercentage बराबर 100 नहीं है</value>
     </property>
+    <property key="AccountingTotalCashBalance">
+        <value xml:lang="en">Total Cash Balance</value>
+        <value xml:lang="hi_IN">कुल नकदी शेष</value>
+    </property>
+    <property key="AccountingTotalClosingCashBalance">
+        <value xml:lang="en">Total Closing Cash Balance</value>
+        <value xml:lang="hi_IN">कुल बंद नकदी शेष</value>
+    </property>
+    <property key="AccountingTotalPeriodCashBalance">
+        <value xml:lang="en">Total Period Cash Balance</value>
+        <value xml:lang="hi_IN">कुल अवधि नकदी शेष</value>
+    </property>
     <property key="AccountingTotalCostCenterAmount">
         <value xml:lang="en">Cost center amount percentage saved successfully</value>
     </property>
@@ -8771,6 +8827,22 @@
         <value xml:lang="en">Total Commission Amount</value>
         <value xml:lang="hi_IN">कुल दलाली राशी</value>
     </property>
+    <property key="AccountingTotalCredit_Disbursement">
+        <value xml:lang="en">Total Credit(Disbursement)</value>
+        <value xml:lang="hi_IN">कुल जमा</value>
+    </property>
+    <property key="AccountingTotalCurrentAssetBalance">
+        <value xml:lang="en">Total Current Asset Balance</value>
+        <value xml:lang="hi_IN">कुल चालू सम्पत्ति राशी</value>
+    </property>
+    <property key="AccountingTotalDebit_Receipts">
+        <value xml:lang="en">Total Debit(Receipts)</value>
+        <value xml:lang="hi_IN">कुल नामे</value>
+    </property>
+    <property key="AccountingTotalEndingCashBalance">
+        <value xml:lang="en">Total Ending Cash Balance</value>
+        <value xml:lang="hi_IN">कुल अंतिम नकदी शेष</value>
+    </property>
     <property key="AccountingTotalOfTheCurrentMonth">
         <value xml:lang="en">Total of the current month</value>
         <value xml:lang="hi_IN">चालू माह के कुल</value>
@@ -8779,6 +8851,14 @@
         <value xml:lang="en">Total of Year To Date</value>
         <value xml:lang="hi_IN">वर्ष से दिनांक का कुल</value>
     </property>
+    <property key="AccountingTotalOpeningCashBalance">
+        <value xml:lang="en">Total Opening Cash Balance</value>
+        <value xml:lang="hi_IN">कुल अथ नकदी शेष</value>
+    </property>
+    <property key="AccountingTotalOperationalCashBalance">
+        <value xml:lang="en">Total Operational Cash Balance</value>
+        <value xml:lang="hi_IN">कुल क्रियाशील नकदी</value>
+    </property>
     <property key="AccountingTextData">
         <value xml:lang="de">Textangaben</value>
         <value xml:lang="en">Text Data</value>
@@ -8895,6 +8975,10 @@
         <value xml:lang="en">Total Quantity On Hand</value>
         <value xml:lang="hi_IN">कुल मात्रा हाथ पर</value>
     </property>
+    <property key="AccountingTransactionIsAlreadyReconciled">
+        <value xml:lang="en">Transaction Is already Reconciled</value>
+        <value xml:lang="hi_IN">गतिविधि पहले से ही समझौता है</value>
+    </property>
     <property key="AccountingTransactionHasBeenAlreadyPosted">
         <value xml:lang="en">Transaction has been already posted</value>
         <value xml:lang="fr">Transaction déjà effectuée</value>

Modified: ofbiz/branches/addbirt/applications/accounting/data/AccountingHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/AccountingHelpData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/AccountingHelpData.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/AccountingHelpData.xml Fri Dec 11 23:11:39 2009
@@ -318,6 +318,11 @@
     <Content contentId="ACCOUNTING_ViewGlRec" contentTypeId="DOCUMENT" contentName="View GL Reconciliation." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ViewGlRec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
     <ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_ViewGlRec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ViewGlReconciliationWithTransaction"/>
 	
+    <DataResource dataResourceId="ACCOUNTING_FindFARec" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindFinAccountReconciliations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Financial Account Reconciliation Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_FindFARec" contentTypeId="DOCUMENT" contentName="Find Financial Account Reconciliations." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindFARec" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_FinAccoun" contentIdTo="ACCOUNTING_FindFARec" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindFinAccountReconciliations"/>
+ 
     <!-- Tax Authorities -->
 
     <DataResource dataResourceId="ACCOUNTING_TaxAuths" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
@@ -365,7 +370,103 @@
     <Content contentId="ACCOUNTING_EditTPInf" contentTypeId="DOCUMENT" contentName="Edit Tax Authority Party Information." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditTPInf" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
     <ContentAssoc contentId="ACCOUNTING_TaxAuths" contentIdTo="ACCOUNTING_EditTPInf" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditTaxAuthorityPartyInfo"/>
 
+ <!-- Agreements -->
 
+    <DataResource dataResourceId="ACCOUNTING_Agreement" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_agreements.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_Agreement" contentTypeId="DOCUMENT" contentName="Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_Agreement" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="HELP_ACCOUNTING" contentIdTo="ACCOUNTING_Agreement" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_Agreements"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_FindAgree" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_FindAgreement.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Find Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_FindAgree" contentTypeId="DOCUMENT" contentName="Find Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_FindAgree" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_FindAgree" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_FindAgreement"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgree" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreement.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreements Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgree" contentTypeId="DOCUMENT" contentName="Edit Agreements." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgree" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgree" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreement"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgTer" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementTerms.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Terms Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgTer" contentTypeId="DOCUMENT" contentName="Edit Agreement Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgTer" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgTer" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementTerms"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_ListAgItm" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItems.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Items Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgItm" contentTypeId="DOCUMENT" contentName="List Agreement Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_ListAgItm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItems"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgItm" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Items Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgItm" contentTypeId="DOCUMENT" contentName="Edit Agreement Items." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItm" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItm" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItem"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_ListAgPro" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementPromoAppls.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Agreement Promotions Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgPro" contentTypeId="DOCUMENT" contentName="List Agreement Promotions." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgPro" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgPro" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementPromoAppls"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_ListAgItT" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemTerms.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Item Terms Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgItT" contentTypeId="DOCUMENT" contentName="List Agreement Item Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgItT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemTerms"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_EditAgItT" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemTerm.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Item Terms Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgItT" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Terms." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemTerm"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_ListAgItP" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Item Products Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgItP" contentTypeId="DOCUMENT" contentName="List Agreement Item Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgItP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgItP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemProducts"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgItP" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Item Products Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgItP" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgItP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgItP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemProduct"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_ListAgSIP" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemSupplierProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Item Supplier Products Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgSIP" contentTypeId="DOCUMENT" contentName="List Agreement Item Supplier Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgSIP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgSIP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemSupplierProducts"/>
+ 
+   <DataResource dataResourceId="ACCOUNTING_EditAgSIP" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemSupplierProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Item Supplier Products Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgSIP" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Supplier Products." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgSIP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgSIP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemSupplierProduct"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_ListAgIPa" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementItemParties.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Item Parties Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgIPa" contentTypeId="DOCUMENT" contentName="List Agreement Item Parties." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgIPa" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgIPa" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementItemParties"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_EditAgIPa" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementItemParty.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Item Parties Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgIPa" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Parties." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgIPa" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgIPa" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementItemParty"/>
+  
+    <DataResource dataResourceId="ACCOUNTING_ListAgGeo" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_ListAgreementGeographicalApplic.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting List Agreement Item Geo Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_ListAgGeo" contentTypeId="DOCUMENT" contentName="List Agreement Item Geo." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_ListAgGeo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_ListAgGeo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_ListAgreementGeographicalApplic"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgGeo" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementGeographicalApplic.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Item Geo Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgGeo" contentTypeId="DOCUMENT" contentName="Edit Agreement Item Geo." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgGeo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_ListAgItm" contentIdTo="ACCOUNTING_EditAgGeo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementGeographicalApplic"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgrWE" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementWorkEffortApplics.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Workeffort Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgrWE" contentTypeId="DOCUMENT" contentName="Edit Agreement Workeffort." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgrWE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgrWE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementWorkEffortApplics"/>
+ 
+    <DataResource dataResourceId="ACCOUNTING_EditAgrRo" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
+        objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_EditAgreementRoles.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Edit Agreement Roles Help" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="ACCOUNTING_EditAgrRo" contentTypeId="DOCUMENT" contentName="Edit Agreement Roles." templateDataResourceId="HELP_TEMPL" dataResourceId="ACCOUNTING_EditAgrRo" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+    <ContentAssoc contentId="ACCOUNTING_Agreement" contentIdTo="ACCOUNTING_EditAgrRo" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="ACCOUNTING_EditAgreementRoles"/>
+ 
     <!--  features -->
     <DataResource dataResourceId="ACCOUNTING_Features" localeString="en" dataResourceTypeId="OFBIZ_FILE" 
         objectInfo="applications/accounting/data/helpdata/HELP_ACCOUNTING_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Accounting Features" mimeTypeId="text/xml" isPublic="Y" />

Modified: ofbiz/branches/addbirt/applications/accounting/data/AccountingPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/AccountingPortletData.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/AccountingPortletData.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/AccountingPortletData.xml Fri Dec 11 23:11:39 2009
@@ -68,4 +68,10 @@
 
     <PortalPagePortlet portalPageId="ApPortalPage" portalPortletId="ApPastDueInvoices" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/>
     <PortalPagePortlet portalPageId="ApPortalPage" portalPortletId="ApInvoicesDueSoon" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/>
+
+    <PortalPortlet portalPortletId="ListSupplierInvoices" portletName="List Supplier Invoices"
+        screenName="ListSupplierInvoices"
+        screenLocation="component://accounting/widget/InvoiceScreens.xml"
+        description="List Invoices for a certain supplier who is just logged in"/>
+    <PortletPortletCategory portalPortletId="ListSupplierInvoices" portletCategoryId="ACCOUNTING"/>
 </entity-engine-xml>

Modified: ofbiz/branches/addbirt/applications/accounting/data/DemoPaymentsInvoices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/DemoPaymentsInvoices.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/DemoPaymentsInvoices.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/DemoPaymentsInvoices.xml Fri Dec 11 23:11:39 2009
@@ -112,9 +112,10 @@
     <PaymentApplication paymentApplicationId="9002" paymentId="8002" invoiceId="8004" amountApplied="33.99"/>
 
     <PaymentGroup paymentGroupId="9000" paymentGroupTypeId="CHECK_RUN" paymentGroupName="Check Run for 2009-07-11 12:28:44.95"/>
-
     <PaymentGroupMember paymentGroupId="9000" paymentId="8001" fromDate="2009-07-11 12:28:45.315"/>
-    <PaymentGroupMember paymentGroupId="9000" paymentId="8002" fromDate="2009-07-11 12:28:45.315"/>
+
+    <PaymentGroup paymentGroupId="9001" paymentGroupTypeId="CHECK_RUN" paymentGroupName="Check run for 2009-08-11 12:28:45.315"/>
+    <PaymentGroupMember paymentGroupId="9001" paymentId="8002" fromDate="2009-08-11 12:28:45.315"/>
 
     <AcctgTrans acctgTransId="8000" acctgTransTypeId="PURCHASE_INVOICE" transactionDate="2009-07-06 16:50:43.806" isPosted="Y" postedDate="2009-07-06 16:50:44.219" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" invoiceId="8000"/>
     <AcctgTrans acctgTransId="8001" acctgTransTypeId="OUTGOING_PAYMENT" transactionDate="2009-07-06 16:53:49.259" isPosted="Y" postedDate="2009-07-06 16:53:49.741" glFiscalTypeId="ACTUAL" partyId="AcctBigSupplier" roleTypeId="BILL_FROM_VENDOR" paymentId="8000"/>
@@ -212,11 +213,14 @@
             partyId="Company" transactionDate="2009-04-01 00:00:01.000" entryDate="2009-04-01 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_APPROVED"/>
     <FinAccountTrans finAccountTransId="9101" finAccountTransTypeId="DEPOSIT" finAccountId="ABN_CHECKING" amount="75000.00" 
             partyId="Company" glReconciliationId="9000" transactionDate="2009-04-01 00:00:01.000" entryDate="2009-04-01 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_APPROVED"/>
-    <FinAccountTrans finAccountTransId="9102" finAccountTransTypeId="DEPOSIT" finAccountId="ABN_CHECKING" amount="500.00" 
+    <FinAccountTrans finAccountTransId="9102" finAccountTransTypeId="WITHDRAWAL" finAccountId="ABN_CHECKING" amount="500.00" 
             partyId="Company" transactionDate="2009-07-18 00:00:01.000" entryDate="2009-07-18 00:00:01.000" performedByPartyId="admin" statusId="FINACT_TRNS_CREATED" paymentId="8001"/>
     <Payment paymentId="8001" finAccountTransId="9102"/>
     <FinAccountTrans finAccountTransId="9103" finAccountTransTypeId="DEPOSIT" finAccountId="ABN_CHECKING" amount="20.00" 
             partyId="Company" transactionDate="2009-08-12 16:34:33.306" entryDate="2009-08-12 16:34:33.306"  paymentId="8003" statusId="FINACT_TRNS_CREATED"/>
     <Payment paymentId="8003" finAccountTransId="9103"/>
+    <FinAccountTrans finAccountTransId="9104" finAccountTransTypeId="WITHDRAWAL" finAccountId="ABN_CHECKING" amount="33.990" 
+            partyId="Company" transactionDate="2009-07-18 00:00:01.000" entryDate="2009-08-11 12:28:45.315" performedByPartyId="admin" statusId="FINACT_TRNS_CREATED" paymentId="8002"/>
+    <Payment paymentId="8002" finAccountTransId="9104"/>
 
 </entity-engine-xml>

Modified: ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_BankReconciliation.xml Fri Dec 11 23:11:39 2009
@@ -176,6 +176,24 @@
    <listitem>
     <para>Click on the 'GL Reconciliation Id' of the group and the details are displayed</para>
    </listitem>
+  </orderedlist>
+     </section>
+      <section>
+  <title>How do I cancel a Bank Reconciliation?</title>
+  <para>If a bank reconciliation needs to be cancelled due to a mistake or error then the bank reconciliation can be cancelled as long as it has not been fully reconciled (i.e. the status of the reconciliation has not been changed to 'Reconciled'. This will allow you to start the bank reconcilation again.</para>
+  <orderedlist>
+   <listitem>
+    <para>Go to the 'Reconciliation' sub menu for the bank account</para>
+   </listitem>
+   <listitem>
+    <para>A list of all the bank reconciliation groups are displayed (NOTE: If no transactions are associated with a reconciliation group then it will not be displayed here)</para>
+   </listitem>
+   <listitem>
+    <para>Click on the 'Cancel' button associated with the 'GL Reconciliation Id' of the group that needs to be cancelled</para>
+   </listitem>
+   <listitem>
+    <para>All transactions will be removed from the reconciliation group and their status will be changed back to 'Not Assigned' so that they can be re-assigned to this or any other reconciliation.</para>
+   </listitem>
    </orderedlist>
      </section>
  </section>
\ No newline at end of file

Modified: ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_EditFinAccountReconciliations.xml Fri Dec 11 23:11:39 2009
@@ -23,7 +23,14 @@
     xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
     xmlns="http://docbook.org/ns/docbook">
        <title>The Edit Financial Account Reconciliations screen.</title>
-        <para></para>
+        <para>This screen is used to create or update a reconciliation group / bank reconciliation. The following details can be input or updated for the reconciliation:</para>
+        <itemizedlist>
+        <listitem><para>GL Reconciliation Name or Identifier</para></listitem>
+       <listitem><para>Description for the reconciliation</para></listitem>
+       <listitem><para>Organisation Party Id for the reconciliation</para></listitem>
+       <listitem><para>Opening Balance for the reconciliation</para></listitem>
+        <listitem><para>Reconciliation date</para></listitem>
+        </itemizedlist>
         <section>
         <title></title>
         <para></para>

Modified: ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml Fri Dec 11 23:11:39 2009
@@ -1,31 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-   
-http://www.apache.org/licenses/LICENSE-2.0
-   
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" 
-    xmlns:xl="http://www.w3.org/1999/xlink" 
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
-    xmlns="http://docbook.org/ns/docbook">
-       <title>The View Financial Account Reconciliations screen.</title>
-        <para></para>
-        <section>
-        <title></title>
-        <para></para>
-        </section>
+ <!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version
+  2.0 (the "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+  applicable law or agreed to in writing, software distributed under the
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+  CONDITIONS OF ANY KIND, either express or implied. See the License for
+  the specific language governing permissions and limitations under the
+  License.
+ -->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+ xmlns="http://docbook.org/ns/docbook">
+ <title>The View Financial Account Reconciliations screen.</title>
+ <para>This screen gives an overview of a reconciliation group / bank
+  reconciliation. Note that a reconciliation must have at least one
+  transaction associated with it for this screen to be displayed. It is
+  used as follows:</para>
+ <itemizedlist>
+  <listitem>
+   <para>to view transactions associated with a reconciliation group /
+    bank reconciliation</para>
+  </listitem>
+  <listitem>
+   <para>to remove transactions from a reconciliation group / bank
+    reconciliation</para>
+  </listitem>
+  <listitem>
+   <para>to reconcile the reconciliation group / bank reconciliation
+   </para>
+  </listitem>
+ </itemizedlist>
+ <para>The screen displays the current reconciliation details plus
+  details of the previous reconciliation if one exists. This ensures the
+  closing balance of the previous reconciliation is the same as the
+  opening balance for the current one.</para>
+ <section>
+  <title>How do I edit reconciliation?</title>
+  <orderedlist>
+   <listitem>
+    <para>Press the 'Edit' button in the 'Current Bank Reconciliation'part of the screen</para>
+   </listitem>
+   <listitem>
+    <para>The 'Edit Financial Account Reconciliations' screen isdisplayed</para>
+   </listitem>
+   <listitem>
+    <para>Update the details required</para>
+   </listitem>
+   <listitem>
+    <para>Press the 'Update' button</para>
+   </listitem>
+  </orderedlist>
+ </section>
+ <section>
+  <title>How do I remove a transaction from a bank reconciliation?</title>
+  <para>On the lower part of the screen a list of all transactions associated with the reconciliation is displayed.</para>
+  <orderedlist>
+   <listitem>
+    <para>Press the 'Remove' button next to the entry that needs to be removed</para>
+   </listitem>
+   <listitem>
+    <para>The transaction is removed</para>
+   </listitem>
+   </orderedlist>
+ </section>
+ <section>
+ <title>How do I reconcile a bank reconciliation?</title>
+ <orderedlist>
+ <listitem><para>A total of all transactions associated with the reconciliation is shown in the lower part of the screen</para></listitem>
+ <listitem><para>Press the 'Reconcile' button next to the total</para></listitem>
+ <listitem><para>Each transaction status will be changed to 'Approved' and the reconciliation / bank reconciliation status will be changed to 'Reconciled' (NOTE: This means that no new transactions can be added to this reconciliation and it will no longer be available to assign transactions to)</para></listitem>
+ </orderedlist>
+ </section>
 </section>
\ No newline at end of file

Modified: ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/data/helpdata/HELP_ACCOUNTING_financial_accounts.xml Fri Dec 11 23:11:39 2009
@@ -97,13 +97,15 @@
     <xi:include href="HELP_ACCOUNTING_FindFinAccountTrans.xml"/>
     <xi:include href="HELP_ACCOUNTING_PaymentsDepositWithdraw.xml"/>
     <xi:include href="HELP_ACCOUNTING_FindDepositSlips.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditFinAccountReconciliations.xml"/>
-    <xi:include href="HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml"/>
     <xi:include href="HELP_ACCOUNTING_NewDepositPayment.xml"/>
     <xi:include href="HELP_ACCOUNTING_NewWithdrawalPayment.xml"/>
     <xi:include href="HELP_ACCOUNTING_NewDepositSlip.xml"/>
     <xi:include href="HELP_ACCOUNTING_EditDepositSlipAndMembers.xml"/>
-    <xi:include href="HELP_ACCOUNTING_EditFinAccountTrans.xml"/>
+    <xi:include href="HELP_ACCOUNTING_FindFinAccountReconciliations.xml"/>
     <xi:include href="HELP_ACCOUNTING_BankReconciliation.xml"/>
+    <xi:include href="HELP_ACCOUNTING_EditFinAccountReconciliations.xml"/>
+    <xi:include href="HELP_ACCOUNTING_ViewGlReconciliationWithTransaction.xml"/>
+    <xi:include href="HELP_ACCOUNTING_EditFinAccountTrans.xml"/>
     <xi:include href="HELP_ACCOUNTING_EditFinAccountAuths.xml"/>
+   
 </section>

Modified: ofbiz/branches/addbirt/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/entitydef/entitymodel.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/entitydef/entitymodel.xml Fri Dec 11 23:11:39 2009
@@ -1834,27 +1834,30 @@
         <key-map field-name="glJournalId"/>
       </relation>
     </view-entity>
-    <view-entity entity-name="AcctgTransEntryProdSums"
+    <view-entity entity-name="AcctgTransEntrySums"
             package-name="org.ofbiz.accounting.ledger"
-            title="Sum of AcctgTransEntry entity amounts, grouped by glAccountId, productId, debitCreditFlag">
+            title="Sum of AcctgTransEntry entity amounts grouped by glAccountId, debitCreditFlag">
       <member-entity entity-alias="ATE" entity-name="AcctgTransEntry"/>
       <member-entity entity-alias="ACT" entity-name="AcctgTrans"/>
       <member-entity entity-alias="GLA" entity-name="GlAccount"/>
-      <alias entity-alias="ATE" name="organizationPartyId" group-by="true"/>
-      <alias entity-alias="ATE" name="productId" group-by="true"/>
+      <alias entity-alias="ATE" name="glAccountId" group-by="true"/>
+      <alias entity-alias="GLA" name="glAccountTypeId" group-by="true"/>
+      <alias entity-alias="GLA" name="glAccountClassId" group-by="true"/>
+      <alias entity-alias="GLA" name="accountName" group-by="true"/>
+      <alias entity-alias="GLA" name="accountCode" group-by="true"/>
+      <alias entity-alias="ACT" name="glFiscalTypeId" group-by="true"/>
+      <alias entity-alias="ACT" name="acctgTransTypeId" group-by="false"/>
       <alias entity-alias="ATE" name="debitCreditFlag" group-by="true"/>
       <alias entity-alias="ATE" name="amount" function="sum"/>
-      <alias entity-alias="ATE" name="glAccountId" group-by="false"/>
-      <alias entity-alias="GLA" name="glAccountTypeId" group-by="true"/> <!-- so we can select by type of account -->
-      <alias entity-alias="ACT" name="isPosted" group-by="false"/> <!-- so we can select by posted status -->
-      <alias entity-alias="ACT" name="glFiscalTypeId" group-by="true"/>
+      <alias entity-alias="ATE" name="organizationPartyId" group-by="false"/>
+      <alias entity-alias="ACT" name="isPosted" group-by="false"/>
       <alias entity-alias="ACT" name="transactionDate" group-by="false"/> <!-- so we can select the sum by date -->
-      <view-link entity-alias="ATE" rel-entity-alias="GLA">
-        <key-map field-name="glAccountId"/>
-      </view-link>
       <view-link entity-alias="ATE" rel-entity-alias="ACT">
         <key-map field-name="acctgTransId"/>
       </view-link>
+      <view-link entity-alias="ATE" rel-entity-alias="GLA">
+        <key-map field-name="glAccountId"/>
+      </view-link>
     </view-entity>
     <entity entity-name="AcctgTransEntryType"
             package-name="org.ofbiz.accounting.ledger"
@@ -2044,10 +2047,10 @@
       <view-link entity-alias="GLA" rel-entity-alias="GLAH">
         <key-map field-name="glAccountId"/>
       </view-link>
-      <relation type="one" fk-name="GLAAH_GLACT" rel-entity-name="GlAccount">
+      <relation type="one" fk-name="GLAAHT_GLACT" rel-entity-name="GlAccount">
         <key-map field-name="glAccountId"/>
       </relation>
-      <relation type="one" fk-name="GLAAH_GLAH" rel-entity-name="GlAccountHistory">
+      <relation type="one" fk-name="GLAAHT_GLAH" rel-entity-name="GlAccountHistory">
         <key-map field-name="glAccountId"/>
         <key-map field-name="organizationPartyId"/>
         <key-map field-name="customTimePeriodId"/>

Modified: ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Fri Dec 11 23:11:39 2009
@@ -118,6 +118,15 @@
                 <set-service-fields service-name="createFinAccountStatus" map="parameters" to-map="createFinAccountStatusMap"/>
                 <call-service service-name="createFinAccountStatus" in-map-name="createFinAccountStatusMap"/>
             </then>
+            <else>
+                <if-compare field="lookedUpValue.statusId" operator="equals" value="FNACT_MANFROZEN">
+                    <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+                </if-compare>
+                <if-compare field="lookedUpValue.statusId" operator="equals" value="FNACT_CANCELLED">
+                    <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountNotValidError"/></add-error>
+                </if-compare>
+                <check-errors/>
+            </else>
         </if>
 
         <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
@@ -160,6 +169,14 @@
 
     <!-- FinAccountTrans Services -->
     <simple-method method-name="createFinAccountTrans" short-description="Create a Financial Account Transaction">
+        <entity-one entity-name="FinAccount" value-field="finAccount"/>
+        <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+        </if-compare>
+        <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountNotValidError"/></add-error>
+        </if-compare>
+        <check-errors/>
         <call-simple-method method-name="getArithmeticSettingsInline"/>
 
         <make-value value-field="newEntity" entity-name="FinAccountTrans"/>
@@ -193,6 +210,14 @@
 
     <!-- FinAccountRole Services -->
     <simple-method method-name="createFinAccountRole" short-description="Create a Financial Account Role">
+        <entity-one entity-name="FinAccount" value-field="finAccount"/>
+        <if-compare field="finAccount.statusId" operator="equals" value="FNACT_MANFROZEN">
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountInactiveStatusError"/></add-error>
+        </if-compare>
+        <if-compare field="finAccount.statusId" operator="equals" value="FNACT_CANCELLED">
+            <add-error><fail-property resource="AccountingUiLabels" property="AccountingFinAccountNotValidError"/></add-error>
+        </if-compare>
+        <check-errors/>
         <make-value value-field="newEntity" entity-name="FinAccountRole"/>
         <set-pk-fields value-field="newEntity" map="parameters"/>
         <set-nonpk-fields value-field="newEntity" map="parameters"/>

Modified: ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Fri Dec 11 23:11:39 2009
@@ -473,38 +473,30 @@
     </simple-method>
 
     <simple-method method-name="cancelPaymentBatch" short-description="cancel payment batch">
-        <set field="paymentGroupId" from-field="parameters.paymentGroupId"/>
-        <entity-and entity-name="PaymentGroupMember" list="paymentGroupMembers">
-            <field-map field-name="paymentGroupId"/>
+        <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="paymentGroupMemberAndTransList">
+            <field-map field-name="paymentGroupId" from-field="parameters.paymentGroupId"/>
         </entity-and>
-        <set field="isGlReconciliationId" value="${parameters.glReconciliationId == 'null'}" type="Boolean"/>
-        <if-compare field="isGlReconciliationId" operator="equals" value="true" type="Boolean">
-            <set-service-fields service-name="getPaymentGroupReconciliationId" map="parameters" to-map="getPaymentGroupReconciliationIdMap"/>
-            <set field="getPaymentGroupReconciliationIdMap.paymentGroupId"  from-field="paymentGroupId"/>
-            <call-service service-name="getPaymentGroupReconciliationId" in-map-name="getPaymentGroupReconciliationIdMap">
-                <result-to-field result-name="glReconciliationId"/>
-            </call-service>
-        <else>
-            <set field="glReconciliationId" from-field="parameters.glReconciliationId"/>    
-        </else>
-        </if-compare>
-        <if-empty field="glReconciliationId">
-            <iterate list="paymentGroupMembers" entry="paymentGroupMember">
-                <set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/>
+        <if-not-empty field="paymentGroupMemberAndTransList">
+            <first-from-list list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans"/>
+            <if-compare field="paymentGroupMemberAndTrans.finAccountTransStatusId" operator="equals" value="FINACT_TRNS_APPROVED">
+                <add-error>
+                    <fail-property resource="AccountingUiLabels" property="AccountingTransactionIsAlreadyReconciled"/>
+                </add-error>
+                <check-errors/>
+            </if-compare>      
+            <iterate list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans">
+                <set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" to-map="expirePaymentGroupMemberMap"/>
                 <call-service service-name="expirePaymentGroupMember" in-map-name="expirePaymentGroupMemberMap"/>
-                <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
-                <get-related-one relation-name="FinAccountTrans" value-field="payment" to-value-field="finAccountTrans"/>
+                <entity-one entity-name="FinAccountTrans" value-field="finAccountTrans">
+                    <field-map field-name="finAccountTransId" from-field="paymentGroupMemberAndTrans.finAccountTransId"/>
+                </entity-one>
                 <if-not-empty field="finAccountTrans">
                     <set-service-fields service-name="setFinAccountTransStatus" map="finAccountTrans" to-map="setFinAccountTransStatusMap"/>
                     <set field="setFinAccountTransStatusMap.statusId" value="FINACT_TRNS_CANCELED"/>
                     <call-service service-name="setFinAccountTransStatus" in-map-name="setFinAccountTransStatusMap"/>
                 </if-not-empty>
             </iterate>
-        <else>
-            <add-error><fail-property resource="AccountingUiLabels" property="AccountingCancelBatchPaymentsError"/></add-error>
-            <check-errors/>
-        </else>
-        </if-empty>
+        </if-not-empty>
     </simple-method>
     
     <simple-method method-name="createPaymentAndPaymentGroupForInvoices" short-description="Creates Payments, PaymentApplications and PaymentGroup for the same">
@@ -641,16 +633,29 @@
     </simple-method>
     
     <simple-method method-name="cancelCheckRunPayments" short-description="Cancel all payments for payment group">
-        <entity-condition entity-name="PaymentGroupMember" list="paymentGroupMembers">
-            <condition-expr field-name="paymentGroupId" from-field="parameters.paymentGroupId"/>
-        </entity-condition>
-        <iterate list="paymentGroupMembers" entry="paymentGroupMember">
-            <get-related-one relation-name="Payment" value-field="paymentGroupMember" to-value-field="payment"/>
+        <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans"  list="paymentGroupMemberAndTransList">
+            <field-map field-name="paymentGroupId" from-field="parameters.paymentGroupId"/>
+        </entity-and>
+        <first-from-list list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans"/>
+        <if-compare field="paymentGroupMemberAndTrans.finAccountTransStatusId" operator="not-equals" value="FINACT_TRNS_APPROVED">
+        <iterate list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans">
+            <entity-one entity-name="Payment" value-field="payment">
+                <field-map field-name="paymentId" from-field="paymentGroupMemberAndTrans.paymentId"/>
+            </entity-one>
             <set-service-fields service-name="voidPayment" map="payment" to-map="voidPaymentMap"/>
             <call-service service-name="voidPayment" in-map-name="voidPaymentMap"/>
-            <set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMember" to-map="expirePaymentGroupMemberMap"/>
+            <set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" to-map="expirePaymentGroupMemberMap"/>
             <call-service service-name="expirePaymentGroupMember" in-map-name="expirePaymentGroupMemberMap"/>
+            <clear-field field="voidPaymentMap"/>
+            <clear-field field="expirePaymentGroupMemberMap"/>
         </iterate>
+        <else>
+            <add-error>
+                <fail-property resource="AccountingUiLabels" property="AccountingCheckIsAlreadyIssued"/>
+            </add-error>
+            <check-errors/>
+        </else>
+        </if-compare>
     </simple-method>
     
     <simple-method method-name="getPayments" short-description="Get list of payment">

Modified: ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=889851&r1=889850&r2=889851&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml (original)
+++ ofbiz/branches/addbirt/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml Fri Dec 11 23:11:39 2009
@@ -148,8 +148,8 @@
         -->
 
         <!-- Post condition : After Cancel Check Run process accounting transactions are automatically posted to the GL.
-            * ACCOUNTS PAYABLE 210000  - debitTotal increased of $116.85 ; creditTotal increased of $233.7 ; debitCreditDifference decreased of $116.85
-            * GENERAL CHECKING ACCOUNT 111100 - debitTotal increased of $116.85 ; debitCreditDifference increased of $116.85
+            * ACCOUNTS PAYABLE 210000  - debitTotal increased of $82.86 ; creditTotal increased of $165.72 ; debitCreditDifference decreased of $82.86
+            * GENERAL CHECKING ACCOUNT 111100 - debitTotal increased of $82.86 ; debitCreditDifference increased of $82.86
         -->
         <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
@@ -164,35 +164,45 @@
             <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
             <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
         </call-service>
+
         <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="111100"/>
         <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
             <result-to-field result-name="debitTotal" field="undepositedDebitTotal"/>
             <result-to-field result-name="creditTotal" field="undepositedCreditTotal"/>
             <result-to-field result-name="debitCreditDifference" field="undepositedDebitCreditDifference"/>
         </call-service>
+        
         <log level="info" message="BEFORE  RUNNING CANCEL CHECK RUN  : ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
         <log level="info" message="BEFORE  RUNNING CANCEL CHECK RUN : UNDEPOSITED RECEIPTS ;debitTotal :${undepositedDebitTotal} ; creditTotal:${undepositedCreditTotal} ; debitCreditDifference : ${undepositedDebitCreditDifference}"/>
+        
         <set field="paymentGroupId" value="9000"/>
         <set field="cancelCheckRunPaymentsMap.userLogin" from-field="userLogin"/>
         <set field="cancelCheckRunPaymentsMap.paymentGroupId" from-field="paymentGroupId"/>
         <call-service service-name="cancelCheckRunPayments" in-map-name="cancelCheckRunPaymentsMap"/>
-        <set field="totalPayableDebitAmount" value="${payableDebitTotal + 116.85}" type="BigDecimal"/>
-        <set field="totalPayableCreditAmount" value="${payableCreditTotal + 233.7}" type="BigDecimal"/>
-        <set field="totalPayableDebitCreditDifference" value="${payableDebitCreditDifference -116.85}" type="BigDecimal"/>
+        <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans"  list="paymentGroupMemberAndTransList">
+            <field-map field-name="paymentGroupId"/>
+        </entity-and>
+        <first-from-list list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans"/>
+        <if-compare field="paymentGroupMemberAndTrans.finAccountTransStatusId" operator="not-equals" value="FINACT_TRNS_APPROVED">
+        
+        <set field="totalPayableDebitAmount" value="${payableDebitTotal + 82.86}" type="BigDecimal"/>
+        <set field="totalPayableCreditAmount" value="${payableCreditTotal + 165.72}" type="BigDecimal"/>
+        <set field="totalPayableDebitCreditDifference" value="${payableDebitCreditDifference - 82.86}" type="BigDecimal"/>
         <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
         <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
             <result-to-field result-name="debitTotal" field="payableDebitTotal"/>
             <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
             <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
         </call-service>
+        
         <assert>
             <if-compare-field field="totalPayableDebitAmount" operator="equals" to-field="payableDebitTotal" type="BigDecimal"/>
             <if-compare-field field="totalPayableCreditAmount" operator="equals" to-field="payableCreditTotal" type="BigDecimal"/>
             <if-compare-field field="totalPayableDebitCreditDifference" operator="equals" to-field="payableDebitCreditDifference" type="BigDecimal"/>
         </assert>
         <check-errors/>
-        <set field="totalUndepositedDebitAmount" value="${undepositedDebitTotal + 116.85}" type="BigDecimal"/>
-        <set field="totalUndepositedDebitCreditDifference" value="${undepositedDebitCreditDifference + 116.85}" type="BigDecimal"/>
+        <set field="totalUndepositedDebitAmount" value="${undepositedDebitTotal + 82.86}" type="BigDecimal"/>
+        <set field="totalUndepositedDebitCreditDifference" value="${undepositedDebitCreditDifference + 82.86}" type="BigDecimal"/>
         <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="111100"/>
         <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
             <result-to-field result-name="debitTotal" field="undepositedDebitTotal"/>
@@ -204,6 +214,8 @@
             <if-compare-field field="totalUndepositedDebitCreditDifference" operator="equals" to-field="undepositedDebitCreditDifference" type="BigDecimal"/>
         </assert>
         <check-errors/>
+
+        </if-compare>
         <log level="info" message="AFTER  RUNNING CANCEL CHECK RUN: ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
         <log level="info" message="AFTER  RUNNING CANCEL CHECK RUN  : UNDEPOSITED RECEIPTS ;debitTotal :${undepositedDebitTotal} ; creditTotal:${undepositedCreditTotal} ; debitCreditDifference : ${undepositedDebitCreditDifference}"/>
     </simple-method>