Dev - [Fwd: Re: [OFBiz] SVN: r6998 - in trunk/applications/accounting: config webapp/accounting/WEB-INF webapp/accounting/invoice webapp/accounting/payment widget]

[Si Chen-2]

Hans,

I agree with David on this as well.  Would you mind sending in another
patch?

Si


Hans,

In general rather than including pages from other applications it is probably better to just to an inter-app link to the page in the other application. As-is this will have some interesting issues with links and such and it can be confusing and inconvenient for the user.

-David



[hidden email] wrote:

> Author: hansbak
> Date: 2006-03-16 02:10:03 -0600 (Thu, 16 Mar 2006)
> New Revision: 6998
>
> Modified:
>    trunk/applications/accounting/config/
>    trunk/applications/accounting/config/AccountingConfig.properties
>    trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
>    trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
>    trunk/applications/accounting/webapp/accounting/invoice/InvoiceTabBar.ftl
>    trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
>    trunk/applications/accounting/widget/CommonScreens.xml
> Log:
>  changed the invoice tabbar to goback from ready->in process and make the party links in payment/invoice clickable
>
>
> Property changes on: trunk/applications/accounting/config
> ___________________________________________________________________
> Name: svn:ignore
>    + AccountingConfig.properties
>
>
> Modified: trunk/applications/accounting/config/AccountingConfig.properties
> ===================================================================
> --- trunk/applications/accounting/config/AccountingConfig.properties 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/config/AccountingConfig.properties 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -25,4 +25,4 @@
>  # value N: applying payments to every invoice item with the option to apply to an invoice as a whole
>  #value YY: do not show the option box to the user and do only invoice processing
>  #value NN: do not show the option box to the user and do only invoiceitem processing
> -invoiceProcessing=YY
> +invoiceProcessing=NN
>
> Modified: trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
> ===================================================================
> --- trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -802,6 +802,11 @@
>          <response name="error" type="view" value="EditTaxAuthorityPartyInfo"/>
>      </request-map>
>      
> +    <request-map uri="viewprofile">
> +        <security https="true" auth="true"/>
> +        <response name="success" type="view" value="viewprofile"/>
> +    </request-map>
> +
>      <!-- ================ Entity Lookup Requests ================= -->
>      <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
>      <request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map>
> @@ -1108,6 +1113,7 @@
>      <view-map name="LookupGlAccount" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupGlAccount"/>
>      <view-map name="LookupPayment" page="component://accounting/widget/LookupScreens.xml#LookupPayment" type="screen"/>
>      <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/>
> +    <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/>
>      
>      <!-- PDFs  -->
>      <view-map name="InvoicePDF" type="screenfop" page="component://accounting/widget/AccountingPrintForms.xml#InvoicePDF" content-type="application/pdf" encoding="none"/>
>
> Modified: trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
> ===================================================================
> --- trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -108,8 +108,8 @@
>          <field position="2" name="statusId"><display-entity entity-name="StatusItem"/></field>
>          <field position="1" name="description"><display/></field>
>          <field position="2" name="invoiceMessage"><display/></field>
> -        <field position="1" name="partyIdFrom" title="Party Billed From"><display description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]"/></field>
> -        <field position="2" name="partyId" title="Party Billed To"><display description="${partyNameResultTo.fullName} [${invoice.partyId}]"/></field>
> +        <field position="1" name="partyIdFrom" title="Party Billed From"><hyperlink target="viewprofile?partyId=${invoice.partyIdFrom}" description="${partyNameResultFrom.fullName} [${invoice.partyIdFrom}]"/></field>
> +        <field position="2" name="partyId" title="Party Billed To"><hyperlink target="viewprofile?partyId=${invoice.partyId}" description="${partyNameResultTo.fullName} [${invoice.partyId}]"/></field>
>          <field position="1" name="roleTypeId" title="${uiLabelMap.AccountingRoleType}"><display/></field>
>          <field position="2" name="billingAccountId" title="${uiLabelMap.AccountingBillingAccount}"><display/></field>
>          <field position="1" name="invoiceDate" title="${uiLabelMap.AccountingInvoiceDate}"><display/></field>
>
> Modified: trunk/applications/accounting/webapp/accounting/invoice/InvoiceTabBar.ftl
> ===================================================================
> --- trunk/applications/accounting/webapp/accounting/invoice/InvoiceTabBar.ftl 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/webapp/accounting/invoice/InvoiceTabBar.ftl 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -41,11 +41,15 @@
>  <a href="<@ofbizUrl>editInvoice</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a>
>  <a href="<@ofbizUrl>copyInvoice?invoiceIdToCopyFrom=${invoiceId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCopy}</a>
>  <a href="<@ofbizUrl>invoice.pdf?invoiceId=${invoice.invoiceId}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.AccountingInvoicePDF}</a>
> -<#if invoice.statusId == "INVOICE_IN_PROCESS">
> +<#if invoice.statusId == "INVOICE_IN_PROCESS" && invoice.invoiceTypeId == "SALES_INVOICE">
>      <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_READY</@ofbizUrl>" class="buttontext">Status to 'Ready'</a>
>  </#if>
> +<#if invoice.statusId == "INVOICE_IN_PROCESS" && invoice.invoiceTypeId == "PURCHASE_INVOICE">
> +    <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_RECEIVED</@ofbizUrl>" class="buttontext">Status to 'Received'</a>
> +</#if>
>  <#if invoice.statusId == "INVOICE_READY" && invoice.invoiceTypeId == "SALES_INVOICE">
>      <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_SENT</@ofbizUrl>"  class="buttontext">Status to 'Send'</a>
> +    <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_IN_PROCESS</@ofbizUrl>"  class="buttontext">Status to 'In Process'</a>
>  </#if>
>  <#if invoice.statusId == "INVOICE_SENT">
>      <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_PAID</@ofbizUrl>"  class="buttontext">status to 'Paid'</a>
> @@ -53,8 +57,8 @@
>  <#if invoice.statusId == "INVOICE_RECEIVED">
>      <a href="<@ofbizUrl>setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_PAID</@ofbizUrl>"  class="buttontext">status to 'Paid'</a>
>  </#if>
> -<#-- invoice cannot be cancelled if it is READY, PAID, SENT, or CANCELLED -->
> -<#if invoice.statusId == "INVOICE_IN_PROCESS" || invoice.statusId == "INVOICE_RECEIVED">
> +<#-- invoice cannot be cancelled if it is PAID or CANCELLED -->
> +<#if invoice.statusId != "INVOICE_PAID" && invoice.statusId != "INVOICE_CANCELLED">
>      <a href="javascript:confirmActionLink('You want to cancel this invoice number ${invoice.invoiceId}?','setInvoiceStatus?invoiceId=${invoice.invoiceId}&statusId=INVOICE_CANCELLED')" class="buttontext">Status to 'Cancelled'</a>
>  </#if>
>  </div>
>
> Modified: trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
> ===================================================================
> --- trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -242,13 +242,25 @@
>  
>      <form name="paymentHeader" type="single" title="Payment header information" default-map-name="payment"
>          default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
> +        <actions>
> +            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
> +                <field-map field-name="partyId" env-name="payment.partyIdFrom"/>
> +                <field-map field-name="compareDate" env-name="payment.effectiveDate"/>
> +                <field-map field-name="lastNameFirst" value="Y"/>
> +            </service>
> +            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
> +                <field-map field-name="partyId" env-name="payment.partyIdTo"/>
> +                <field-map field-name="compareDate" env-name="payment.effectiveDate"/>
> +                <field-map field-name="lastNameFirst" value="Y"/>
> +            </service>
> +        </actions>
>          <field name="paymentId"><hidden/></field>
>          <field name="paymentTypeId" position="1" title="Payment Type"><display-entity entity-name="PaymentType"/></field>
>          <field name="paymentMethodTypeId" position="2"><display-entity entity-name="PaymentMethodType"/></field>
>          <field name="statusId" position="1"><display-entity entity-name="StatusItem"/></field>
>          <field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${paymentMethodId}[${paymentMethodTypeId}]"/></field>
> -        <field name="partyIdFrom" position="1"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}, ${firstName} [${partyId}]"/></field>
> -        <field name="partyIdTo" position="2"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}, ${firstName} [${partyId}]"/></field>
> +        <field name="partyIdFrom" position="1"><hyperlink target="viewprofile?partyId=${payment.partyIdFrom}" description="${partyNameResultFrom.fullName} [${payment.partyIdTo}]"/></field>
> +        <field name="partyIdTo" position="2"><hyperlink target="viewprofile?partyId=${payment.partyIdTo}" description="${partyNameResultTo.fullName} [${payment.partyIdFrom}]"/></field>
>          <field name="paymentRefNum" position="1"><display/></field>
>          <field name="paymentPreferenceId" position="2"><display/></field>
>          <field name="amount" position="1"><display/></field>
>
> Modified: trunk/applications/accounting/widget/CommonScreens.xml
> ===================================================================
> --- trunk/applications/accounting/widget/CommonScreens.xml 2006-03-16 04:23:39 UTC (rev 6997)
> +++ trunk/applications/accounting/widget/CommonScreens.xml 2006-03-16 08:10:03 UTC (rev 6998)
> @@ -117,6 +117,38 @@
>          </section>
>      </screen>
>  
> +    <screen name="CommonPartyDecorator">
> +        <section>
> +            <widgets>
> +                <decorator-screen name="mainAccountingDecorator">
> +                    <decorator-section name="body">
> +                        <section>
> +                            <!-- do check for ACCOUNTING, _VIEW permission -->
> +                            <condition>
> +                                <if-has-permission permission="PARTYMGR" action="_VIEW"/>
> +                            </condition>
> +                            <widgets>
> +                                <section>
> +                                    <condition><not><if-empty field-name="invoiceId"/></not></condition>
> +                                    <widgets>
> +                                        <platform-specific>
> +                                            <html><html-template location="component://accounting/webapp/accounting/invoice/InvoiceTabBar.ftl"/></html>
> +                                        </platform-specific>
> +                                        <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${invoice.description} [${uiLabelMap.CommonId}:${invoiceId}]  ${${extraFunctionName}}</label>
> +                                    </widgets>
> +                                </section>
> +                                <decorator-section-include name="body"/>
> +                            </widgets>
> +                            <fail-widgets>
> +                                <label style="head3">${uiLabelMap.AcccountingViewPermissionError}</label>
> +                            </fail-widgets>
> +                        </section>                    
> +                    </decorator-section>
> +                </decorator-screen>
> +            </widgets>
> +        </section>
> +    </screen>
> +    
>      <screen name="CommonPaymentDecorator">
>          <section>
>              <actions>
>
>  
> _______________________________________________
> Svn mailing list
> [hidden email]
> http://lists.ofbiz.org/mailman/listinfo/svn

 

_______________________________________________
Svn mailing list
[hidden email]
http://lists.ofbiz.org/mailman/listinfo/svn


 
_______________________________________________
Dev mailing list
[hidden email]
http://lists.ofbiz.org/mailman/listinfo/dev