[Erp5-report] r21637 - in /erp5/trunk/bt5/erp5_accounting_l10n_pl: SkinTemplateItem/portal_...

[nobody at svn.erp5.org]

Author: jacek
Date: Tue Jun 17 11:13:19 2008
New Revision: 21637

URL: http://svn.erp5.org?rev=21637&view=rev
Log:
shortAccountNumberToFullGapCategory tries to retrive gap root from kw; if not given, then gets gap root from preferences;
FiscalReportCell_doGetInventory provides kw for shortAccountNumberToFullGapCategory

Added:
    erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_local_role_key_list
    erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_role_key_list
Modified:
    erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml
    erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml
    erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml?rev=21637&r1=21636&r2=21637&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml Tue Jun 17 11:13:19 2008
@@ -108,7 +108,7 @@
   except AttributeError: # no account of this gap nr has been set up\n
     return 0\n
 #  except :\n
-#    raise \'error on\', (account, shortAccountNumberToFullGapCategory(account))\n
+#    raise \'error on\', (account, shortAccountNumberToFullGapCategory(account, **kw))\n
 return float ("%.2f"%(sum))\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml?rev=21637&r1=21636&r2=21637&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml Tue Jun 17 11:13:19 2008
@@ -65,12 +65,14 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>\'\'\'crap - should take gap root from preferences\'\'\'\n
+            <value> <string>gap_root = kw.get(\'gap_root\', context.getPortalObject().portal_preferences.getPreferredAccountingTransactionGap())\n
+context.log(gap_root)\n
 \n
 parts=[]\n
 for i in range(len(accountNumber)+1):\n
   parts.append(accountNumber[:i])\n
-return \'gap/pl/wpkR\'+\'/\'.join(parts)\n
+  context.log(parts)\n
+return gap_root+\'/\'.join(parts)\n
 </string> </value>
         </item>
         <item>
@@ -93,7 +95,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>accountNumber</string> </value>
+            <value> <string>accountNumber, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -120,12 +122,15 @@
                         <value>
                           <tuple>
                             <string>accountNumber</string>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>gap_root</string>
                             <string>parts</string>
                             <string>_getiter_</string>
                             <string>range</string>
                             <string>len</string>
                             <string>i</string>
-                            <string>_getattr_</string>
                             <string>_getitem_</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/revision?rev=21637&r1=21636&r2=21637&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/revision Tue Jun 17 11:13:19 2008
@@ -1,1 +1,1 @@
-42
+46

Added: erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_local_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_local_role_key_list?rev=21637&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_pl/bt/template_catalog_role_key_list?rev=21637&view=auto
==============================================================================
    (empty)