[Erp5-report] r10777 - in /erp5/trunk/bt5/erp5_payroll: PathTemplateItem/portal_deliveries/...

[nobody at svn.erp5.org]

Author: kevin
Date: Tue Oct 17 15:13:17 2006
New Revision: 10777

URL: http://svn.erp5.org?rev=10777&view=rev
Log:
Use new InvoiceTransaction_* scripts instead of SaleInvoiceTransaction_*.

Modified:
    erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml
    erp5/trunk/bt5/erp5_payroll/bt/change_log
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml?rev=10777&r1=10776&r2=10777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_transaction_builder.xml Tue Oct 17 15:13:17 2006
@@ -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>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml?rev=10777&r1=10776&r2=10777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.xml Tue Oct 17 15:13:17 2006
@@ -99,7 +99,8 @@
 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 @@
                             <string>None</string>
                             <string>employee_obj</string>
                             <string>employer_obj</string>
+                            <string>default_address</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml?rev=10777&r1=10776&r2=10777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_selectMovement.xml Tue Oct 17 15:13:17 2006
@@ -79,10 +79,10 @@
 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

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=10777&r1=10776&r2=10777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Tue Oct 17 15:13:17 2006
@@ -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.

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=10777&r1=10776&r2=10777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Tue Oct 17 15:13:17 2006
@@ -1,1 +1,1 @@
-4
+5