[Erp5-report] r25731 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 26 16:48:22 CET 2009
Author: fabien
Date: Thu Feb 26 16:48:20 2009
New Revision: 25731
URL: http://svn.erp5.org?rev=25731&view=rev
Log:
2009-02-26 fabien
* update PaySheetTransaction_view and PaySheetModel_view to display payment_condition_payment_date only if cutom payment_condition_trade_date is selected.
* fix typo
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getSocialServiceAddress.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml [utf8] Thu Feb 26 16:48:20 2009
@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -54,6 +56,12 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -73,6 +81,10 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_payment_date</string> </value>
</item>
@@ -90,4 +102,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getPaymentConditionTradeDate() == \'custom\'</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getSocialServiceAddress.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getSocialServiceAddress.xml?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getSocialServiceAddress.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getSocialServiceAddress.xml [utf8] Thu Feb 26 16:48:20 2009
@@ -60,10 +60,10 @@
if the line_number is None, return all the address lines\n
\'\'\'\n
\n
-social_insurance_annotationi_line_value = \\\n
+social_insurance_annotation_line_value = \\\n
context.getSocialInsuranceAnnotationLineValue()\n
-if social_insurance_annotationi_line_value is not None:\n
- organisation = social_insurance_annotationi_line_value.getSourceValue()\n
+if social_insurance_annotation_line_value is not None:\n
+ organisation = social_insurance_annotation_line_value.getSourceValue()\n
else:\n
return \'\'\n
\n
@@ -121,7 +121,7 @@
<string>line_number</string>
<string>_getattr_</string>
<string>context</string>
- <string>social_insurance_annotationi_line_value</string>
+ <string>social_insurance_annotation_line_value</string>
<string>None</string>
<string>organisation</string>
<string>street_address</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml [utf8] Thu Feb 26 16:48:20 2009
@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -54,6 +56,12 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -73,6 +81,10 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_payment_date</string> </value>
</item>
@@ -90,4 +102,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getPaymentConditionTradeDate() == \'custom\'</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Thu Feb 26 16:48:20 2009
@@ -1,3 +1,6 @@
+2009-02-26 fabien
+* update PaySheetTransaction_view and PaySheetModel_view to display payment_condition_payment_date only if cutom payment_condition_trade_date is selected.
+
2009-02-04 fabien
* when a specialise model is defined on a paysheet, apply it automatically
* rewrite the apply model script
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Thu Feb 26 16:48:20 2009
@@ -1,1 +1,1 @@
-353
+355
More information about the Erp5-report
mailing list