[OFBiz] SVN: r6879 - in trunk/applications/accounting: . servicedef webapp/accounting webapp/accounting/WEB-INF webapp/accounting/WEB-INF/actions webapp/accounting/WEB-INF/actions/admin webapp/accounting/admin webapp/accounting/includes widget
sichen@svn.ofbiz.org
sichen at svn.ofbiz.org
Wed Mar 1 18:13:23 CST 2006
Author: sichen
Date: 2006-03-01 18:13:05 -0600 (Wed, 01 Mar 2006)
New Revision: 6879
Added:
trunk/applications/accounting/servicedef/services_admin.xml
trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/
trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh
trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh
trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh
trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/printChecks.bsh
trunk/applications/accounting/webapp/accounting/admin/
trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl
trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl
trunk/applications/accounting/widget/AdminScreens.xml
Modified:
trunk/applications/accounting/ofbiz-component.xml
trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
trunk/applications/accounting/widget/AccountingScreens.xml
trunk/applications/accounting/widget/CommonScreens.xml
Log:
Admin screens from accountingext, thanks much to Hans Bakker. OFBIZ-747
Modified: trunk/applications/accounting/ofbiz-component.xml
===================================================================
--- trunk/applications/accounting/ofbiz-component.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/ofbiz-component.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -45,6 +45,7 @@
<!-- General Payment Service Definitions -->
<service-resource type="model" loader="main" location="servicedef/services_agreement.xml"/>
+ <service-resource type="model" loader="main" location="servicedef/services_admin.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_billing.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_finaccount.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_fixedasset.xml"/>
Added: trunk/applications/accounting/servicedef/services_admin.xml
===================================================================
--- trunk/applications/accounting/servicedef/services_admin.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/servicedef/services_admin.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/services.xsd">
+ <description>Accounting Services - Miscellaneous</description>
+ <vendor>OFBiz</vendor>
+ <version>1.0</version>
+ <service name="createPartyAcctgPreference" default-entity-name="PartyAcctgPreference" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="createPartyAcctgPreference" auth="true">
+ <description>Create accounting preferences for a party (organization)</description>
+ <required-permissions join-type="OR">
+ <check-permission permission="ACCTG_PREF_CREATE"/>
+ </required-permissions>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+
+ <service name="updateFXConversion" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="updateFXConversion">
+ <description>Update the conversion rate between two currencies and expire the old conversion rates</description>
+ <required-permissions join-type="AND">
+ <check-permission permission="ACCTG_FX_ENTRY"/>
+ </required-permissions>
+ <attribute type="String" mode="IN" name="uomId" optional="false"/>
+ <attribute type="String" mode="IN" name="uomIdTo" optional="false"/>
+ <attribute type="Double" mode="IN" name="conversionFactor" optional="false"/>
+ <attribute type="Timestamp" mode="IN" name="asOfTimestamp" optional="true"/>
+ </service>
+
+ <service name="addInvoiceItemTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="addInvoiceItemTypeGlAssignment">
+ <description>add a override GL account number to a invoice Itemtype for a certain organisation party.</description>
+ <auto-attributes mode="IN" entity-name="InvoiceItemTypeGlAccount" include="all" optional="false"/>
+ </service>
+ <service name="removeInvoiceItemTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="removeInvoiceItemTypeGlAssignment">
+ <description>Remove a override GL account number to a invoice type for a certain organisation party.</description>
+ <auto-attributes mode="IN" entity-name="InvoiceItemTypeGlAccount" include="pk" optional="false"/>
+ </service>
+
+ <service name="addPaymentTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="addPaymentTypeGlAssignment">
+ <description>add a default GL account type to a payment type.</description>
+ <auto-attributes mode="IN" entity-name="PaymentGlAccountTypeMap" include="all" optional="false"/>
+ </service>
+ <service name="removePaymentTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="removePaymentTypeGlAssignment">
+ <description>Remove a default GL account type from a payment type.</description>
+ <auto-attributes mode="IN" entity-name="PaymentGlAccountTypeMap" include="pk" optional="false"/>
+ </service>
+
+ <service name="addPaymentMethodTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="addPaymentMethodTypeGlAssignment">
+ <description>add a default GL account number to a payment method type.</description>
+ <auto-attributes mode="IN" entity-name="PaymentMethodTypeGlAccount" include="all" optional="false"/>
+ </service>
+ <service name="removePaymentMethodTypeGlAssignment" engine="simple"
+ location="org/ofbiz/accounting/admin/AcctgAdminServices.xml" invoke="removePaymentMethodTypeGlAssignment">
+ <description>Remove a default GL account number from a payment method type.</description>
+ <auto-attributes mode="IN" entity-name="PaymentMethodTypeGlAccount" include="pk" optional="false"/>
+ </service>
+
+ <!-- these services are for GL export -->
+ <service name="exportGLToFile" engine="java"
+ location="org.ofbiz.accounting.integration.GLExportServices" invoke="exportGLToFile" transaction-timout="7200" auth="true">
+ <implements service="storeEntitySyncData"/>
+ </service>
+</services>
Property changes on: trunk/applications/accounting/servicedef/services_admin.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,29 @@
+/*
+ * $Id: $
+ *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+ // simple beanshell to filter out receipts in a list of payments
+
+import org.ofbiz.accounting.util.UtilAccounting;
+
+payments = context.get("payments");
+iter = payments.iterator();
+while (iter.hasNext()) {
+ payment = iter.next();
+ if (UtilAccounting.isReceipt(payment)) {
+ iter.remove();
+ }
+}
Property changes on: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,65 @@
+/*
+ * $Id: $
+ *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+import java.util.*;
+import java.lang.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.UtilMisc;
+
+delegator = parameters.get("delegator");
+organizationPartyId = parameters.get("organizationPartyId");
+
+List invoiceItemTypes = delegator.findByLike("InvoiceItemType",UtilMisc.toMap("invoiceItemTypeId","INV_%"));
+List allTypes = new LinkedList();
+i = invoiceItemTypes.iterator();
+while(i.hasNext()) {
+ GenericValue invoiceItemType = i.next();
+ String activeGlDescription = "";
+ String remove = " ";
+ List glAccounts = null;
+ GenericValue glAccount = null;
+ List invoiceItemTypeOrgs = invoiceItemType.getRelatedByAnd("InvoiceItemTypeGlAccount",UtilMisc.toMap("organizationPartyId", organizationPartyId));
+ String overrideGlAccountId = " ";
+ if (invoiceItemTypeOrgs != null && invoiceItemTypeOrgs.size() > 0) {
+ invoiceItemTypeOrg = invoiceItemTypeOrgs.get(0);
+ overrideGlAccountId = invoiceItemTypeOrg.getString("glAccountId");
+
+ glAccounts = invoiceItemTypeOrg.getRelated("GlAccount");
+ if (glAccounts != null && glAccounts.size() > 0)
+ glAccount = glAccounts.get(0);
+ }
+ else {
+
+ glAccount = invoiceItemType.getRelatedOne("DefaultGlAccount");
+ }
+
+ if (glAccount != null) {
+ activeGlDescription = glAccount.getString("accountName");
+ remove = "Remove";
+ }
+
+ allTypes.add(UtilMisc.toMap("invoiceItemTypeId",invoiceItemType.getString("invoiceItemTypeId"),
+ "description",invoiceItemType.getString("description"),
+ "defaultGlAccountId",invoiceItemType.getString("defaultGlAccountId"),
+ "overrideGlAccountId",overrideGlAccountId,
+ "remove",remove,
+ "activeGlDescription",activeGlDescription));
+
+}
+context.put("invoiceItemTypes",allTypes);
Property changes on: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,65 @@
+/*
+ * $Id: $
+ *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+import java.util.*;
+import java.lang.*;
+import org.ofbiz.entity.*;
+import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.UtilMisc;
+
+delegator = parameters.get("delegator");
+organizationPartyId = parameters.get("organizationPartyId");
+
+List invoiceItemTypes = delegator.findByLike("InvoiceItemType",UtilMisc.toMap("invoiceItemTypeId","PINV_%"));
+List allTypes = new LinkedList();
+i = invoiceItemTypes.iterator();
+while(i.hasNext()) {
+ GenericValue invoiceItemType = i.next();
+ String activeGlDescription = "";
+ String remove = " ";
+ List glAccounts = null;
+ GenericValue glAccount = null;
+ List invoiceItemTypeOrgs = invoiceItemType.getRelatedByAnd("InvoiceItemTypeGlAccount",UtilMisc.toMap("organizationPartyId", organizationPartyId));
+ String overrideGlAccountId = " ";
+ if (invoiceItemTypeOrgs != null && invoiceItemTypeOrgs.size() > 0) {
+ invoiceItemTypeOrg = invoiceItemTypeOrgs.get(0);
+ overrideGlAccountId = invoiceItemTypeOrg.getString("glAccountId");
+
+ glAccounts = invoiceItemTypeOrg.getRelated("GlAccount");
+ if (glAccounts != null && glAccounts.size() > 0)
+ glAccount = glAccounts.get(0);
+ }
+ else {
+
+ glAccount = invoiceItemType.getRelatedOne("DefaultGlAccount");
+ }
+
+ if (glAccount != null) {
+ activeGlDescription = glAccount.getString("accountName");
+ remove = "Remove";
+ }
+
+ allTypes.add(UtilMisc.toMap("invoiceItemTypeId",invoiceItemType.getString("invoiceItemTypeId"),
+ "description",invoiceItemType.getString("description"),
+ "defaultGlAccountId",invoiceItemType.getString("defaultGlAccountId"),
+ "glAccountId",overrideGlAccountId,
+ "remove",remove,
+ "activeGlDescription",activeGlDescription));
+
+}
+context.put("purinvoiceItemTypes",allTypes);
Property changes on: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/printChecks.bsh
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/printChecks.bsh 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/printChecks.bsh 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,59 @@
+/*
+ * $Id: $
+ *
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+import java.util.ArrayList;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.accounting.util.UtilAccounting;
+
+// rounding mode
+int decimals = UtilAccounting.getBigDecimalScale("invoice.decimals");
+int rounding = UtilAccounting.getBigDecimalRoundingMode("invoice.rounding");
+context.put("decimals", decimals);
+context.put("rounding", rounding);
+
+// list of payments
+payments = new ArrayList();
+
+// first ensure ability to print
+security = request.getAttribute("security");
+context.put("security", security);
+if (!security.hasEntityPermission("ACCOUNTING", "_PRINT_CHECKS", session)) {
+ context.put("payments", payments); // if no permission, just pass an empty list for now
+ return;
+}
+
+// in the case of a single payment, the paymentId will be supplied
+paymentId = context.get("paymentId");
+if (paymentId != null) {
+ payment = delegator.findByPrimaryKey("Payment", UtilMisc.toMap("paymentId", paymentId));
+ if (payment != null) payments.add(payment);
+ context.put("payments", payments);
+ return;
+}
+
+// in the case of a multi form, parse the multi data and get all of the selected payments
+selected = UtilHttp.parseMultiFormData(parameters);
+iter = selected.iterator();
+while (iter.hasNext()) {
+ row = iter.next();
+ payment = delegator.findByPrimaryKey("Payment", UtilMisc.toMap("paymentId", row.get("paymentId")));
+ if (payment == null) continue;
+ payments.add(payment);
+}
+context.put("payments", payments);
+
Property changes on: trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/printChecks.bsh
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Modified: trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -485,14 +485,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListAcctgTransEntries"/>
</request-map>
- <request-map uri="viewGlAccountBalance">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewGlAccountBalance"/>
- </request-map>
- <request-map uri="viewGlReconciliation">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewGlReconciliation"/>
- </request-map>
<!-- =============== Fixed Asset mapping =================-->
<request-map uri="ListFixedAssets"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssets"/></request-map>
@@ -840,7 +832,169 @@
<response name="success" type="view" value="PrintCheckPDF"/>
</request-map>
+ <!-- ================ Administratvie Requests ================ -->
+ <request-map uri="ListCompanies">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListCompanies"/>
+ </request-map>
+ <request-map uri="AdminMain">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="AdminMain"/>
+ </request-map>
+ <request-map uri="TimePeriods">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="AdminMain"/>
+ </request-map>
+ <request-map uri="PartyAcctgPreference">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PartyAcctgPreference"/>
+ </request-map>
+ <request-map uri="ListUnpostedAcctgTrans">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
+ </request-map>
+ <request-map uri="postAcctgTrans">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="postAcctgTrans"/>
+ <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
+ <response name="error" type="view" value="ListUnpostedAcctgTrans"/>
+ </request-map>
+ <request-map uri="createPartyAcctgPreference">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPartyAcctgPreference"/>
+ <response name="success" type="view" value="PartyAcctgPreference"/>
+ <response name="error" type="view" value="PartyAcctgPreference"/>
+ </request-map>
+ <request-map uri="closeAllTimePeriods">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="closeAllTimePeriods"/>
+ <response name="success" type="view" value="AdminMain"/>
+ <response name="error" type="view" value="AdminMain"/>
+ </request-map>
+ <request-map uri="GlAccountAssignment">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountSalInvoice"/>
+ </request-map>
+ <request-map uri="GlAccountSalInvoice">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountSalInvoice"/>
+ </request-map>
+ <request-map uri="GlAccountPurInvoice">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountPurInvoice"/>
+ </request-map>
+ <request-map uri="GlAccountTypePaymentType">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountTypePaymentType"/>
+ </request-map>
+ <request-map uri="GlAccountNrPaymentMethod">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="GlAccountNrPaymentMethod"/>
+ </request-map>
+
+ <request-map uri="addSalInvoiceItemTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="addInvoiceItemTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountSalInvoice"/>
+ <response name="error" type="view" value="GlAccountSalInvoice"/>
+ </request-map>
+
+ <request-map uri="removeSalInvoiceItemTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeInvoiceItemTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountSalInvoice"/>
+ <response name="error" type="view" value="GlAccountSalInvoice"/>
+ </request-map>
+
+ <request-map uri="addPurInvoiceItemTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="addInvoiceItemTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountPurInvoice"/>
+ <response name="error" type="view" value="GlAccountPurInvoice"/>
+ </request-map>
+
+ <request-map uri="removePurInvoiceItemTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeInvoiceItemTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountPurInvoice"/>
+ <response name="error" type="view" value="GlAccountPurInvoice"/>
+ </request-map>
+
+ <request-map uri="addPaymentTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="addPaymentTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountTypePaymentType"/>
+ <response name="error" type="view" value="GlAccountTypePaymentType"/>
+ </request-map>
+
+ <request-map uri="removePaymentTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removePaymentTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountTypePaymentType"/>
+ <response name="error" type="view" value="GlAccountTypePaymentType"/>
+ </request-map>
+
+ <request-map uri="addPaymentMethodTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="addPaymentMethodTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountNrPaymentMethod"/>
+ <response name="error" type="view" value="GlAccountNrPaymentMethod"/>
+ </request-map>
+
+ <request-map uri="removePaymentMethodTypeGlAssignment">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removePaymentMethodTypeGlAssignment"/>
+ <response name="success" type="view" value="GlAccountNrPaymentMethod"/>
+ <response name="error" type="view" value="GlAccountNrPaymentMethod"/>
+ </request-map>
+
+ <request-map uri="viewFXConversions">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewFXConversions"/>
+ </request-map>
+
+ <request-map uri="updateFXConversion">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateFXConversion"/>
+ <response name="success" type="view" value="ViewFXConversions"/>
+ <response name="error" type="view" value="ViewFXConversions"/>
+ </request-map>
+
+ <!-- Actually reconcile account -->
+ <request-map uri="reconcileGlAccount">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="reconcileGlAccount"/>
+ <response name="success" type="view" value="ViewGlAccountBalance"/>
+ <response name="error" type="view" value="ReconcileAccounts"/>
+ </request-map>
+ <request-map uri="viewGlAccountBalance">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewGlAccountBalance"/>
+ </request-map>
+ <request-map uri="viewGlReconciliation">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ViewGlReconciliation"/>
+ </request-map>
+ <!-- ================ check requests ================= -->
+ <request-map uri="listChecksToPrint">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListChecksToPrint"/>
+ </request-map>
+ <request-map uri="listChecksToSend">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListChecksToSend"/>
+ </request-map>
+ <request-map uri="printChecks">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PrintChecks"/>
+ </request-map>
+ <request-map uri="quickSendPayment">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="quickSendPayment"/>
+ <response name="success" type="view" value="ListChecksToSend"/>
+ <response name="error" type="view" value="ListChecksToSend"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -892,10 +1046,8 @@
<view-map name="AccountActivitiesDetail" type="screen" page="component://accounting/widget/AccountingScreens.xml#AccountActivitiesDetail"/>
<view-map name="ListGlAccountEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccountEntries"/>
<view-map name="ListAcctgTransEntries" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListAcctgTransEntries"/>
- <view-map name="ViewGlAccountBalance" type="screen" page="component://accounting/widget/AccountingScreens.xml#ViewGlAccountBalance"/>
- <view-map name="ViewGlReconciliation" type="screen" page="component://accounting/widget/AccountingScreens.xml#ViewGlReconciliation"/>
-
+ <!-- fixed assets -->
<view-map name="ListFixedAssets" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/>
<view-map name="EditFixedAsset" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/>
<view-map name="ListFixedAssetProducts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/>
@@ -908,7 +1060,7 @@
<view-map name="ListFixedAssetsRollUp" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetRollUp"/>
<view-map name="ListFixedAssetStdCosts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetStdCosts"/>
<view-map name="EditFixedAssetStdCost" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetStdCost"/>
-
+ <!-- agreements -->
<view-map name="FindAgreement" type="screen" page="component://accounting/widget/AgreementScreens.xml#FindAgreement"/>
<view-map name="EditAgreement" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreement"/>
<view-map name="ListAgreementItems" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementItems"/>
@@ -917,7 +1069,7 @@
<view-map name="EditAgreementTerm" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementTerm"/>
<view-map name="ListAgreementPromoAppls" type="screen" page="component://accounting/widget/AgreementScreens.xml#ListAgreementPromoAppls"/>
<view-map name="EditAgreementPromoAppl" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreementPromoAppl"/>
-
+ <!-- tax authority -->
<view-map name="FindTaxAuthority" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthority"/>
<view-map name="EditTaxAuthority" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthority"/>
<view-map name="EditTaxAuthorityCategories" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityCategories"/>
@@ -926,6 +1078,19 @@
<view-map name="EditTaxAuthorityRateProducts" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityRateProducts"/>
<view-map name="ListTaxAuthorityParties" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#ListTaxAuthorityParties"/>
<view-map name="EditTaxAuthorityPartyInfo" type="screen" page="component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo"/>
+ <!-- administrative pages -->
+ <view-map name="ListCompanies" type="screen" page="component://accounting/widget/AdminScreens.xml#ListCompanies"/>
+ <view-map name="AdminMain" type="screen" page="component://accounting/widget/AdminScreens.xml#AdminMain"/>
+ <view-map name="TimePeriods" type="screen" page="component://accounting/widget/AdminScreens.xml#TimePeriods"/>
+ <view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/AdminScreens.xml#PartyAcctgPreference"/>
+ <view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/AdminScreens.xml#ViewFXConversions"/>
+ <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/AdminScreens.xml#ListUnpostedAcctgTrans"/>
+ <view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountPurInvoice"/>
+ <view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountSalInvoice"/>
+ <view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypePaymentType"/>
+ <view-map name="GlAccountNrPaymentMethod" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountNrPaymentMethod"/>
+ <view-map name="ListChecksToPrint" type="screen" page="component://accounting/widget/AdminScreens.xml#ListChecksToPrint"/>
+ <view-map name="ListChecksToSend" type="screen" page="component://accounting/widget/AdminScreens.xml#ListChecksToSend"/>
<!-- Transaction mappings -->
<view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/>
Added: trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,26 @@
+<#--
+$Id: $
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+<#assign unselectedClassName = "buttontext">
+<#assign selectedClassMap = {page.checksTabButtonItem?default("void") : "buttontext"}>
+
+<#if organizationPartyId?has_content>
+ <div class='tabContainer'>
+ <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PrintChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingPrintChecks}</a>
+ <a href="<@ofbizUrl>listChecksToSend?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.SendChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingSendChecks}</a>
+ </div>
+</#if>
Property changes on: trunk/applications/accounting/webapp/accounting/admin/AdminChecksTabBar.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+ <form name="ListCompanies" type="list" title="Internal Organizations" default-widget-style="linktext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="parties">
+ <field name="partyId" title="${uiLabelMap.Companies}" widget-style="tabletext"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
+ <field name="admin" title="Admin"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="Admin"/></field>
+ <field name="accounts" title="Accounts"><hyperlink target="ListGlAccountOrganization?organizationPartyId=${partyId}" description="Accounts"/></field>
+ </form>
+
+ <form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference"
+ default-map-name="partyAcctgPreference" default-service-name="createPartyAcctgPreference"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <auto-fields-service service-name="createPartyAcctgPreference"/>
+ <!-- the partyId is always displayed -->
+ <field name="partyId" title="Organization Party Id"><display/></field>
+ <!-- if there is no partyAcctgPreference yet, then we show drop-downs for the fields and a submit button -->
+ <field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <option key="1" description="01-Jan"/>
+ <option key="2" description="02-Feb"/>
+ <option key="3" description="03-Mar"/>
+ <option key="4" description="04-Apr"/>
+ <option key="5" description="05-May"/>
+ <option key="6" description="06-Jun"/>
+ <option key="7" description="07-Jul"/>
+ <option key="8" description="08-Aug"/>
+ <option key="9" description="09-Sep"/>
+ <option key="10" description="10-Oct"/>
+ <option key="11" description="11-Nov"/>
+ <option key="12" description="12-Dec"/>
+ </drop-down>
+ </field>
+ <field name="fiscalYearStartDay" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <option key="1"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
+ <option key="6"/><option key="7"/><option key="8"/><option key="9"/><option key="10"/>
+ <option key="11"/><option key="12"/><option key="13"/><option key="14"/><option key="15"/>
+ <option key="16"/><option key="17"/><option key="18"/><option key="19"/><option key="20"/>
+ <option key="21"/><option key="22"/><option key="23"/><option key="24"/><option key="25"/>
+ <option key="26"/><option key="27"/><option key="28"/><option key="29"/><option key="30"/>
+ <option key="31"/>
+ </drop-down>
+ </field>
+
+ <field name="taxFormId" title="Tax Form for Organization" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="TAX_FORMS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="cogsMethodId" title="Cost Of Goods Sold (COGS) Method" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="baseCurrencyUomId" title="Base Currency" use-when="partyAcctgPreference==null">
+ <drop-down no-current-selected-key="USD">
+ <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+ <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="invoiceIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
+ <field name="invoiceSequenceEnumId" title="Invoice Sequence" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference==null">
+ <drop-down allow-empty="true">
+ <option key="Y"/><option key="N"/>
+ </drop-down>
+ </field>
+
+ <field name="quoteIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
+ <field name="quoteSequenceEnumId" title="Quote Sequence" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="orderIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
+ <field name="orderSequenceEnumId" title="Order Sequence" use-when="partyAcctgPreference==null">
+ <drop-down>
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submit" title="Create" use-when="partyAcctgPreference==null"><submit/></field>
+
+ <!-- otherwise, we just display the fields. there is no submit button because we shouldn't try to create it again and don't support an update option right now-->
+ <field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="taxFormId" title="Tax Form for Organization" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="cogsMethodId" title="Cost Of Goods Sold (COGS) Method" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="baseCurrencyUomId" title="Base Currency" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="invoiceSequenceEnumId" title="Invoice Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null"><display/></field>
+
+ <field name="quoteSequenceEnumId" title="Quote Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="orderSequenceEnumId" title="Order Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="orderIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="lastOrderNumber" use-when="partyAcctgPreference!=null"><display/></field>
+ <!--
+ <field name="quoteSequenceEnumId" type="id-ne"/>
+ <field name="quoteIdPrefix" type="very-short"/>
+ <field name="lastQuoteNumber" type="numeric"/>
+ <field name="orderSequenceEnumId" type="id-ne"/>
+ <field name="orderIdPrefix" type="very-short"/>
+ <field name="lastOrderNumber" type="numeric"/>
+-->
+ <!-- these 2 are ONLY displayed, never allow manual editing -->
+ <field name="lastInvoiceNumber"><display/></field>
+ <field name="lastInvoiceRestartDate"><display/></field>
+ </form>
+
+ <form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="transactions">
+ <field name="acctgTransId" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
+ </field>
+ <field name="transactionDate"><display/></field>
+ <field name="acctgTransTypeId" title="Type"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
+ <field name="glFiscalTypeId" title="Type"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
+ </field>
+ <field name="invoiceId" use-when="invoiceId==null"><display/></field>
+ <field name="paymentId" use-when="paymentId!=null">
+ <hyperlink also-hidden="false" description="${paymentId}" target="editPayment?paymentId=${paymentId}"/>
+ </field>
+ <field name="paymentId" use-when="paymentId==null"><display/></field>
+ <field name="partyId"><display/></field>
+ <field name="post" title="Post Transaction" widget-style="buttontext">
+ <hyperlink description="Post Transaction" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}" also-hidden="false"/>
+ </field>
+ </form>
+
+
+ <!-- forms for managing FX rates -->
+ <form name="ListConversions" type="list" title="Foreign Exchange Conversion Rates" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="conversions">
+ <field name="uomId" title="From Currency"><display/></field>
+ <field name="uomIdTo" title="To Currency"><display/></field>
+ <field name="conversionFactor" title="Rate"><display/></field>
+ <field name="fromDate" title="From"><display/></field>
+ <field name="thruDate" title="Thru"><display/></field>
+ </form>
+
+ <form name="updateFXConversion" type="single" title="Update Exchange Rate" target="updateFXConversion"
+ default-service-name="updateFXConversion"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="uomId" title="From Currency">
+ <drop-down no-current-selected-key="USD">
+ <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+ <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="uomIdTo" title="To Currency">
+ <drop-down no-current-selected-key="USD">
+ <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+ <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="conversionFactor" title="Conversion Factor"><text/></field>
+ <field name="submit" title="Updated Exchange Rate"><submit/></field>
+ </form>
+
+ <!-- forms for Sales invoice Itemtypes to GLAccount number -->
+ <form name="ListSalInvoiceItemTypeGlAssignments" type="list" title="Invoice Item types to GL account mapping" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="invoiceItemTypes" >
+ <actions>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh"/>
+ </actions>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="invoiceItemTypeId"><hidden/></field>
+ <field name="description"><display/></field>
+ <field name="defaultGlAccountId"><display/></field>
+ <field name="overrideGlAccountId"><display/></field>
+ <field name="activeGlDescription"><display/></field>
+ <field name="remove" title=" "><hyperlink target="removeSalInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field>
+ </form>
+ <form name="AddSalInvoiceItemTypeGlAssignment" type="single" title="Add GL to Invoice Itemtype for a certain organisation" target="addSalInvoiceItemTypeGlAssignment"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="invoiceItemTypeId" title="Sales Invoice Item Type">
+ <drop-down allow-empty="false" >
+ <entity-options description="${description}" entity-name="InvoiceItemType">
+ <entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glAccountId" title="Override Revenue Gl Account Id">
+ <drop-down>
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
+ <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
+ <entity-constraint name="glAccountClassId" operator="equals" value="REVENUE"></entity-constraint>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="submit" title="Save"><submit/></field>
+ </form>
+
+ <!-- forms for Purchase invoice Itemtypes to GLAccount number -->
+ <form name="ListPurInvoiceItemTypeGlAssignments" type="list" title="Invoice Item types to GL account mapping" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="purinvoiceItemTypes" default-map-name="iTypes" >
+ <actions>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh"/>
+ </actions>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="invoiceItemTypeId"><hidden/></field>
+ <field name="description"><display/></field>
+ <field name="defaultGlAccountId"><display/></field>
+ <field name="glAccountId" title="Override GL Account Id"><display/></field>
+ <field name="activeGlDescription"><display/></field>
+ <field name="remove" title=" "><hyperlink target="removePurInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field>
+ </form>
+ <form name="AddPurInvoiceItemTypeGlAssignment" type="single" title="Add GL to Invoice Itemtype for a certain organisation" target="addPurInvoiceItemTypeGlAssignment"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="invoiceItemTypeId" title="Purchase invoice Item Type">
+ <drop-down allow-empty="false" >
+ <entity-options description="${description}" entity-name="InvoiceItemType">
+ <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV_%"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glAccountId" title="Override Expense Gl Account Id">
+ <drop-down>
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
+ <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
+ <entity-constraint name="glAccountClassId" operator="equals" value="EXPENSE"></entity-constraint>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="submit" title="Save"><submit/></field>
+ </form>
+
+ <!-- forms for payment types to GLAccount type -->
+ <form name="ListPaymentTypeGlAssignments" type="list" title="Payment types to GL account mapping" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext">
+ <actions>
+ <entity-condition entity-name="PaymentGlAccountTypeMap">
+ <condition-expr field-name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
+ <order-by field-name="paymentTypeId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-entity entity-name="PaymentGlAccountTypeMap" default-field-type="display"/>
+ <field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field>
+ <field name="glAccountTypeId"><display-entity entity-name="GlAccountType" description="${description}"/></field>
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="remove" title=" "><hyperlink target="removePaymentTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentTypeId=${paymentTypeId}" description="Remove"/></field>
+ </form>
+
+ <form name="AddPaymentTypeGlAssignment" type="single" title="Add GL to payment type" target="addPaymentTypeGlAssignment"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <auto-fields-service service-name="addPaymentTypeGlAssignment"/>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="paymentTypeId" title="Payment type">
+ <drop-down>
+ <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glAccountTypeId" title="Gl Account type">
+ <drop-down>
+ <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="submit" title="Save"><submit/></field>
+ </form>
+ <!-- forms for payment method Type to GLAccounts -->
+ <form name="ListPaymentMethodTypeGlAssignments" type="list" title="Payment method types to GL account mapping" default-widget-style="tabletext"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext">
+ <actions>
+ <entity-condition entity-name="PaymentMethodTypeGlAccount">
+ <condition-expr field-name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
+ <order-by field-name="paymentMethodTypeId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-entity entity-name="PaymentMethodTypeGlAccount" default-field-type="display"/>
+ <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field>
+ <field name="glAccountId"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]"/></field>
+ <field name="organizationPartyId"><hidden/></field>
+ <field name="remove" title=" "><hyperlink target="removePaymentMethodTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentMethodTypeId=${paymentMethodTypeId}" description="Remove"/></field>
+ </form>
+
+ <form name="AddPaymentMethodTypeGlAssignment" type="single" title="Add GL Account to payment method type" target="addPaymentMethodTypeGlAssignment"
+ default-widget-style="tabletext" default-title-style="tableheadtext">
+ <auto-fields-service service-name="addPaymentMethodTypeGlAssignment"/>
+ <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+ <field name="paymentMethodTypeId" title="Payment method type">
+ <drop-down>
+ <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glAccountId" title="Gl Account Id">
+ <drop-down>
+ <entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
+ <entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+
+ <field name="submit" title="Save"><submit/></field>
+ </form>
+
+ <form name="ListChecksToPrint" type="multi" list-name="payments" title="List Checks to Print" target="printChecks"
+ default-widget-style="tabletext" default-title-style="tableheadtext" separate-columns="true">
+ <field name="paymentId">
+ <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>
+ </field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
+ <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/>
+ </field>
+ <field name="amount" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="effectiveDate"><display/></field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonPrint}" widget-style="smallSubmit">
+ <submit/>
+ </field>
+ </form>
+ <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" title="List Checks to Send"
+ target="quickSendPayment?organizationPartyId=${organizationPartyId}"
+ default-widget-style="tabletext" default-title-style="tableheadtext" separate-columns="true">
+ <field name="paymentId"><hidden/></field>
+ <field name="paymentId">
+ <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>
+ </field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
+ <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId"/>
+ </field>
+ <field name="amount" widget-area-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
+ <field name="effectiveDate"><display/></field>
+ <field name="paymentRefNum"><text/></field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSend}" widget-style="smallSubmit"><submit/></field>
+ </form>
+</forms>
Property changes on: trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,40 @@
+<#--
+$Id: $
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if (parameters.organizationPartyId)?exists><#assign organizationPartyId = parameters.organizationPartyId></#if>
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+<div class="head1">${title?if_exists} ${labelTitleProperty?if_exists} for organization: ${organizationPartyId}</div>
+<div class="tabContainer">
+ <a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.TimePeriods?default(unselectedClassName)}">Time Periods</a>
+ <a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PartyAcctgPreference?default(unselectedClassName)}">Preferences</a>
+ <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ChecksTabButton?default(unselectedClassName)}">Checks</a>
+ <a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ViewFXConversions?default(unselectedClassName)}">Exchange Rates</a>
+ <a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.EditGlJournalEntry?default(unselectedClassName)}">Manual Journal Entry</a>
+ <a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ListUnpostedAcctgTrans?default(unselectedClassName)}">Manual Transaction Posting</a>
+ <a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.GlAccountAssignment?default(unselectedClassName)}">GL Account defaults</a>
+</div>
+<#if (page.tabButtonItem)?exists && page.tabButtonItem == "GlAccountAssignment">
+ <div>
+ <a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Sales Invoice]</a>
+ <a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Purchase Invoice]</a>
+ <a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Payment Type/GlAccnt Type]</a>
+ <a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Payment Method/Gl Accnt. Nr.]</a>
+ </div>
+ <br/>
+</#if>
Property changes on: trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Added: trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,56 @@
+<#--
+$Id: $
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<#-- TODO: probably some kind of permission checking to see that this userLogin can view such and such reports -->
+
+<div class="tabletext">
+
+<script language="javascript">
+function submitReconcile(form) {
+ form.action="<@ofbizUrl>ReconcileGlAccountOrganization</@ofbizUrl>";
+ form.submit();
+}
+
+function submitViewBalance(form) {
+ form.action="<@ofbizUrl>viewGlAccountBalance</@ofbizUrl>";
+ form.submit();
+}
+</script>
+
+<#if closedTimePeriods?has_content>
+<p>The following time periods have been closed:
+<ul type="circle">
+<#list closedTimePeriods as timePeriod>
+<li>${timePeriod.periodName?if_exists} ${timePeriod.periodNum?string("####")} (${timePeriod.fromDate} - ${timePeriod.thruDate})
+</#list>
+</ul></p>
+<p>
+<#else>
+<p>There are currently no closed time periods.</p>
+</#if>
+
+<#if (openTimePeriods?has_content) && (openTimePeriods.size() > 0)>
+<#assign timePeriod = openTimePeriods.get(0)>
+<a href="<@ofbizUrl>closeAllTimePeriods?organizationPartyId=${organizationPartyId}&customTimePeriodId=${timePeriod.customTimePeriodId}</@ofbizUrl>">
+Close time periods ending ${timePeriod.thruDate}
+</a>
+</p>
+<#else>
+<p>There are no time periods which can be closed.</p>
+</#if>
+</div>
Property changes on: trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Modified: trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/includes/appheader.ftl 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/webapp/accounting/includes/appheader.ftl 2006-03-02 00:13:05 UTC (rev 6879)
@@ -44,6 +44,7 @@
<div class="col"><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>" class="${selectedLeftClassMap.chartofaccounts?default(unselectedLeftClassName)}">${uiLabelMap.AccountingChartOfAcctsMenu}</a></div>
<div class="col"><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>" class="${selectedLeftClassMap.ListFixedAssets?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFixedAssets}</a></div>
<div class="col"><a href="<@ofbizUrl>FindTaxAuthority</@ofbizUrl>" class="${selectedLeftClassMap.TaxAuthorities?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTaxAuthorities}</a></div>
+ <div class="col"><a href="<@ofbizUrl>ListCompanies</@ofbizUrl>" class="${selectedLeftClassMap.companies?default(unselectedLeftClassName)}">${uiLabelMap.Companies}</a></div>
<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
<div class="col"><a href="<@ofbizUrl>FindGatewayResponses</@ofbizUrl>" class="${selectedLeftClassMap.transaction?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTransactions}</a></div>
Modified: trunk/applications/accounting/widget/AccountingScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingScreens.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/widget/AccountingScreens.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -324,53 +324,5 @@
</widgets>
</section>
</screen>
-
- <screen name="ViewGlAccountBalance">
- <section>
- <actions>
- <set field="title" value="GL Account Balances"/>
- <set field="labelTitleProperty" value="GL Account Balances"/>
- <set field="tabButtonItem" value="reconcileAccounts"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="glAccountId" from-field="parameters.glAccountId"/>
- <entity-and entity-name="GlReconciliation" list-name="glReconciliations">
- <field-map field-name="glAccountId"/>
- <field-map field-name="organizationPartyId"/>
- </entity-and>
- </actions>
- <widgets>
- <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListGlReconciliations" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
- <include-form name="GlAccountsNavForm" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
- <screen name="ViewGlReconciliation">
- <section>
- <actions>
- <set field="title" value="GL Reconciliation"/>
- <set field="headerItem" value="header item"/>
- <set field="labelTitleProperty" value="GL Reconciliation"/>
- <set field="glReconciliationId" from-field="parameters.glReconciliationId"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <set field="glAccountId" from-field="parameters.glAccountId"/>
- <entity-and entity-name="GlReconciliationEntry" list-name="glReconciliationEntries">
- <field-map field-name="glReconciliationId"/>
- </entity-and>
- </actions>
- <widgets>
- <decorator-screen name="mainAccountingDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListGlReconciliationEntries" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
- <include-form name="GlAccountsNavForm" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Added: trunk/applications/accounting/widget/AdminScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AdminScreens.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/widget/AdminScreens.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+
+ <screen name="ListCompanies">
+ <section>
+ <actions>
+ <set field="title" value="Available Internal Organizations"/>
+ <set field="headerItem" value="companies"/>
+ <set field="labelTitleProperty" value="Internal Organizations"/>
+ <entity-condition entity-name="PartyRole" list-name="parties">
+ <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="mainAccountingDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListCompanies" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="AdminMain">
+ <section>
+ <actions>
+ <set field="labelTitleProperty" value="Time Periods"/>
+ <set field="tabButtonItem" value="TimePeriods"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <entity-condition entity-name="CustomTimePeriod" list-name="openTimePeriods">
+ <condition-list>
+ <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="isClosed" operator="equals" value="N"/>
+ </condition-list>
+ <order-by field-name="thruDate"/>
+ </entity-condition>
+ <entity-condition entity-name="CustomTimePeriod" list-name="closedTimePeriods">
+ <condition-list>
+ <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="isClosed" operator="equals" value="Y"/>
+ </condition-list>
+ <order-by field-name="periodTypeId"/>
+ <order-by field-name="periodNum"/>
+ <order-by field-name="thruDate"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/admin/timePeriods.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="PartyAcctgPreference">
+ <section>
+ <actions>
+ <set field="labelTitleProperty" value="Accounting Preferences"/>
+ <set field="tabButtonItem" value="PartyAcctgPreference"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyId" from-field="parameters.organizationPartyId"/>
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="PartyAcctgPreference" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ListUnpostedAcctgTrans">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="ListUnpostedAcctgTrans"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ <set field="labelTitleProperty" value="Un-posted Accounting Transactions"/>
+ <set field="partyId" from-field="parameters.organizationPartyId"/>
+ <entity-condition entity-name="AcctgTrans" list-name="transactions">
+ <condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
+ <order-by field-name="transactionDate"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListUnpostedAcctgTrans" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <!-- Screen to view and manage foreign exchange conversions -->
+ <screen name="ViewFXConversions">
+ <section>
+ <actions>
+ <set field="labelTitleProperty" value="Foreign Exchange Rates"/>
+ <set field="tabButtonItem" value="ViewFXConversions"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ <!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are
+ stored in UomConversion, we need to change the logic here -->
+ <entity-condition entity-name="UomConversionDated" list-name="conversions">
+ <order-by field-name="uomId"/>
+ <order-by field-name="uomIdTo"/>
+ <order-by field-name="fromDate"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListConversions" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ <label style="head1">${uiLabelMap.AccountingUpdateFX}</label>
+ <include-form name="updateFXConversion" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="GlAccountSalInvoice">
+ <section>
+ <actions>
+ <set field="title" value="GL Account Assignments"/>
+ <set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <container><label style="head1">Sales Invoice type to Revenue GL Account Number assignmentlist</label></container>
+ <include-form name="ListSalInvoiceItemTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ <container><label style="head1">Assign Sales Invoice type to Revenue GL Account Number</label></container>
+ <include-form name="AddSalInvoiceItemTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="GlAccountPurInvoice">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <container><label style="head1">Purchase Invoice type to Expense GL Account Number assignmentlist</label></container>
+ <container>
+ <include-form name="ListPurInvoiceItemTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </container>
+ <container><label style="head1">Assign Purchase Invoice Item type to Expense GL Account Number</label></container>
+ <include-form name="AddPurInvoiceItemTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="GlAccountTypePaymentType">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <container><label style="head1">Payment type to GL Account type assignment list</label></container>
+ <include-form name="ListPaymentTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ <container><label style="head1">Assign Payment type to GL Account Type</label></container>
+ <include-form name="AddPaymentTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="GlAccountNrPaymentMethod">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="GlAccountAssignment"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <container><label style="head1">Payment methods to GL Account numbers assigmentlist</label></container>
+ <include-form name="ListPaymentMethodTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ <container><label style="head1">Assign Payment method type to GL Account number></label></container>
+ <include-form name="AddPaymentMethodTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <!-- generates the subtab of [Checks] using AdminChecksTabBar -->
+ <screen name="CommonAdminChecksDecorator">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <container>
+ <label style="head1" text="${title}"/>
+ </container>
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/admin/AdminChecksTabBar.ftl"/></html>
+ </platform-specific>
+
+ <decorator-section-include name="checks-body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ListChecksToPrint">
+ <section>
+ <actions>
+ <set field="title" value="Checks to Print"/>
+ <set field="tabButtonItem" value="ChecksTabButton"/>
+ <set field="checksTabButtonItem" value="PrintChecksTabButton"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+
+ <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
+ <entity-condition entity-name="Payment" list-name="payments">
+ <condition-list combine="and">
+ <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <condition-list combine="or">
+ <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
+ <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="effectiveDate"/>
+ </entity-condition>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminChecksDecorator">
+ <decorator-section name="checks-body">
+ <section>
+ <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition>
+ <widgets>
+ <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.AccountingPrintChecksPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ListChecksToSend">
+ <section>
+ <actions>
+ <set field="title" value="Mark Checks Sent"/>
+ <set field="tabButtonItem" value="ChecksTabButton"/>
+ <set field="checksTabButtonItem" value="SendChecksTabButton"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
+
+ <!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
+ <entity-condition entity-name="Payment" list-name="payments">
+ <condition-list combine="and">
+ <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <condition-list combine="or">
+ <condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
+ <condition-expr field-name="paymentMethodTypeId" operator="equals" value="COMPANY_CHECK"/>
+ </condition-list>
+ </condition-list>
+ <order-by field-name="effectiveDate"/>
+ </entity-condition>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.bsh"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonAdminChecksDecorator">
+ <decorator-section name="checks-body">
+ <section>
+ <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition>
+ <widgets>
+ <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
Property changes on: trunk/applications/accounting/widget/AdminScreens.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml 2006-03-01 23:08:15 UTC (rev 6878)
+++ trunk/applications/accounting/widget/CommonScreens.xml 2006-03-02 00:13:05 UTC (rev 6879)
@@ -232,6 +232,29 @@
</widgets>
</section>
</screen>
+
+ <screen name="CommonAdminDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="companies"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="mainAccountingDecorator">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://accounting/webapp/accounting/admin/AdminTabBar.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="main">
<section>
More information about the Svn
mailing list