From 96bd2ff6a70871182721dc2303c660157109ddd1 Mon Sep 17 00:00:00 2001
From: Yusuke Muraoka <yusuke@nexedi.com>
Date: Thu, 8 Apr 2010 03:54:55 +0000
Subject: [PATCH] 2010-04-08 yusuke * Reverted previous my change.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34345 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_types/Balance%20Transaction.xml | 4 +-
.../AccountingTransaction_init.xml | 4 +-
.../BalanceTransaction_init.xml | 124 ------------------
.../PaymentTransaction_init.xml | 4 +-
.../SaleInvoiceTransaction_init.xml | 4 +-
bt5/erp5_accounting/bt/change_log | 3 +
bt5/erp5_accounting/bt/revision | 2 +-
7 files changed, 10 insertions(+), 135 deletions(-)
delete mode 100644 bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_init.xml
diff --git a/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Balance%20Transaction.xml b/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Balance%20Transaction.xml
index b2e8d7111d..540a723e5b 100644
--- a/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Balance%20Transaction.xml
+++ b/bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Balance%20Transaction.xml
@@ -48,7 +48,9 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string>BalanceTransaction_init</string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>permission</string> </key>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml
index 663f7325a1..3b4e48c5ce 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml
@@ -55,15 +55,13 @@
<key> <string>_body</string> </key>
<value> <string>transaction = context\n
\n
-transaction.Delivery_generateReference()\n
-\n
if kw.get(\'created_by_builder\', 0): \n
return\n
\n
transaction.newContent(portal_type=\'Accounting Transaction Line\', )\n
transaction.newContent(portal_type=\'Accounting Transaction Line\', )\n
\n
-transaction.AccountingTransaction_initFromPreferences()\n
+context.AccountingTransaction_initFromPreferences()\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_init.xml
deleted file mode 100644
index a076ccb5b8..0000000000
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_init.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>context.Delivery_generateReference()\n
-</string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>*args, **kw</string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>args</string>
- <string>kw</string>
- <string>_getattr_</string>
- <string>context</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>BalanceTransaction_init</string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml
index 6270dec99a..f03250e6ee 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml
@@ -55,8 +55,6 @@
<key> <string>_body</string> </key>
<value> <string>transaction = context\n
\n
-transaction.Delivery_generateReference()\n
-\n
if kw.get(\'created_by_builder\', 0): \n
return\n
\n
@@ -67,7 +65,7 @@ transaction.newContent(portal_type=\'Accounting Transaction Line\',\n
transaction.newContent(portal_type=\'Accounting Transaction Line\',\n
id=\'bank\', )\n
\n
-transaction.AccountingTransaction_initFromPreferences()\n
+context.AccountingTransaction_initFromPreferences()\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml
index 2aa323d9ed..6bf2cc82c3 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml
@@ -55,8 +55,6 @@
<key> <string>_body</string> </key>
<value> <string>transaction = context\n
\n
-transaction.Delivery_generateReference()\n
-\n
if kw.get(\'created_by_builder\', 0): \n
return\n
\n
@@ -70,7 +68,7 @@ transaction.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
id=\'collected_vat\',\n
quantity=0, )\n
\n
-transaction.AccountingTransaction_initFromPreferences()\n
+context.AccountingTransaction_initFromPreferences()\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_accounting/bt/change_log b/bt5/erp5_accounting/bt/change_log
index bb9b108f5e..047b0d3f70 100644
--- a/bt5/erp5_accounting/bt/change_log
+++ b/bt5/erp5_accounting/bt/change_log
@@ -1,3 +1,6 @@
+2010-04-08 yusuke
+* Reverted previous my change.
+
2010-04-07 yusei
* Fix SimulationMovement_testPaymentSimulationRule.id attribute value.
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 8d9a6a7d20..019cce38b1 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1152
\ No newline at end of file
+1154
\ No newline at end of file
--
2.30.9