[Erp5-report] r18992 - in /erp5/trunk/bt5/erp5_banking_cash: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 1 18:34:04 CET 2008
Author: aurel
Date: Fri Feb 1 18:34:04 2008
New Revision: 18992
URL: http://svn.erp5.org?rev=18992&view=rev
Log:
optimize code and sort result
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml
erp5/trunk/bt5/erp5_banking_cash/bt/revision
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml?rev=18992&r1=18991&r2=18992&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_viewCashContainerInputDialog.xml Fri Feb 1 18:34:04 2008
@@ -68,6 +68,7 @@
<value> <string>from DateTime import DateTime\n
\n
container_portal_type_list = ["Monetary Reception",]\n
+base_price_dict = {}\n
\n
if listbox is None:\n
\n
@@ -84,25 +85,54 @@
container_list = []\n
listbox = []\n
for o in context.portal_simulation.getCurrentTrackingList(at_date= reference_date, node = node):\n
- if o.getObject().getParentValue().getPortalType() in container_portal_type_list:\n
- cash_container = o.getObject()\n
+ cash_container = o.getObject()\n
+ \n
+ if cash_container.getObject().getParentValue().getPortalType() in container_portal_type_list:\n
# get one line in order to know some properties of the cash container\n
container_dict = {}\n
container_lines = cash_container.searchFolder(portal_type=\'Container Line\')\n
if len(container_lines) == 0:\n
- context.log("CashMovementNewNotEmmited_generateCashContainerInputDialog", "No container line finf for cash container %s" %(cash_container.getRelativeUrl(),))\n
+ context.log("CashMovementNewNotEmitted_generateCashContainerInputDialog", "No container line finf for cash container %s" %(cash_container.getRelativeUrl(),))\n
continue\n
container_line = container_lines[0].getObject()\n
container_dict[\'reference\'] = cash_container.getReference()\n
container_dict[\'cash_number_range_start\'] = cash_container.getCashNumberRangeStart()\n
container_dict[\'cash_number_range_stop\'] = cash_container.getCashNumberRangeStop()\n
- container_dict[\'resource_translated_title\'] = container_line.getResourceTranslatedTitle()\n
- container_dict[\'quantity\'] = container_line.getQuantity()\n
- container_dict[\'total_price\'] = container_line.getTotalPrice()\n
+\n
+ resource = container_line.getResource()\n
+ base_price = base_price_dict.get(resource, None)\n
+ if base_price is None:\n
+ base_price = container_line.getResourceValue().getBasePrice()\n
+ base_price_dict[resource] = base_price\n
+ container_dict[\'base_price\'] = base_price\n
+ resource_translated_title = resource_translated_title_dict.get(resource, None)\n
+ if resource_translated_title is None:\n
+ resource_translated_title = container_line.getResourceTranslatedTitle()\n
+ resource_translated_title_dict[resource] = resource_translated_title\n
+ container_dict[\'resource_translated_title\'] = resource_translated_title\n
+ quantity = container_line.getQuantity()\n
+ container_dict[\'quantity\'] = quantity\n
+ total_price = total_price_dict.get((quantity,resource), None)\n
+ if total_price is None:\n
+ total_price = container_line.getTotalPrice(fast=0)\n
+ total_price_dict[(quantity,resource)] = total_price \n
+ container_dict[\'total_price\'] = total_price\n
container_dict[\'selection\'] = 0\n
+ container_dict[\'date\'] = o.date\n
container_dict[\'uid\'] = \'new_%s\' %(cash_container.getUid(),) #cash_container.getReference().replace(\'/\', \'_\'),)\n
\n
listbox.append(container_dict)\n
+\n
+ def sortListbox(a, b):\n
+ result = cmp(a["date"], b["date"])\n
+ if result == 0:\n
+ result = cmp(a["base_price"], b["base_price"])\n
+ if result == 0:\n
+ result = cmp(a["reference"], b["reference"])\n
+ \n
+ return result\n
+\n
+ listbox.sort(sortListbox)\n
\n
context.Base_updateDialogForm(listbox=listbox\n
)\n
@@ -163,6 +193,7 @@
<string>kw</string>
<string>DateTime</string>
<string>container_portal_type_list</string>
+ <string>base_price_dict</string>
<string>None</string>
<string>_getattr_</string>
<string>context</string>
@@ -180,6 +211,14 @@
<string>_getitem_</string>
<string>container_line</string>
<string>_write_</string>
+ <string>resource</string>
+ <string>base_price</string>
+ <string>resource_translated_title_dict</string>
+ <string>resource_translated_title</string>
+ <string>quantity</string>
+ <string>total_price_dict</string>
+ <string>total_price</string>
+ <string>sortListbox</string>
<string>_apply_</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml?rev=18992&r1=18991&r2=18992&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_viewCashContainerInputDialog.xml Fri Feb 1 18:34:04 2008
@@ -68,6 +68,7 @@
<value> <string>from DateTime import DateTime\n
\n
container_portal_type_list = ["Monetary Reception",]\n
+base_price_dict = {}\n
\n
if listbox is None:\n
\n
@@ -90,10 +91,17 @@
context.log("MonetaryIssue_generateCashContainerInputDialog", "No container line find for cash container %s" %(cash_container.getRelativeUrl(),))\n
continue\n
container_line = container_lines[0]\n
+ resource = container_line.getResource()\n
container_dict[\'reference\'] = cash_container.getReference()\n
container_dict[\'cash_number_range_start\'] = cash_container.getCashNumberRangeStart()\n
container_dict[\'cash_number_range_stop\'] = cash_container.getCashNumberRangeStop()\n
- resource = container_line.getResource()\n
+\n
+ base_price = base_price_dict.get(resource, None)\n
+ if base_price is None:\n
+ base_price = container_line.getResourceValue().getBasePrice()\n
+ base_price_dict[resource] = base_price\n
+ container_dict[\'base_price\'] = base_price\n
+ \n
resource_translated_title = resource_translated_title_dict.get(resource, None)\n
if resource_translated_title is None:\n
resource_translated_title = container_line.getResourceTranslatedTitle()\n
@@ -112,8 +120,16 @@
\n
listbox_append(container_dict)\n
\n
-\n
-\n
+ def sortListbox(a, b):\n
+ result = cmp(a["date"], b["date"])\n
+ if result == 0:\n
+ result = cmp(a["base_price"], b["base_price"])\n
+ if result == 0:\n
+ result = cmp(a["reference"], b["reference"])\n
+ \n
+ return result\n
+\n
+ listbox.sort(sortListbox)\n
context.Base_updateDialogForm(listbox=listbox\n
)\n
\n
@@ -173,6 +189,7 @@
<string>kw</string>
<string>DateTime</string>
<string>container_portal_type_list</string>
+ <string>base_price_dict</string>
<string>None</string>
<string>_getattr_</string>
<string>context</string>
@@ -190,11 +207,13 @@
<string>len</string>
<string>_getitem_</string>
<string>container_line</string>
+ <string>resource</string>
<string>_write_</string>
- <string>resource</string>
+ <string>base_price</string>
<string>resource_translated_title</string>
<string>quantity</string>
<string>total_price</string>
+ <string>sortListbox</string>
<string>_apply_</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_banking_cash/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/bt/revision?rev=18992&r1=18991&r2=18992&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/bt/revision (original)
+++ erp5/trunk/bt5/erp5_banking_cash/bt/revision Fri Feb 1 18:34:04 2008
@@ -1,1 +1,1 @@
-583
+584
More information about the Erp5-report
mailing list