[Erp5-report] r23936 - in /erp5/trunk/bt5/erp5_budget: SkinTemplateItem/portal_skins/erp5_b...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Oct  1 15:38:25 2008
New Revision: 23936

URL: http://svn.erp5.org?rev=23936&view=rev
Log:
get group and region from the budget cell, not the budget line

Modified:
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
    erp5/trunk/bt5/erp5_budget/bt/revision

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml?rev=23936&r1=23935&r2=23936&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getConsumedBudget.xml Wed Oct  1 15:38:25 2008
@@ -81,7 +81,7 @@
   kw[\'node_category\'] = parent.getFinancialSection(base=1)\n
 if parent.isMemberOf(\n
     \'budget_line_variation/budget_variation/node_category_budget_section\'):\n
-#  kw[\'stock.function_uid\'] = parent.getBudgetSectionUid() #(base=1)\n
+#  kw[\'stock.function_uid\'] = parent.getBudgetSectionUid()\n
   kw[\'node_category\'] = parent.getBudgetSection(base=1)\n
 \n
 # mirror node\n
@@ -95,30 +95,28 @@
     \'budget_cell_variation/budget_variation/section_category_group\') or\n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/section_category_group\')):\n
-  kw[\'section_category\'] = parent.getGroup(base=1)\n
+  kw[\'section_category\'] = context.getGroup(base=1)\n
 elif (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/section_category_region\') or\n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/section_category_region\')):\n
-  kw[\'section_category\'] = parent.getRegion(base=1)\n
+  kw[\'section_category\'] = context.getRegion(base=1)\n
 \n
 # mirror section category\n
 if (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/mirror_section_category_group\') or \n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/mirror_section_category_group\')):\n
-  kw[\'mirror_section_category\'] = parent.getGroup(base=1)\n
+  kw[\'mirror_section_category\'] = context.getGroup(base=1)\n
 elif (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/mirror_section_category_region\') or \n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/mirror_section_category_region\')):\n
-  kw[\'mirror_section_category\'] = parent.getRegion(base=1)\n
-\n
+  kw[\'mirror_section_category\'] = context.getRegion(base=1)\n
 \n
 \n
 # FIXME: this should be configured on the budget domain\n
 #kw[\'node_category\'] = (\'account_type/asset\', \'account_type/expense\')\n
-\n
 \n
 \n
 if (parent.isMemberOf(\'budget_cell_variation/budget_variation/budget_line_type\')):\n
@@ -128,8 +126,7 @@
     kw[\'portal_type\'] = [\'Sale Invoice Transaction Line\', \'Invoice Line\']\n
     return -context.portal_simulation.getInventoryAssetPrice(**kw)\n
 \n
-\n
-return context.portal_simulation.getInventory(**kw)\n
+return context.portal_simulation.getInventoryAssetPrice(**kw)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml?rev=23936&r1=23935&r2=23936&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetCell_getEngagedBudget.xml Wed Oct  1 15:38:25 2008
@@ -96,24 +96,24 @@
     \'budget_cell_variation/budget_variation/section_category_group\') or\n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/section_category_group\')):\n
-  kw[\'section_category\'] = parent.getGroup(base=1)\n
+  kw[\'section_category\'] = context.getGroup(base=1)\n
 elif (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/section_category_region\') or\n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/section_category_region\')):\n
-  kw[\'section_category\'] = parent.getRegion(base=1)\n
+  kw[\'section_category\'] = context.getRegion(base=1)\n
 \n
 # mirror section category\n
 if (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/mirror_section_category_group\') or \n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/mirror_section_category_group\')):\n
-  kw[\'mirror_section_category\'] = parent.getGroup(base=1)\n
+  kw[\'mirror_section_category\'] = context.getGroup(base=1)\n
 elif (context.isMemberOf(\n
     \'budget_cell_variation/budget_variation/mirror_section_category_region\') or \n
     context.isMemberOf(\n
       \'budget_line_variation/budget_variation/mirror_section_category_region\')):\n
-  kw[\'mirror_section_category\'] = parent.getRegion(base=1)\n
+  kw[\'mirror_section_category\'] = context.getRegion(base=1)\n
 \n
 \n
 if (parent.isMemberOf(\'budget_cell_variation/budget_variation/budget_line_type\')):\n

Modified: erp5/trunk/bt5/erp5_budget/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/bt/revision?rev=23936&r1=23935&r2=23936&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/bt/revision (original)
+++ erp5/trunk/bt5/erp5_budget/bt/revision Wed Oct  1 15:38:25 2008
@@ -1,1 +1,1 @@
-165
+167