[Erp5-report] r34796 yusei - in /erp5/trunk/bt5/erp5_advanced_invoicing: ActionTemplateItem...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Apr 27 07:30:43 CEST 2010


Author: yusei
Date: Tue Apr 27 07:30:41 2010
New Revision: 34796

URL: http://svn.erp5.org?rev=34796&view=rev
Log:
2010-04-27 yusei
* Fix list view forms for sale/purchase invoice module.
* Fix purchase invoice default view action. View form for purchase invoice transaction was used.
* Remove detail action from purchase invoice portal type. It was not an action for purchase invoice.

Modified:
    erp5/trunk/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_invoice.xml
    erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
    erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
    erp5/trunk/bt5/erp5_advanced_invoicing/bt/change_log
    erp5/trunk/bt5/erp5_advanced_invoicing/bt/revision
    erp5/trunk/bt5/erp5_advanced_invoicing/bt/template_action_path_list

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_invoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice/view_invoice.xml?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_invoice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice/view_invoice.xml [utf8] Tue Apr 27 07:30:41 2010
@@ -33,7 +33,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -77,7 +79,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewInvoice</string> </value>
+            <value> <string>string:${object_url}/PurchaseInvoice_viewInvoice</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml [utf8] Tue Apr 27 07:30:41 2010
@@ -13,9 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>columns</string>
+                <string>search_columns</string>
+                <string>selection_name</string>
+                <string>sort</string>
+                <string>sort_columns</string>
                 <string>title</string>
-                <string>selection_name</string>
-                <string>columns</string>
               </list>
             </value>
         </item>
@@ -85,26 +88,22 @@
                           <string>Title</string>
                         </tuple>
                         <tuple>
-                          <string>delivery_mirror_section_title</string>
-                          <string>Third Party</string>
-                        </tuple>
-                        <tuple>
-                          <string>translated_portal_type</string>
-                          <string>Transaction Type</string>
-                        </tuple>
-                        <tuple>
-                          <string>operation_date</string>
-                          <string>Accounting Operation Date</string>
+                          <string>source_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
                         </tuple>
                         <tuple>
                           <string>reference</string>
                           <string>Document Reference</string>
                         </tuple>
                         <tuple>
-                          <string>specific_reference</string>
-                          <string>Transaction Reference</string>
-                        </tuple>
-                        <tuple>
                           <string>translated_simulation_state_title</string>
                           <string>State</string>
                         </tuple>
@@ -120,8 +119,81 @@
                     <value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
                 </item>
                 <item>
+                    <key> <string>search_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>source_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>reference</string>
+                          <string>Document Reference</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
                     <key> <string>selection_name</string> </key>
                     <value> <string>purchase_invoice_module_selection</string> </value>
+                </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>ASC</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>sort_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>source_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>reference</string>
+                          <string>Document Reference</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
+                    </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml [utf8] Tue Apr 27 07:30:41 2010
@@ -13,9 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>columns</string>
+                <string>search_columns</string>
+                <string>selection_name</string>
+                <string>sort</string>
+                <string>sort_columns</string>
                 <string>title</string>
-                <string>selection_name</string>
-                <string>columns</string>
               </list>
             </value>
         </item>
@@ -85,26 +88,22 @@
                           <string>Title</string>
                         </tuple>
                         <tuple>
-                          <string>delivery_mirror_section_title</string>
-                          <string>Third Party</string>
-                        </tuple>
-                        <tuple>
-                          <string>translated_portal_type</string>
-                          <string>Transaction Type</string>
-                        </tuple>
-                        <tuple>
-                          <string>operation_date</string>
-                          <string>Accounting Operation Date</string>
+                          <string>source_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
                         </tuple>
                         <tuple>
                           <string>reference</string>
                           <string>Document Reference</string>
                         </tuple>
                         <tuple>
-                          <string>specific_reference</string>
-                          <string>Transaction Reference</string>
-                        </tuple>
-                        <tuple>
                           <string>translated_simulation_state_title</string>
                           <string>State</string>
                         </tuple>
@@ -120,8 +119,81 @@
                     <value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
                 </item>
                 <item>
+                    <key> <string>search_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>source_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>reference</string>
+                          <string>Document Reference</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
                     <key> <string>selection_name</string> </key>
                     <value> <string>sale_invoice_module_selection</string> </value>
+                </item>
+                <item>
+                    <key> <string>sort</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>ASC</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>sort_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>source_section_title</string>
+                          <string>Supplier</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_section_title</string>
+                          <string>Client</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Invoice Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>reference</string>
+                          <string>Document Reference</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
+                    </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/bt/change_log?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/bt/change_log [utf8] Tue Apr 27 07:30:41 2010
@@ -1,3 +1,8 @@
+2010-04-27 yusei
+* Fix list view forms for sale/purchase invoice module.
+* Fix purchase invoice default view action. View form for purchase invoice transaction was used.
+* Remove detail action from purchase invoice portal type. It was not an action for purchase invoice.
+
 2010-04-08 yusuke
 * Reverted previous change.
 

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/bt/revision?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/bt/revision [utf8] Tue Apr 27 07:30:41 2010
@@ -1,1 +1,1 @@
-86
+88

Modified: erp5/trunk/bt5/erp5_advanced_invoicing/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_advanced_invoicing/bt/template_action_path_list?rev=34796&r1=34795&r2=34796&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_advanced_invoicing/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_advanced_invoicing/bt/template_action_path_list [utf8] Tue Apr 27 07:30:41 2010
@@ -4,7 +4,6 @@
 Purchase Invoice Transaction | jump_related_purchase_packing_list_advanced
 Purchase Invoice | apply_trade_condition
 Purchase Invoice | create_new_file
-Purchase Invoice | detail
 Purchase Invoice | document_list
 Purchase Invoice | jump_related_order
 Purchase Invoice | jump_related_purchase_invoice_transaction




More information about the Erp5-report mailing list