[Erp5-report] r10980 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 27 11:54:10 CEST 2006
Author: jerome
Date: Fri Oct 27 11:54:06 2006
New Revision: 10980
URL: http://svn.erp5.org?rev=10980&view=rev
Log:
Setting a Movement_getExplanationTitle attribute on the first line avoids the
need for is_previous_balance.
Also remove some ugly logs
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml?rev=10980&r1=10979&r2=10980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml Fri Oct 27 11:54:06 2006
@@ -675,7 +675,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(request.get(\'cell\', here), \'is_previous_balance\', False) or [(x[0], \'Movement_getExplanationUrl\') for x in form.listbox.get_value(\'columns\')]</string> </value>
+ <value> <string>python: [(x[0], \'Movement_getExplanationUrl\') for x in form.listbox.get_value(\'columns\')]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml?rev=10980&r1=10979&r2=10980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml Fri Oct 27 11:54:06 2006
@@ -709,7 +709,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: getattr(request.get(\'cell\', here), \'is_previous_balance\', False) or [(x[0], \'Movement_getExplanationUrl\') for x in form.listbox.get_value(\'columns\')]</string> </value>
+ <value> <string>python: [(x[0], \'Movement_getExplanationUrl\') for x in form.listbox.get_value(\'columns\')]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml?rev=10980&r1=10979&r2=10980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml Fri Oct 27 11:54:06 2006
@@ -113,8 +113,6 @@
**get_inventory_kw)\n
previous_total_credit = getInventoryAssetPrice(omit_input =True,\n
**get_inventory_kw)\n
- context.log(\'previous credit (%s) %s\' % (get_inventory_kw, previous_total_credit),\n
- getInventoryAssetPrice(omit_input=True, src__=1, **get_inventory_kw))\n
if previous_total_credit != 0:\n
previous_total_credit = - previous_total_credit\n
\n
@@ -140,8 +138,12 @@
Movement_getExplanationReference=\'\',\n
Movement_getMirrorSectionTitle=\'\',\n
Movement_getNodeGapId=\'\',\n
+ Node_statAccountingBalance=\'\',\n
getTranslatedSimulationStateTitle=\'\',\n
)\n
+ if context.getPortalType() == \'Account\':\n
+ previous_balance.edit(Movement_getExplanationTitle=\'\')\n
+\n
new_result = [previous_balance]\n
if selection.getParams().get(\'hide_grouping\'):\n
params[\'where_expression\'] = \'catalog.grouping_reference is NULL\'\n
@@ -155,17 +157,6 @@
sort_on=sort_on,\n
**params))\n
return new_result\n
-\n
-context.log(\'sql\\nparams=%s\\nsort_on=%s\' % (params, sort_on),\n
- portal.portal_simulation.getMovementHistoryList(\n
- from_date=from_date,\n
- initial_running_total_price=net_balance,\n
- # initial_running_quantity=net_balance, TODO\n
- selection_domain=selection.getDomain(),\n
- selection_domain_join_column=\'section_uid\',\n
- sort_on=sort_on,\n
- src__=1,\n
- **params))\n
\n
if selection.getParams().get(\'hide_grouping\'):\n
params[\'where_expression\'] = \'catalog.grouping_reference is NULL\'\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml?rev=10980&r1=10979&r2=10980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml Fri Oct 27 11:54:06 2006
@@ -70,8 +70,6 @@
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection)\n
-\n
-context.log(\'stat kw %s\'%kw,\'params %s\'%params)\n
\n
if kw.get(\'node_uid\'):\n
params[\'node_uid\'] = kw[\'node_uid\']\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=10980&r1=10979&r2=10980&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Oct 27 11:54:06 2006
@@ -1,1 +1,1 @@
-111
+112
More information about the Erp5-report
mailing list