Commit d3ed80e2 authored by Kevin Deldycke's avatar Kevin Deldycke

Use new InvoiceTransaction_* scripts instead of SaleInvoiceTransaction_*.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10777 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2e5a72cc
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
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.
......
4
\ No newline at end of file
5
\ 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