Skip to content

erp5
erp5
Commit 7a2071a5 authored by Yusuke Muraoka's avatar Yusuke Muraoka
Browse files
Options

2010-02-06 yusuke 

* Add a field for service recipient
* Update service destination of pay sheet line view to also allow person

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32293 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 34ccbbd7
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 5 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml
View file @ 7a2071a5
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_source_section_title</string> <string>my_source_section_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_destination_title</string>
<string>my_int_index</string> <string>my_int_index</string>
<string>my_price</string> <string>my_price</string>
<string>my_quantity</string> <string>my_quantity</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
View file @ 7a2071a5
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>description</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string> <string>catalog_index</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string> <string>proxy_listbox_ids</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The organisation that receives the service.</string> </value> <value> <string>The section that receives the service.</string> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -107,6 +107,10 @@ ...@@ -107,6 +107,10 @@
<string>Organisation</string> <string>Organisation</string>
<string>Organisation</string> <string>Organisation</string>
</tuple> </tuple>
<tuple>
<string>Person</string>
<string>Person</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -118,6 +122,10 @@ ...@@ -118,6 +122,10 @@
<string>OrganisationModule_viewOrganisationList/listbox</string> <string>OrganisationModule_viewOrganisationList/listbox</string>
<string>Organisations</string> <string>Organisations</string>
</tuple> </tuple>
<tuple>
<string>PersonModule_viewPersonList/listbox</string>
<string>Persons</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_title.xml 0 → 100644
View file @ 7a2071a5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>base_category</string>
<string>catalog_index</string>
<string>description</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_destination_title</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>base_category</string> </key>
<value> <string>destination</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The person that actually receives the service.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Person</string>
<string>Person</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list>
<tuple>
<string>PersonModule_viewPersonList/listbox</string>
<string>Persons</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Service Recipient</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/bt/change_log
View file @ 7a2071a5
2010-02-06 yusuke
* Add a field for service recipient
* Update service destination of pay sheet line view to also allow person
2010-01-31 yusei 2010-01-31 yusei
Add Payslip List Printout to Accounting Transaction Module. Add Payslip List Printout to Accounting Transaction Module.
......
bt5/erp5_payroll/bt/revision
View file @ 7a2071a5
547 548
\ No newline at end of file \ No newline at end of file
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