diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Rule%20Cell/view_destination.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Rule%20Cell/view_destination.xml
index c8c233e6726a4143f84d47beeb1f85cba1d0106b..6f59d5237c64b03986d152c049d96cc83aa6c22a 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Rule%20Cell/view_destination.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Rule%20Cell/view_destination.xml
@@ -85,7 +85,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/AccountingRuleCell_viewSource</string> </value>
+ <value> <string>string:${object_url}/AccountingRuleCell_viewDestination</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml b/bt5/erp5_accounting/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
index 5d7ca3f60052269ed03104a6b90bf48d171f6afa..816b700e67defea469e15d1d58ebb24ff83abd07 100644
--- a/bt5/erp5_accounting/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
+++ b/bt5/erp5_accounting/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder.xml
@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>delivery_after_generation_script_id</string> </key>
- <value> <string>SaleInvoiceTransaction_postTransactionLineGeneration</string> </value>
+ <value> <string>InvoiceTransaction_postTransactionLineGeneration</string> </value>
</item>
<item>
<key> <string>delivery_cell_collect_order</string> </key>
@@ -139,7 +139,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_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination.xml
index aff397119b01f09cd2c758ad4fb757b5c1ee5fef..c5d1691b699aa2563fbde441c451bf45071c827c 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination.xml
@@ -140,7 +140,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>AccountingTransaction_view</string> </value>
+ <value> <string>AccountingRuleCell_viewDestination</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml
index 3207dcd012f40be2d5d6df0af4bf43192f7479c3..edfb443a8096cd9b73679f12c10575529f852717 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewDestination/listbox_destination.xml
@@ -281,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</string> </value>
+ <value> <string>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource.xml
index 5f9f404bbcd0b07fe5bd02f8153f941ff756c8ea..afad65a828d8f20dcc493559ba40d263b3087d61 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_viewSource.xml
@@ -134,7 +134,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>AccountingTransaction_view</string> </value>
+ <value> <string>AccountingRuleCell_viewSource</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGeneration.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGeneration.xml
index b9da01660c70d725e6c5c61342ee27bd4e2f2539..6e04c55a47b8f3aebc4a8a90f358603c2910d9a3 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGeneration.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGeneration.xml
@@ -77,7 +77,7 @@ sale_invoice = context\n
\n
sale_invoice.activate(\n
after_method_id=[\'immediateReindexObject\', \'recursiveImmediateReindexObject\']\n
- ).SaleInvoiceTransaction_postGenerationActivity(**kw)\n
+ ).InvoiceTransaction_postGenerationActivity(**kw)\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGenerationActivity.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGenerationActivity.xml
index 625dae38608de910917c75c0ea113970e149cdb9..16d3a4e52ada2892de92fe87cec917bed1d0e9d4 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGenerationActivity.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransaction_postGenerationActivity.xml
@@ -68,55 +68,55 @@
<key> <string>_body</string> </key>
<value> <string>#\n
# this script is called in an activity on the Sale Invoice Transaction\n
-# after the sale_invoice_builder delivery builder has created\n
+# after the invoice_builder delivery builder has created\n
# the new Sale Invoice Transaction\n
#\n
from ZODB.POSException import ConflictError \n
\n
-sale_invoice = context\n
+invoice = context\n
\n
LOG = lambda msg:context.log(\n
- "SaleInvoiceTransaction_postGenerationActivity on %s" % (sale_invoice.getPath()), msg)\n
+ "InvoiceTransaction_postGenerationActivity on %s" % (invoice.getPath()), msg)\n
\n
# set the causality relation \n
-sale_invoice.Delivery_setCausalityFromSimulation()\n
+invoice.Delivery_setCausalityFromSimulation()\n
\n
-related_packing_list = sale_invoice.getDefaultCausalityValue()\n
-#LOG(\'causality %s \' %sale_invoice.getCausalityValueList())\n
+related_packing_list = invoice.getDefaultCausalityValue()\n
+#LOG(\'causality %s \' %invoice.getCausalityValueList())\n
\n
# get a price_currency from the packing list\n
related_order = related_packing_list.getDefaultCausalityValue()\n
if related_order is not None :\n
price_currency = related_order.getPriceCurrency()\n
- sale_invoice.edit(\n
+ invoice.edit(\n
resource = price_currency,\n
price_currency = price_currency,\n
)\n
\n
# copy title, if not updating a new delivery\n
-if sale_invoice.getTitle() is None :\n
- sale_invoice.setTitle(related_packing_list.getTitle())\n
+if invoice.getTitle() is None :\n
+ invoice.setTitle(related_packing_list.getTitle())\n
\n
# initialize accounting_workflow to planned state\n
-if sale_invoice.getSimulationState() == \'draft\' : \n
+if invoice.getSimulationState() == \'draft\' : \n
try :\n
context.getPortalObject().portal_workflow.doActionFor(\n
- sale_invoice, \'plan_action\', wf_id=\'accounting_workflow\',\n
+ invoice, \'plan_action\', wf_id=\'accounting_workflow\',\n
comment = \'Initialized by Delivery Builder\',\n
skip_period_validation = 1 )\n
except (ConflictError, RuntimeError), e : raise\n
except Exception, e :\n
- LOG(\'Exception in plan_action\', e)\n
- if sale_invoice.getSimulationState() == \'draft\' : \n
+ LOG(\'Exception in plan_action %s\' % e)\n
+ if invoice.getSimulationState() == \'draft\' : \n
# call the workflow method, if the user cannot perform this operation.\n
- sale_invoice.plan()\n
+ invoice.plan()\n
\n
# First set the invoice in the building state on the causality workflow\n
-sale_invoice.startBuilding()\n
+invoice.startBuilding()\n
\n
# Then an activity should put the causality state in diverged or solved\n
# XXX after_method_id is not good, it should be after_group_id, but not yet implemented\n
-sale_invoice.activate(\n
+invoice.activate(\n
after_method_id = ( \'immediateReindexObject\',\n
\'recursiveImmediateReindexObject\',\n
)).updateCausalityState()\n
@@ -164,7 +164,7 @@ sale_invoice.activate(\n
<string>ZODB.POSException</string>
<string>ConflictError</string>
<string>context</string>
- <string>sale_invoice</string>
+ <string>invoice</string>
<string>LOG</string>
<string>_getattr_</string>
<string>related_packing_list</string>
diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml
index 3f6b465eb3b83dea250fda534bd36bac4ad6ea2d..987f5267090dffc7e4a0c42ccdc77414a3811ce8 100644
--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml
@@ -108,7 +108,7 @@ if destination_section is not None and \\\n
if destination_section is None and check_destination :\n
raiseError(\'Destination Section is not Defined.\')\n
\n
-currency = transaction.getResource()\n
+currency = transaction.getResource(portal_type = \'Currency\')\n
if not currency :\n
raiseError(\'Currency is not Defined.\')\n
\n