diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/calcul.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/calcul.xml index 04c243836481da8e9f37c639f2e1d7f6e5cca28f..d4ca82a104eb859206e3a8f92e3666a3f0b227c1 100644 --- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/calcul.xml +++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/calcul.xml @@ -30,7 +30,9 @@ </item> <item> <key> <string>condition</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -58,7 +60,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>(re)Calculation of the Pay Sheet Transaction</string> </value> + <value> <string>Calculation of the Pay Sheet Transaction</string> </value> </item> <item> <key> <string>visible</string> </key> @@ -86,4 +88,23 @@ </dictionary> </pickle> </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>Products.CMFCore.Expression</string> + <string>Expression</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>python: object.getSimulationState == \'draft\'</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index 719faebf2c71d5a0262d31276170a3a3b3ec8b5f..ef5aaac71aa4edcd08ef77b2f8f4e97e0a05389e 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,5 +1,7 @@ 2006-10-17 Kevin -* Add Pay Sheet Transaction as deault type in Accounting Module. +* Add Pay Sheet Transaction as default sub type in Accounting Module. +* Use new InvoiceTransaction_something scripts instead of SaleInvoiceTransaction_something. +* Don't show pay sheet calculation fast input action in states other than 'draft'. 2006-09-07 Kevin * Add "R茅duction Fillon" service and line. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 9a037142aa3c1b4c490e1a38251620f113465330..b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -10 \ No newline at end of file +21 \ No newline at end of file