From d3ed80e2d943ccf62cc9874d61bc041ca9ae811b Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Tue, 17 Oct 2006 13:13:17 +0000
Subject: [PATCH] Use new InvoiceTransaction_* scripts instead of
SaleInvoiceTransaction_*.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10777 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_deliveries/pay_sheet_transaction_builder.xml | 2 +-
.../erp5_payroll/PaySheetTransaction_checkParameters.xml | 4 +++-
.../erp5_payroll/PaySheetTransaction_selectMovement.xml | 4 ++--
bt5/erp5_payroll/bt/change_log | 3 +++
bt5/erp5_payroll/bt/revision | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
index 1402c0abb1..c24922bd2b 100644
--- a/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
+++ b/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
@@ -137,7 +137,7 @@
</item>
<item>
<key> <string>delivery_select_method_id</string> </key>
- <value> <string>SaleInvoiceTransaction_selectDelivery</string> </value>
+ <value> <string>InvoiceTransaction_selectDelivery</string> </value>
</item>
<item>
<key> <string>description</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
index b34834bf8b..07615d27d8 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
@@ -99,7 +99,8 @@ if employee_obj.getMaritalStatusId() in (\'\', None):\n
if employer_obj.getCreationDate() in (\'\', None):\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_status_message=The+employer+must+have+an+organisation+creation+date\')\n
\n
-if employer_obj.getDefaultAddress().getZipCode() in (\'\', None):\n
+default_address = employer_obj.getDefaultAddress()\n
+if default_address in (\'\', None) or default_address.getZipCode() in (\'\', None):\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'?portal_status_message=The+employer+must+have+a+zip+code\')\n
\n
# parameters are OK, go to the pre-calculation form\n
@@ -157,6 +158,7 @@ return context.REQUEST.RESPONSE.redirect(context.absolute_url() + "/PaySheetTran
<string>None</string>
<string>employee_obj</string>
<string>employer_obj</string>
+ <string>default_address</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml
index 67ec6d2feb..cce42758b7 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml
@@ -79,10 +79,10 @@ kw[\'grand_parent_simulation_state\'] = [\'confirmed\']\n
kw.update(context.portal_catalog.buildSQLQuery(**kw))\n
\n
if DEBUG :\n
- LOG("SQL used = %s"%context.SaleInvoiceTransaction_zSelectMovement(src__=1, **kw))\n
+ LOG("SQL used = %s"%context.InvoiceTransaction_zSelectMovement(src__=1, **kw))\n
\n
movement_list = [] \n
-for movement in context.SaleInvoiceTransaction_zSelectMovement(**kw) :\n
+for movement in context.InvoiceTransaction_zSelectMovement(**kw) :\n
movement = movement.getObject()\n
if movement.getDeliveryValue() is None :\n
movement_list.append(movement)\n
diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log
index 7741159f99..719faebf2c 100644
--- a/bt5/erp5_payroll/bt/change_log
+++ b/bt5/erp5_payroll/bt/change_log
@@ -1,3 +1,6 @@
+2006-10-17 Kevin
+* Add Pay Sheet Transaction as deault type in Accounting Module.
+
2006-09-07 Kevin
* Add "Réduction Fillon" service and line.
* Include unit/time/month category to describe social contributions.
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index bf0d87ab1b..7813681f5b 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-4
\ No newline at end of file
+5
\ No newline at end of file
--
2.30.9