diff --git a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapAssetCategoryList.xml b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapAssetCategoryList.xml index 7367cf390ab323065e225c3d1ab2ba09bb0a6571..b3f77f5c4edce8b41113421062b761d616810efc 100644 --- a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapAssetCategoryList.xml +++ b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapAssetCategoryList.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -53,20 +50,123 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>root = context.portal_categories.gap.jp.afbe2\n + <value> <string>root = context.portal_categories.gap.jp.afbe\n \n return [\n (depth,\n root.restrictedTraverse(path))\n for depth, path in (\n - (2, \'5\'),\n - (2, \'4/41\'),\n - (2, \'4/44/441/4412\'),\n - (1, \'4/44/443/4432\'),\n - (1, \'4/46/462\'),\n - (1, \'4/49\'),\n - (3, \'2\'),\n - (2, \'3\'),\n +\n +#######################\n +# æµå‹•è³‡ç”£\n +#######################\n +\n +# ç¾é‡‘é 金\n +#######################\n +(2, \'5/53\'), # ç¾é‡‘\n + # å°å£ç¾é‡‘\n +\n +(2, \'5/51\'), # 普通é 金 (GAP上ã§ã¯é 金ãŒã‚ã‚‹ã ã‘。細ã‹ã„分類ã¯ãªã„)\n + # 当座é 金\n + # 定期é 金\n + # 定期ç©é‡‘\n + # 通知é 金\n + # 別段é 金\n +\n +#売上債権\n +########################\n +\n +(2, \'4/41\'), # å—å–手形\n + # 売掛金\n + # å‰æ¸¡é‡‘ (GAPã«ã¯å‰æ‰•é‡‘ã¨ã‚ã‚‹ãŒã€ä¸€èˆ¬çš„ã«ã¯å‰æ¸¡é‡‘ã®ã‚ˆã†ã§ã‚ã‚‹)\n + # 立替金\n + # 仮払金\n + # 未åŽå…¥é‡‘\n + # å‰æ‰•è²»ç”¨\n + # 未åŽåŽç›Š\n + # çŸæœŸè²¸ä»˜é‡‘ (GAP上ã¯è²¸ä»˜é‡‘)\n +\n +(2, \'4/49\'), # 貸倒引当金\n +\n +# 有価証券\n +#########################\n +(2, \'5/50/503\'), # 有価証券\n +\n +# 棚å¸è³‡ç”£\n +#########################\n +(2, \'3\'), # å•†å“ (GAPã®ä¸ã«æ£šå¸å¼•å½“金ã¨ã„ã†ã®ãŒã‚ã‚‹ã‘ã©ã€ã“ã‚Œã¯ãªã«?)\n + # 製å“\n + # åŠè£½å“\n + # 仕掛å“\n + # 原ææ–™\n + # 貯蔵å“\n +\n +# ãã®ä»–ã®æµå‹•è³‡ç”£\n +#########################\n +(2, \'4/44/441/4412\'), # 仮払消費税ç‰\n + # 未åŽæ¶ˆè²»ç¨Žç‰\n +\n + # 繰延税金資産(æµå‹•) (GAPã®ä¸ã«å›ºå®šè³‡ç”£ã®ã‚‚ã®ã¯ã‚ã‚‹ãŒã€æµå‹•è³‡ç”£ã®ã‚‚ã®ã¯ãªã„)\n +\n +(2, \'4/44/443\'), # 仮払法人税ç‰\n +\n +\n +###########################\n +# 固定資産\n +###########################\n +\n +# 有形固定資産\n +###########################\n +\n +(2, \'2/21\'), # 建物\n + # 構築物\n + # 車両・é‹æ¬å…·\n + # 土地\n + # 建è¨ä»®å‹˜å®š\n +\n + # 建物付属è¨å‚™ (GAPã«è©²å½“ãªã—)\n + # 機械・装置 (GAPã«è©²å½“ãªã—)\n + # 工具・備å“ãƒ»åŒ»ç™‚å™¨å…·å‚™å“ (GAPã«è©²å½“ãªã—)\n +\n +(2, \'2/28\'), # 減価償å´ç´¯è¨ˆé¡\n +\n +#######################\n +# 無形固定資産\n +#######################\n +(2, \'2/20/205\'), # ソフトウェア\n + # é›»è©±åŠ å…¥æ¨©\n + # 特許権\n + # 借地権\n +\n +(2, \'2/20/207/2071\'), # ã®ã‚Œã‚“\n +\n + # æ°´é“æ–½è¨åˆ©ç”¨æ¨© (GAPã«è©²å½“ã—ãªã„)\n +\n +\n +# 投資ãã®ä»–ã®è³‡ç”£\n +#####################\n +(2, \'2/27/271\'), # 投資有価証券\n + # 長期å‰æ‰•è²»ç”¨\n + # 長期貸付金\n + # ä¿è¨¼é‡‘ (GAP上ã®å·®å…¥ã‚Œä¿è¨¼é‡‘ã«è©²å½“)\n +\n + # é–¢ä¿‚ä¼šç¤¾æ ªå¼ (GAPã«è©²å½“ã—ãªã„)\n + # 出資金 (GAPã«è©²å½“ã—ãªã„)\n + # ゴルフ会員権 (GAPã«è©²å½“ã—ãªã„)\n + # 敷金 (GAPã«è©²å½“ã—ãªã„)\n + # ä¿é™ºç©ç«‹é‡‘ (GAPã«è©²å½“ã—ãªã„)\n + # ç ´ç”£æ›´ç”Ÿå‚µæ¨© (GAPã«è©²å½“ã—ãªã„)\n +\n +(2, \'2/20/208/2081\'), # 繰延税金資産(固定)\n +\n +# 繰延資産\n +############################\n +(2, \'2/20/201\'), # 創立費\n + # é–‹æ¥è²»\n + # æ–°æ ªç™ºè¡Œè²» (GAP上ã®æ ªå¼äº¤ä»˜è²»)\n + # 社債発行費\n + # 開発費 (GAP上ã®ç¹°è¶Šç ”究開発費)\n +\n )]\n </string> </value> </item> diff --git a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapCapitalCategoryList.xml b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapCapitalCategoryList.xml index 332edc711f77136d4350a255500c6262928608bf..e31a50d81c46c5c7a10454489e414e9d7cd42adc 100644 --- a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapCapitalCategoryList.xml +++ b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapCapitalCategoryList.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -53,7 +50,33 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return []\n + <value> <string>root = context.portal_categories.gap.jp.afbe\n +\n +return [\n + (depth,\n + root.restrictedTraverse(path))\n + for depth, path in (\n +######################\n +# æ ªä¸»è³‡æœ¬\n +######################\n +(2, \'1/10\'), # 資本金\n + # æ–°æ ªå¼ç”³è¾¼è¨¼æ‹ 金\n + # 資本準備金\n + # ãã®ä»–ã®è³‡æœ¬ä½™å‰°é‡‘\n + # 利益準備金\n + # 繰越利益余剰金\n + # è‡ªå·±æ ªå¼\n +\n + # xxx準備金 (GAPã«è©²å½“ãªã—ã€å¿…è¦ã ã¨æ€ã‚れる)\n + # xxxç©ç«‹é‡‘ (GAPã«è©²å½“ãªã—ã€å¿…è¦ã ã¨æ€ã‚れる)\n +\n +(2, \'1/11\'), # ãã®ä»–有価証券評価差é¡é‡‘\n + # 繰越ヘッジæ失\n + # 土地å†è©•ä¾¡å·®é¡é‡‘\n +(2, \'1/12\'), # æ–°æ ªäºˆç´„æ¨©\n +(2, \'1/13\'), # å°æ•°æ ªä¸»æŒåˆ†\n +\n + )]\n </string> </value> </item> <item> @@ -62,6 +85,10 @@ <none/> </value> </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>errors</string> </key> <value> @@ -85,7 +112,16 @@ <item> <key> <string>co_varnames</string> </key> <value> - <tuple/> + <tuple> + <string>_getattr_</string> + <string>context</string> + <string>root</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>depth</string> + <string>path</string> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapDebtCategoryList.xml b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapDebtCategoryList.xml index 47b0b0b3544e6382d18c26c08775cf526fce89ae..e15fb20eabe68e1177e800efcfbfd6a237a68e7a 100644 --- a/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapDebtCategoryList.xml +++ b/bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapDebtCategoryList.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -53,7 +50,47 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return []\n + <value> <string>root = context.portal_categories.gap.jp.afbe\n +\n +return [\n + (depth,\n + root.restrictedTraverse(path))\n + for depth, path in (\n +######################\n +# æµå‹•è² 債\n +######################\n +(2, \'4/40\'), # 支払手形\n + # 買掛金\n + # çŸæœŸå€Ÿå…¥é‡‘\n + # 未払金\n + # 未払費用\n + # å‰å—金\n + # é り金\n + # å‰å—åŽç›Š\n + # ä»®å—金 \n +\n +(2, \'4/46/461\'), # 未払é…当金\n +\n + # コマーシャルペーパー(該当GAPãªã—)\n + # 1年内返済予定ã®é•·æœŸå€Ÿå…¥é‡‘ã€ç¤¾å‚µç‰(該当GAPãªã—)\n +\n +(2, \'4/44/443/4431\'), # 未払法人税ç‰\n +(2, \'4/44/441/4412/44121\'), # 未払消費税ç‰\n +(2, \'4/44/441/4411/44112\'), # ä»®å—消費税ç‰\n +(2, \'4/42/422\'), # 賞与引当金\n +\n + # ç¹°å»¶ç¨Žé‡‘è² å‚µ(æµå‹•) (該当GAPãªã—ã€æµå‹•è² 債ã«ã‚‚ã“ã‚ŒãŒå¿…è¦)\n +\n +######################\n +# å›ºå®šè² å‚µ\n +######################\n +(2, \'5/50/505\'), # 社債 (GAP上ã§ã¯è²¡å‹™(資産ã£ã½ã„)ã®ä¸ã«ã‚ã‚‹ã‘ã©æ£ã—ã„ã®ã‹ï¼Ÿ)\n +(2, \'2/27/272\'), # 長期借入金 (GAP上ã§ã¯å›ºå®šè³‡ç”£ã®ä¸ã«ã‚ã‚‹ã‘ã©æ£ã—ã„ã®ã‹ï¼Ÿ)\n +(2, \'4/42/423\'), # 退è·çµ¦ä»˜å¼•å½“金 (GAP上ã§ã¯æµå‹•è³‡ç”£ã®ä¸ã«ã‚ã‚‹ã‘ã©æ£ã—ã„ã®ã‹?)\n +(2, \'2/20/207/2072\'), # è² ã®ã®ã‚Œã‚“\n +(2, \'2/20/208/2082\'), # ç¹°å»¶ç¨Žé‡‘è² å‚µ(固定) (GAP上ã§ã¯å›ºå®šè³‡ç”£ã®ä¸ã«ã‚ã‚‹ã‘ã©æ£ã—ã„ã®ã‹?)\n +\n + )]\n </string> </value> </item> <item> @@ -62,6 +99,10 @@ <none/> </value> </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>errors</string> </key> <value> @@ -85,7 +126,16 @@ <item> <key> <string>co_varnames</string> </key> <value> - <tuple/> + <tuple> + <string>_getattr_</string> + <string>context</string> + <string>root</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> + <string>depth</string> + <string>path</string> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_accounting_l10n_jp/bt/change_log b/bt5/erp5_accounting_l10n_jp/bt/change_log index 42952751f41e9ae6ac05624b9a3391251d6a5a47..519ddebbb74ced060231972996435d0de5dd10fb 100644 --- a/bt5/erp5_accounting_l10n_jp/bt/change_log +++ b/bt5/erp5_accounting_l10n_jp/bt/change_log @@ -1,3 +1,9 @@ +2010-09-04 yusei +* Implement Japanese B/S report. (Although Japanese GAP is not good enough) + +2010-09-03 yusei +* Add Japanese profit and loss report to accounting module. + 2010-08-19 yusei * Remove old afbe and rename afbe2 to afbe. diff --git a/bt5/erp5_accounting_l10n_jp/bt/revision b/bt5/erp5_accounting_l10n_jp/bt/revision index 978b4e8e518d1242cbf102a1bebdb52e41705102..a5c750feac4168f62cfd29aa62b4624f0a430cd5 100644 --- a/bt5/erp5_accounting_l10n_jp/bt/revision +++ b/bt5/erp5_accounting_l10n_jp/bt/revision @@ -1 +1 @@ -26 \ No newline at end of file +27 \ No newline at end of file