Commit 9d9391d2 authored by Sebastien Robin's avatar Sebastien Robin

fixed a problem of base_category in Baobab_getUserAssignedSiteList

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12568 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f65728ec
...@@ -82,6 +82,8 @@ def getSiteList(user_id=user_id):\n ...@@ -82,6 +82,8 @@ def getSiteList(user_id=user_id):\n
site_list = []\n site_list = []\n
for a in valid_assignment_list:\n for a in valid_assignment_list:\n
new_site = a.getSite()\n new_site = a.getSite()\n
if not new_site.startswith(\'site\'):\n
new_site=\'site/%s\' % new_site\n
if new_site not in (\'\', None):\n if new_site not in (\'\', None):\n
site_list.append(new_site)\n site_list.append(new_site)\n
return site_list\n return site_list\n
......
...@@ -166,7 +166,6 @@ for vault_inventory in vault_inventory_list:\n ...@@ -166,7 +166,6 @@ for vault_inventory in vault_inventory_list:\n
if total_quantity is None:\n if total_quantity is None:\n
total_quantity = 0\n total_quantity = 0\n
total_price = vault_inventory.total_price\n total_price = vault_inventory.total_price\n
context.log(\'total_price from sql\',total_price)\n
if total_price is None:\n if total_price is None:\n
total_price = 0\n total_price = 0\n
if only_positive:\n if only_positive:\n
...@@ -233,8 +232,6 @@ for resource in resource_dict.keys():\n ...@@ -233,8 +232,6 @@ for resource in resource_dict.keys():\n
if vault_report_type==\'history\':\n if vault_report_type==\'history\':\n
tmp_dict.update({\'date\':resource_in_vault[\'date\']})\n tmp_dict.update({\'date\':resource_in_vault[\'date\']})\n
general_total_price += resource_in_vault[\'total_price\']\n general_total_price += resource_in_vault[\'total_price\']\n
context.log(\'total_quantity\',tmp_dict[\'total_quantity\'])\n
context.log(\'total_price\',tmp_dict[\'total_price\'])\n
tmp_dict[\'general_total_price\'] = general_total_price\n tmp_dict[\'general_total_price\'] = general_total_price\n
total_inventory_list.append(newTempBase(context, "new_%3i" % i, **tmp_dict))\n total_inventory_list.append(newTempBase(context, "new_%3i" % i, **tmp_dict))\n
i += 1\n i += 1\n
......
118 120
\ No newline at end of file \ 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