Skip to content

erp5
erp5
Commit 99cbd1cf authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Set .figure css class for fields where it was missing 

Fix source / destination section in PurchaseInvoiceTransaction_viewDetails
Modify Purchase Invoice and Sale Invoice forms so that they have consistent UI

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7368 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a2bdd584
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 119 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source_credit.xml
View file @ 99cbd1cf
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string>align=\'right\'</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_view/listbox_source_debit.xml
View file @ 99cbd1cf
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string>align=\'right\'</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails.xml
View file @ 99cbd1cf
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
<string>listbox_title</string> <string>listbox_title</string>
<string>listbox_source</string> <string>listbox_source</string>
<string>listbox_destination</string> <string>listbox_destination</string>
<string>listbox_source_debit</string> <string>listbox_destination_credit</string>
<string>listbox_source_credit</string> <string>listbox_destination_debit</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -103,10 +103,11 @@ ...@@ -103,10 +103,11 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_source_section</string>
<string>my_source_reference</string>
<string>my_title</string> <string>my_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_destination_reference</string>
<string>my_source_section_title</string>
<string>my_source_reference</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_resource</string> <string>my_resource</string>
</list> </list>
...@@ -119,7 +120,6 @@ ...@@ -119,7 +120,6 @@
<string>my_start_date</string> <string>my_start_date</string>
<string>my_stop_date</string> <string>my_stop_date</string>
<string>my_description</string> <string>my_description</string>
<string>my_destination_reference</string>
<string>my_translated_simulation_state_title</string> <string>my_translated_simulation_state_title</string>
</list> </list>
</value> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox.xml
View file @ 99cbd1cf
...@@ -338,32 +338,36 @@ ...@@ -338,32 +338,36 @@
<string>ID</string> <string>ID</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source</string> <string>destination</string>
<string>Customer Account</string> <string>Vendor Account</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_debit</string> <string>destination_debit</string>
<string>Debit</string> <string>Debit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_credit</string> <string>destination_credit</string>
<string>Credit</string> <string>Credit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination</string> <string>source</string>
<string>Vendor Account</string> <string>Customer Account</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_debit</string> <string>source_debit</string>
<string>Debit</string> <string>Debit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_credit</string> <string>source_credit</string>
<string>Credit</string> <string>Credit</string>
</tuple> </tuple>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -401,11 +405,11 @@ ...@@ -401,11 +405,11 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>source_debit</string> <string>destination_debit</string>
<string>Debit</string> <string>Debit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_credit</string> <string>destination_credit</string>
<string>Credit</string> <string>Credit</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -480,7 +484,7 @@ ...@@ -480,7 +484,7 @@
</item> </item>
<item> <item>
<key> <string>search</string> </key> <key> <string>search</string> </key>
<value> <string></string> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>search_columns</string> </key> <key> <string>search_columns</string> </key>
...@@ -515,7 +519,9 @@ ...@@ -515,7 +519,9 @@
</item> </item>
<item> <item>
<key> <string>stat_columns</string> </key> <key> <string>stat_columns</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>stat_method</string> </key> <key> <string>stat_method</string> </key>
...@@ -527,7 +533,9 @@ ...@@ -527,7 +533,9 @@
</item> </item>
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -549,7 +557,7 @@ ...@@ -549,7 +557,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>method_name</string> </key> <key> <string>method_name</string> </key>
<value> <unicode>AccountingTransaction_searchInvoiceTransactionLines</unicode> </value> <value> <string>AccountingTransaction_searchInvoiceTransactionLines</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source_debit.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination_credit.xml
View file @ 99cbd1cf
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_source_debit</string> </value> <value> <string>listbox_destination_credit</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_source_credit.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/listbox_destination_debit.xml
View file @ 99cbd1cf
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_source_credit</string> </value> <value> <string>listbox_destination_debit</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/my_destination_reference.xml
View file @ 99cbd1cf
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Vendor Transaction Reference</string> </value> <value> <string>Customer Transaction Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/my_destination_section_title.xml
View file @ 99cbd1cf
...@@ -277,13 +277,19 @@ ...@@ -277,13 +277,19 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>container_getter_id</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <string></string> </value> <value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>default_module</string> </key> <key> <string>default_module</string> </key>
...@@ -347,6 +353,14 @@ ...@@ -347,6 +353,14 @@
<key> <string>max_length</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>parameter_list</string> </key> <key> <string>parameter_list</string> </key>
<value> <value>
...@@ -388,7 +402,7 @@ ...@@ -388,7 +402,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Vendor</string> </value> <value> <string>Customer</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/my_source_reference.xml
View file @ 99cbd1cf
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Transaction Reference</string> </value> <value> <string>Vendor Transaction Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails/my_title.xml
View file @ 99cbd1cf
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source_credit.xml
View file @ 99cbd1cf
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string>align=\'right\'</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewAccounting/listbox_source_debit.xml
View file @ 99cbd1cf
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string>figure</string> </value>
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string>align=\'right\'</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails.xml
View file @ 99cbd1cf
...@@ -103,10 +103,11 @@ ...@@ -103,10 +103,11 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>my_destination_section_title</string>
<string>my_source_section_title</string> <string>my_source_section_title</string>
<string>my_source_reference</string>
<string>my_destination_section_title</string>
<string>my_destination_reference</string>
<string>my_resource</string> <string>my_resource</string>
<string>my_causality_title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -117,6 +118,7 @@ ...@@ -117,6 +118,7 @@
<string>my_start_date</string> <string>my_start_date</string>
<string>my_stop_date</string> <string>my_stop_date</string>
<string>my_description</string> <string>my_description</string>
<string>my_causality_title</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/my_resource.xml
View file @ 99cbd1cf
...@@ -124,9 +124,7 @@ ...@@ -124,9 +124,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -163,7 +161,7 @@ ...@@ -163,7 +161,7 @@
<item> <item>
<key> <string>items</string> </key> <key> <string>items</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -270,25 +268,6 @@ ...@@ -270,25 +268,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/l0/getDefaultResource | nothing</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewDetails/my_title.xml
View file @ 99cbd1cf
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7