svn commit: r647808 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: jacopoc
Date: Mon Apr 14 07:16:03 2008 New Revision: 647808 URL: http://svn.apache.org/viewvc?rev=647808&view=rev Log: Improved the gl mappings for parties; misc improvements to the ui for acctg transactions. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=647808&r1=647807&r2=647808&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Apr 14 07:16:03 2008 @@ -1211,6 +1211,10 @@ <value xml:lang="en">Comparative Balance Sheet</value> <value xml:lang="th">à¹à¸à¸£à¸µà¸¢à¸à¹à¸à¸µà¸¢à¸à¸à¸à¸à¸¸à¸¥</value> </property> + <property key="AccountingCompleteAcctgTransFields"> + <value xml:lang="en">Complete transaction fields</value> + <value xml:lang="it">Completa i campi della transazione</value> + </property> <property key="AccountingCopyAgreement"> <value xml:lang="ar">Ùسخ اÙإتÙاÙÙØ©</value> <value xml:lang="en">Copy Agreement</value> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=647808&r1=647807&r2=647808&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Mon Apr 14 07:16:03 2008 @@ -277,6 +277,7 @@ <set field="getGlAccountFromAccountTypeInMap.debitCreditFlag" from-field="acctgTransEntry.debitCreditFlag"/> <set field="getGlAccountFromAccountTypeInMap.productId" from-field="acctgTransEntry.productId"/> <set field="getGlAccountFromAccountTypeInMap.partyId" from-field="acctgTrans.partyId"/> + <set field="getGlAccountFromAccountTypeInMap.roleTypeId" from-field="acctgTrans.roleTypeId"/> <set field="getGlAccountFromAccountTypeInMap.invoiceId" from-field="acctgTrans.invoiceId"/> <set field="getGlAccountFromAccountTypeInMap.paymentId" from-field="acctgTrans.paymentId"/> <call-service service-name="getGlAccountFromAccountType" in-map-name="getGlAccountFromAccountTypeInMap"> @@ -351,6 +352,7 @@ <set field="getGlAccountFromAccountTypeInMap.debitCreditFlag" from-field="acctgTransEntry.debitCreditFlag"/> <set field="getGlAccountFromAccountTypeInMap.productId" from-field="acctgTransEntry.productId"/> <set field="getGlAccountFromAccountTypeInMap.partyId" from-field="parameters.partyId"/> + <set field="getGlAccountFromAccountTypeInMap.roleTypeId" from-field="parameters.roleTypeId"/> <set field="getGlAccountFromAccountTypeInMap.invoiceId" from-field="parameters.invoiceId"/> <set field="getGlAccountFromAccountTypeInMap.paymentId" from-field="parameters.paymentId"/> <call-service service-name="getGlAccountFromAccountType" in-map-name="getGlAccountFromAccountTypeInMap"> @@ -430,47 +432,16 @@ <return/> </if-not-empty> </if-compare> - <!-- for invoices and payments, check first if there is a party specific account mapping defined for the account type --> + <!-- check first if there is a party specific account mapping defined for the account type --> <if> <condition> <and> - <or> - <and> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="OUTGOING_PAYMENT"/> - <if-compare field-name="parameters.debitCreditFlag" operator="equals" value="C"/> - </and> - <and> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="INCOMING_PAYMENT"/> - <if-compare field-name="parameters.debitCreditFlag" operator="equals" value="D"/> - </and> - <and> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="PURCHASE_INVOICE"/> - <if-compare field-name="parameters.debitCreditFlag" operator="equals" value="D"/> - </and> - <and> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="SALES_INVOICE"/> - <if-compare field-name="parameters.debitCreditFlag" operator="equals" value="C"/> - </and> - </or> <not><if-empty field-name="parameters.glAccountTypeId"/></not> <not><if-empty field-name="parameters.partyId"/></not> + <not><if-empty field-name="parameters.roleTypeId"/></not> </and> </condition> <then> - <if> - <condition> - <or> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="OUTGOING_PAYMENT"/> - <if-compare field-name="parameters.acctgTransTypeId" operator="equals" value="PURCHASE_INVOICE"/> - </or> - </condition> - <then> - <set field="roleTypeId" value="BILL_FROM_VENDOR"/> - </then> - <else> - <set field="roleTypeId" value="BILL_TO_CUSTOMER"/> - </else> - </if> <call-simple-method method-name="getPartyGlAccountInline"/> <if-not-empty field-name="partyGlAccount.glAccountId"> <field-to-result field-name="partyGlAccount.glAccountId" result-name="glAccountId"/> @@ -2308,7 +2279,7 @@ <entity-one entity-name="PartyGlAccount" value-name="partyGlAccount"> <field-map field-name="organizationPartyId" env-name="parameters.organizationPartyId"/> <field-map field-name="partyId" env-name="parameters.partyId"/> - <field-map field-name="roleTypeId" env-name="roleTypeId"/> + <field-map field-name="roleTypeId" env-name="parameters.roleTypeId"/> <field-map field-name="glAccountTypeId" env-name="parameters.glAccountTypeId"/> </entity-one> </simple-method> Modified: ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml?rev=647808&r1=647807&r2=647808&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_ledger.xml Mon Apr 14 07:16:03 2008 @@ -338,6 +338,7 @@ <attribute name="acctgTransTypeId" type="String" mode="IN" optional="true"/> <attribute name="debitCreditFlag" type="String" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="IN" optional="true"/> + <attribute name="roleTypeId" type="String" mode="IN" optional="true"/> <attribute name="productId" type="String" mode="IN" optional="true"/> <attribute name="paymentId" type="String" mode="IN" optional="true"/> <attribute name="invoiceId" type="String" mode="IN" optional="true"/> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=647808&r1=647807&r2=647808&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Mon Apr 14 07:16:03 2008 @@ -485,16 +485,16 @@ <alt-target use-when="acctgTransEntry==null" target="createAcctgTransEntry"/> <field name="organizationPartyId"><hidden/></field> <field name="acctgTransId"><hidden/></field> - <field name="acctgTransEntrySeqId"><hidden/></field> - <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"> - <drop-down> - <entity-options entity-name="AcctgTransType" description="${description}"> - <entity-order-by field-name="acctgTransTypeId"/> + <field name="acctgTransEntrySeqId"><hidden/></field> + <field name="acctgTransEntryTypeId" ><hidden value="_NA_"/></field> + <field name="description"><text size="30"/></field> + <field name="glAccountTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlAccountType" description="${description}"> + <entity-order-by field-name="glAccountTypeId"/> </entity-options> </drop-down> </field> - <field name="acctgTransEntryTypeId" ><hidden value="_NA_"/></field> - <field name="description"><text size="30"/></field> <field name="glAccountId"> <drop-down allow-empty="true"> <entity-options entity-name="GlAccountOrganizationAndClass" key-field-name="glAccountId" description="${glAccountId} ${accountName}"> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=647808&r1=647807&r2=647808&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Apr 14 07:16:03 2008 @@ -278,7 +278,7 @@ </container> <container style="screenlet-body"> <container> - <link text="${uiLabelMap.AccountingCompleteTransaction}" style="buttontext" target="completeAcctgTransEntries?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/> + <link text="${uiLabelMap.AccountingCompleteAcctgTransFields}" style="buttontext" target="completeAcctgTransEntries?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/> <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}&verifyOnly=Y"/> <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/> </container> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |