Compare commits

..

1719 Commits

Author SHA1 Message Date
Pratik Vyas
c20072e940 Merge branch 'develop' 2015-01-23 16:16:53 +05:30
Pratik Vyas
e4c2ebfc57 bumped to version 4.20.0 2015-01-23 16:46:53 +06:00
Nabin Hait
587c061550 Merge pull request #2622 from neilLasrado/batch-patch
patch for is_batch_item
2015-01-23 15:45:53 +05:30
Neil Trini Lasrado
40a9f6f8e9 patch fix 2015-01-23 15:32:35 +05:30
Neil Trini Lasrado
f0b0464cce patch for is_batch_item 2015-01-23 15:32:35 +05:30
Nabin Hait
4e803af0e6 Merge pull request #2625 from nabinhait/fix1
Allow nagative batch balance from landed cost voucher
2015-01-23 14:30:31 +05:30
Nabin Hait
4ccd8d3326 Allow nagative batch balance from landed cost voucher 2015-01-23 12:18:14 +05:30
Nabin Hait
9768467d53 Merge pull request #2619 from nabinhait/fix1
POS fix: setting discount amount
2015-01-21 17:53:09 +05:30
Nabin Hait
59de1e23bc POS fix: setting discount amount 2015-01-21 17:50:28 +05:30
Pratik Vyas
f19b1e0c6b Merge branch 'develop' 2015-01-21 17:05:29 +05:30
Pratik Vyas
d33a3a295f bumped to version 4.19.0 2015-01-21 17:35:29 +06:00
Nabin Hait
f749302d25 Merge pull request #2616 from nabinhait/fix1
Fix1
2015-01-21 16:32:28 +05:30
Nabin Hait
9c47efb592 Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts 2015-01-21 16:22:45 +05:30
Nabin Hait
ea61046e8d Updated Quotation Status 2015-01-21 14:08:06 +05:30
Nabin Hait
3f671ea60f Landed Cost Voucher: Add field and fixed reposting issue 2015-01-21 14:08:06 +05:30
Pratik Vyas
c1a7c3b08b Update .travis.yml 2015-01-21 12:39:26 +05:30
Pratik Vyas
d1225661d2 Translation updates 2015-01-21 12:05:45 +05:30
Rushabh Mehta
302eee9406 Merge pull request #2463 from Steggur/develop
first is translation commit
2015-01-19 17:08:53 +05:30
Nabin Hait
b434464b1c Merge pull request #2604 from nabinhait/fix1
Fixes
2015-01-19 11:10:39 +05:30
Nabin Hait
aabeb38c15 minor fix 2015-01-19 11:07:32 +05:30
Nabin Hait
fe93ea56b6 Minor fixes: escaped characters 2015-01-19 11:07:32 +05:30
Pratik Vyas
b301603740 Merge branch 'develop' 2015-01-17 01:42:05 +05:30
Pratik Vyas
d7ba759844 bumped to version 4.18.1 2015-01-17 02:12:05 +06:00
Nabin Hait
8efe58bd3c Merge pull request #2591 from nabinhait/fix1
Fixes
2015-01-16 12:03:49 +05:30
Nabin Hait
6609938483 Removed validation: target_valuation > source_valuation 2015-01-16 11:59:47 +05:30
Nabin Hait
84662f2db5 minor fix in payment receipt voucher print format 2015-01-16 11:59:47 +05:30
Nabin Hait
da975f5a76 Merge pull request #2581 from nabinhait/fix1
minor fix
2015-01-14 11:49:46 +05:30
Nabin Hait
f34c96bf7a minor fix 2015-01-14 11:49:04 +05:30
Pratik Vyas
0f96f8e68f Merge branch 'develop' 2015-01-14 11:42:45 +05:30
Pratik Vyas
991962b6fd bumped to version 4.18.0 2015-01-14 12:12:45 +06:00
Nabin Hait
c481e27d88 Merge pull request #2565 from alexandre-00/patch-11
Update bom.py
2015-01-14 11:39:08 +05:30
Nabin Hait
56e04e0727 Merge pull request #2576 from nabinhait/fix1
Discount amount in party currency
2015-01-14 11:27:30 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Nabin Hait
024b537b7f Merge pull request #2557 from neilLasrado/spelling-of-approver
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Pratik Vyas
e4ee5c3f1c Update .travis.yml 2015-01-12 12:48:27 +05:30
Pratik Vyas
4b3d99d39a Merge branch 'develop' 2015-01-12 12:14:36 +05:30
Pratik Vyas
47a10f5a39 bumped to version 4.17.0 2015-01-12 12:44:35 +06:00
Nabin Hait
ecb39a5b63 Merge pull request #2571 from nabinhait/fix1
Fixes
2015-01-12 11:04:50 +05:30
Nabin Hait
39c8c9e7b0 Fixes in print format css 2015-01-12 11:04:07 +05:30
Nabin Hait
4e7cc93af9 minor fix in reposting utility 2015-01-12 10:55:48 +05:30
Rushabh Mehta
f8cb1a916e Merge pull request #2570 from dalers/develop
fix web links and clarify install options
2015-01-12 10:47:06 +05:30
Dale Scott
ab2e75e98e Update README.md 2015-01-11 11:04:43 -07:00
Dale Scott
354892b1c6 Update README.md 2015-01-11 11:01:01 -07:00
Dale Scott
abe69afd69 corrections and clarifications
mostly current websites for user guide, forum, ...
2015-01-11 10:38:03 -07:00
Nabin Hait
c72a89aaf8 Merge pull request #2569 from nabinhait/fix1
create material request from production planning tool
2015-01-11 22:04:07 +05:30
Nabin Hait
873d98be2d create material request from production planning tool 2015-01-11 22:01:59 +05:30
Nabin Hait
f1d06b02e7 Merge pull request #2567 from nabinhait/fix1
valuation rate mandatory if item is transacting for the first time
2015-01-10 10:31:34 +05:30
Nabin Hait
675276b802 valuation rate mandatory if item is transacting for the first time 2015-01-10 10:27:28 +05:30
alexandre-00
3ed3a2d176 Update bom.py
removed the attrgetter
2015-01-09 14:42:27 +08:00
Rushabh Mehta
9e95e780da Merge pull request #2560 from neilLasrado/test-fix
opportunity - test records fixed
2015-01-09 12:03:28 +05:30
alexandre-00
de58657537 Update bom.py
Hi guys,

Just a proposal to sort the Materials Required (Exploded) from the BOM.
So the items and sub-assemblies items looks a little bit more organized in the list.

Cheers
Alexandre
2015-01-09 14:20:43 +08:00
Anand Doshi
015fa7a1d1 [fix] escape quote in Accounts Receivable 2015-01-08 18:26:53 +05:30
Neil Trini Lasrado
1ff3a6cdb8 fix 2015-01-07 16:24:52 +05:30
Nabin Hait
7620efc9ad Merge pull request #2561 from nabinhait/fix1
fix reposting gl entries for future vouchers
2015-01-07 15:49:35 +05:30
Nabin Hait
7778b480fd fix reposting gl entries for future vouchers 2015-01-07 15:45:10 +05:30
Neil Trini Lasrado
a17d7cea34 test records fixed 2015-01-07 15:42:59 +05:30
Pratik Vyas
a9cafcb8ae Merge branch 'develop' 2015-01-07 11:37:22 +05:30
Pratik Vyas
bdfd0d1ff9 bumped to version 4.16.0 2015-01-07 12:07:22 +06:00
Nabin Hait
afc8b1a087 Merge pull request #2558 from nabinhait/fix1
message changed
2015-01-07 11:34:42 +05:30
Nabin Hait
6c1773025b fiscal year error message 2015-01-07 11:33:14 +05:30
Neil Trini Lasrado
1b7d66fab6 Update leave_application.js 2015-01-07 11:16:41 +05:30
Nabin Hait
e24365f1f4 message fix 2015-01-06 12:57:23 +05:30
Nabin Hait
fd334bf451 Merge pull request #2551 from nabinhait/fix1
minor fix
2015-01-05 08:20:08 +05:30
Nabin Hait
5515b1ea7f minor fix 2015-01-05 08:18:15 +05:30
Nabin Hait
96d67f5153 Merge pull request #2547 from nabinhait/fix1
minor fix
2015-01-04 17:29:14 +05:30
Nabin Hait
8a00319962 minor fix 2015-01-04 17:27:40 +05:30
Nabin Hait
c6136e4801 Merge pull request #2543 from nabinhait/fix1
FG item and raw material can not be merged
2015-01-02 15:13:17 +05:30
Nabin Hait
0938b5dec6 FG item and raw material can not be merged 2015-01-02 15:12:30 +05:30
Nabin Hait
88f8fcb32e Merge pull request #2542 from nabinhait/fix1
In stock entry, difference account can be non-profit-and-loss account
2015-01-02 14:37:43 +05:30
Nabin Hait
f40ce616a7 In stock entry, difference account can be non-profit-and-loss account 2015-01-02 14:37:01 +05:30
Pratik Vyas
b02788b915 Merge branch 'develop' 2014-12-31 12:41:14 +05:30
Pratik Vyas
b094ee45d7 bumped to version 4.15.4 2014-12-31 13:11:14 +06:00
Nabin Hait
de0c87757a Merge pull request #2539 from nabinhait/fix1
item validation in bom
2014-12-31 12:37:38 +05:30
Nabin Hait
5604f987f2 item validation in bom 2014-12-31 12:37:11 +05:30
Nabin Hait
9d14f0f36a Merge pull request #2538 from nabinhait/fix1
set missing cost center using default
2014-12-30 18:35:14 +05:30
Nabin Hait
a74468b353 set missing cost center using default 2014-12-30 18:33:52 +05:30
Nabin Hait
35f81b24f1 Merge pull request #2537 from nabinhait/fix1
focus on barcode field after adding a row
2014-12-30 17:53:58 +05:30
Nabin Hait
40431cbf89 focus on barcode field after adding a row 2014-12-30 17:53:16 +05:30
Nabin Hait
5529f14aaf Merge pull request #2536 from nabinhait/fix1
Fixes in Stock Analytics
2014-12-30 16:35:57 +05:30
Nabin Hait
54c31b498b Fixes in Stock Analytics 2014-12-30 16:33:07 +05:30
Nabin Hait
899dba9022 Merge pull request #2535 from nabinhait/fix1
always calculate taxes and totals onchange of exchange rate
2014-12-30 15:41:22 +05:30
Nabin Hait
7d8fa8089a always calculate taxes and totals onchange of exchange rate 2014-12-30 15:35:59 +05:30
Pratik Vyas
ac86c5b6d1 Merge branch 'develop' 2014-12-28 16:59:08 +05:30
Pratik Vyas
ecc3f312b9 bumped to version 4.15.3 2014-12-28 17:29:08 +06:00
Nabin Hait
b65b5f43a7 Merge pull request #2530 from nabinhait/fix1
exchange_rate no_copy fix
2014-12-26 11:00:03 +05:30
Nabin Hait
c3270d7504 exchange_rate no_copy fix 2014-12-26 10:58:58 +05:30
Pratik Vyas
ea909ace01 Merge branch 'develop' 2014-12-23 19:11:08 +05:30
Pratik Vyas
f64d11da3c bumped to version 4.15.2 2014-12-23 19:41:08 +06:00
Nabin Hait
95225be93d Merge pull request #2509 from pdvyas/fix-patches
add reload_doc in a few patches
2014-12-23 17:43:52 +05:30
Nabin Hait
e5d169b8d2 Merge pull request #2521 from nabinhait/fix1
fixed negative batch wty message
2014-12-23 11:26:04 +05:30
Nabin Hait
da4e3fb366 fixed negative batch wty message 2014-12-23 10:58:01 +05:30
Nabin Hait
13ce150149 Merge pull request #2520 from nabinhait/fix1
minor fix no-copy
2014-12-22 15:07:28 +05:30
Nabin Hait
a04489a72b minor fix no-copy 2014-12-22 14:58:36 +05:30
Pratik Vyas
35cd88b09b Merge branch 'develop' 2014-12-22 11:17:45 +05:30
Pratik Vyas
ff56566506 bumped to version 4.15.1 2014-12-22 11:47:45 +06:00
Nabin Hait
01ad94bfad Merge pull request #2519 from nabinhait/fix1
Dont reset pricing if ignore pricing rule
2014-12-22 11:16:02 +05:30
Nabin Hait
cfe3c54ca0 Dont reset pricing if ignore pricing rule 2014-12-22 10:43:10 +05:30
Pratik Vyas
2f6a20a93a Merge branch 'develop' 2014-12-19 18:13:55 +05:30
Pratik Vyas
5d1543f241 bumped to version 4.15.0 2014-12-19 18:43:55 +06:00
Nabin Hait
c56650c773 Merge pull request #2516 from nabinhait/fix1
Customer should not copied from lead to opoortunity
2014-12-19 10:52:52 +05:30
Nabin Hait
cb11f27558 Customer should not copied from lead to opoortunity 2014-12-19 10:51:59 +05:30
Anand Doshi
98be98816c Merge pull request #2515 from anandpdoshi/anand-dec-18
[fix] In Setup Wizard, load languages from languages.txt
2014-12-18 17:40:58 +05:30
Anand Doshi
ca2c297f72 [fix] In Setup Wizard, load languages from languages.txt 2014-12-18 17:31:21 +05:30
Pratik Vyas
387e1e21cb add reload_doc in a few patches 2014-12-18 11:36:23 +05:30
Nabin Hait
d6e49150a8 Merge pull request #2505 from nabinhait/fix1
Reapply price list if pricing rule reset as blank
2014-12-17 15:39:28 +05:30
Nabin Hait
49a2729663 Reapply price list if pricing rule reset as blank 2014-12-17 11:24:00 +05:30
Pratik Vyas
06baf20edd Merge branch 'develop' 2014-12-16 15:47:07 +05:30
Pratik Vyas
13553c2bf0 bumped to version 4.14.0 2014-12-16 16:17:06 +06:00
Nabin Hait
f638c1acd5 Merge pull request #2503 from nabinhait/fix1
packing list index
2014-12-16 15:17:27 +05:30
Nabin Hait
e4c659386a packing list index 2014-12-16 15:16:55 +05:30
Anand Doshi
cd7a1661c6 Merge pull request #2498 from anandpdoshi/anand-dec-15
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-16 12:42:40 +05:30
Nabin Hait
96962e2101 Merge pull request #2501 from nabinhait/fix1
Fecth contact details on change of contact in purchase transactions
2014-12-16 11:57:11 +05:30
Nabin Hait
7eedebc970 Fecth contact details on change of contact in purchase transactions 2014-12-16 11:56:21 +05:30
Nabin Hait
437e34accb Merge pull request #2500 from nabinhait/fix1
no copy property for customer's po no
2014-12-16 11:26:08 +05:30
Nabin Hait
0f2137be18 no copy property for customer's po no 2014-12-16 10:37:55 +05:30
Anand Doshi
f87a622ef0 [minor] use frappe.attach_print() in salary slip and recurring document 2014-12-15 23:14:35 +05:30
Nabin Hait
07722b835c Merge pull request #2495 from nabinhait/fix1
Translation fixes
2014-12-15 15:00:12 +05:30
Nabin Hait
3cd7a45c1b Translation fixes 2014-12-15 14:56:58 +05:30
Nabin Hait
90b5174256 minor fix 2014-12-15 11:48:43 +05:30
Pratik Vyas
bffad26226 Merge branch 'develop' 2014-12-12 16:52:09 +05:30
Pratik Vyas
a578f3e23a bumped to version 4.13.1 2014-12-12 17:22:09 +06:00
Nabin Hait
870dd43268 Merge pull request #2489 from nabinhait/fix1
Pull all customer's po no in delivery note when made from multiple SO
2014-12-12 12:50:41 +05:30
Nabin Hait
ad0bd4ca92 Pull all customer's po no in delivery note when made from multiple sales order 2014-12-12 12:49:45 +05:30
Nabin Hait
eba480e15a Merge pull request #2487 from nabinhait/fix1
Fixed bom patch
2014-12-12 11:29:49 +05:30
Nabin Hait
4b83403a63 Fixed bom patch 2014-12-12 11:28:58 +05:30
Nabin Hait
22c9e42f4d Merge pull request #2482 from neilLasrado/fix-cost
Fixed cost calculation Error
2014-12-11 17:36:49 +05:30
Neil Trini Lasrado
6ddc487fb6 patch fix 2014-12-11 17:33:41 +05:30
Neil Trini Lasrado
3a34cadcb2 Fix - Total Fixed Cost with patch 2014-12-11 17:15:12 +05:30
Nabin Hait
b71d1a4c7f Merge pull request #2486 from nabinhait/fix1
Removed gross profit field from sales invoice
2014-12-11 17:14:26 +05:30
Nabin Hait
bef80bab0d Removed gross profit field from sales invoice 2014-12-11 16:27:18 +05:30
Nabin Hait
190210394c Merge pull request #2484 from nabinhait/fix1
Leave application fix
2014-12-11 00:02:38 +05:30
Nabin Hait
5cafcf66b0 Leave application fix 2014-12-10 23:59:04 +05:30
Nabin Hait
d71e50c9fc Merge pull request #2480 from nabinhait/fix1
Fixes for discount amount
2014-12-10 12:44:56 +05:30
Nabin Hait
35ebe1bf78 Tax amount in POS invoice print format 2014-12-10 12:42:32 +05:30
Nabin Hait
b14cc0417d Display tax amount after discount, if there is any discount amount 2014-12-10 12:28:25 +05:30
Pratik Vyas
399a3097e8 Merge branch 'develop' 2014-12-09 16:40:28 +05:30
Pratik Vyas
c8f5c3cdbe bumped to version 4.13.0 2014-12-09 17:10:28 +06:00
Nabin Hait
e83d506319 Merge pull request #2474 from nabinhait/fix1
Added leave approver name field in leave application
2014-12-09 16:37:40 +05:30
Nabin Hait
690bcd7b66 Added leave approver name field in leave application 2014-12-09 16:36:33 +05:30
Nabin Hait
f18d285eab Merge pull request #2473 from nabinhait/fix1
minor fix
2014-12-09 16:31:03 +05:30
Nabin Hait
7887ccb441 Credit days fix 2014-12-09 14:34:14 +05:30
Nabin Hait
d57b57a21d Minor fix in accounts receivable report 2014-12-09 11:56:13 +05:30
erp
9fc0a8cbf8 first is translation commit 2014-12-05 11:17:44 +00:00
Nabin Hait
5cc0531d27 Merge pull request #2451 from revant/develop
"From time" cannot be later than "To time" and hours cannot be negative
2014-12-02 14:27:00 +05:30
Revant Nandgaonkar
0e5cdc8495 Merge branch 'develop' of https://github.com/revant/erpnext into develop 2014-12-02 14:21:15 +05:30
Revant Nandgaonkar
b80d892eab removed unecessary backslash 2014-12-02 14:19:29 +05:30
Revant Nandgaonkar
185af03fb2 Update time_log.py 2014-12-02 14:18:10 +05:30
Nabin Hait
abcbbc63d8 Merge pull request #2435 from nabinhait/fix1
Fixes in authorization rule based on average discount
2014-12-02 10:36:25 +05:30
Nabin Hait
6871c74ce1 Merge pull request #2444 from ankitjavalkarwork/contactmob
Display mobile no. of contact
2014-12-02 10:35:46 +05:30
Revant Nandgaonkar
d0a44ca85c Changed contact_date to Datetime so appointment or call with time can be scheduled 2014-12-01 23:31:53 +05:30
Revant Nandgaonkar
83db3e3ddb "From time" cannot be later than "To time" and hours cannot be negative 2014-12-01 16:53:29 +05:30
Nabin Hait
cc11045fd3 minor fix 2014-11-28 16:59:32 +05:30
Nabin Hait
1b5afe737f Fixes in authorization rule based on average discount 2014-11-28 16:59:32 +05:30
Rushabh Mehta
3d65d9602e [error-reports] 2014-11-28 14:58:43 +05:30
ankitjavalkarwork
9440d080d4 Print Hide Recurring Order/Invoice based fields 2014-11-27 17:28:53 +05:30
ankitjavalkarwork
9269c86339 Display mobile no of contact 2014-11-27 17:13:36 +05:30
Pratik Vyas
7c82d616c9 Merge branch 'develop' 2014-11-25 11:16:33 +05:30
Pratik Vyas
f227379d2f bumped to version 4.12.0 2014-11-25 11:46:33 +06:00
Nabin Hait
eba88919c1 Merge pull request #2431 from mayur-patel/patch-2
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Rushabh Mehta
3408432b50 Merge pull request #2428 from rmehta/translations-update
[translations] updated via frappe.io/translator
2014-11-25 10:54:36 +05:30
Rushabh Mehta
a0949158b7 [translations] updated via frappe.io/translator 2014-11-25 10:53:12 +05:30
Nabin Hait
ea91d2aaf1 Merge pull request #2429 from ankitjavalkarwork/expclaimname
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Rushabh Mehta
de992abf83 Merge pull request #2413 from Delte/patch-1
Update tr.csv
2014-11-25 10:49:51 +05:30
Mayur Patel
5d8635a8dc Update leave_application.py
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95 Add configurable naming series to Expense claim 2014-11-24 18:26:17 +05:30
Nabin Hait
0676cf6d3f Merge pull request #2430 from nabinhait/fix1
Multiple minor fixes
2014-11-24 18:21:37 +05:30
Nabin Hait
b74ae7aa31 Minor fix for order to invoice mapping 2014-11-24 18:17:01 +05:30
Nabin Hait
0ad7db3bbd Minor fix in salary slip net total calculation 2014-11-24 15:25:13 +05:30
Nabin Hait
db74e316d2 Validate serial no after auto-creation based on naming series 2014-11-24 15:25:13 +05:30
Nabin Hait
1897360e4b Set default language as English in setup wizard 2014-11-24 15:25:13 +05:30
Nabin Hait
e7fb957415 Merge pull request #2427 from rmehta/develop
[fix] client side queries
2014-11-24 15:23:27 +05:30
Rushabh Mehta
2f4567fa3c [minor] [ux] address refresh for lead 2014-11-24 15:18:40 +05:30
Rushabh Mehta
0a7abc188e [minor] [ux] contact template 2014-11-24 15:06:40 +05:30
Rushabh Mehta
5eeef7f065 [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:51 +05:30
Rushabh Mehta
7d36875d6f [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:47 +05:30
Delte
2fa718705a Update tr.csv
Typo & translation fix
2014-11-15 22:39:25 +02:00
Pratik Vyas
b1fdbf2335 Merge branch 'develop' 2014-11-14 15:27:34 +05:30
Pratik Vyas
2277922313 bumped to version 4.11.2 2014-11-14 15:57:34 +06:00
Nabin Hait
3e1029309c Merge pull request #2411 from nabinhait/fix1
minor fix
2014-11-14 15:19:51 +05:30
Nabin Hait
aa5deaa070 minor fix 2014-11-14 15:19:07 +05:30
Nabin Hait
6b5d51ca22 Merge pull request #2402 from jorxzpagta/patch-1
Update supplier.js [Displaying Messages on the Communation History]
2014-11-14 15:05:11 +05:30
Nabin Hait
2c114b5bb5 Merge pull request #2407 from ankitjavalkarwork/packingsliphead
Add letterhead field and mapper in Packing Slip
2014-11-14 14:50:28 +05:30
Nabin Hait
bd38a79e5e Merge pull request #2410 from nabinhait/fix1
Minor fixes
2014-11-14 14:48:02 +05:30
Nabin Hait
ccd9fd3e94 Rounding in totals calculation 2014-11-14 14:27:24 +05:30
Nabin Hait
4215b3afc3 temporary fix in payment tool 2014-11-14 10:51:31 +05:30
ankitjavalkarwork
f60f111afe Add letterhead field and mapper in Packing Slip 2014-11-13 17:28:42 +05:30
jorxzpagta
6fe0a3cee3 Update supplier.js
Display Messages on the Communication History
2014-11-12 17:02:06 +08:00
Nabin Hait
f004077734 Map only pending qty from Material Request to Purchase Order/Stock Entry 2014-11-11 10:51:41 +05:30
Nabin Hait
6c5cfd2148 Merge pull request #2396 from nabinhait/fix1
Reference / Cheque date is after due date
2014-11-10 18:07:52 +05:30
Nabin Hait
6c1011df92 Reference / Cheque date is after due date 2014-11-10 14:57:53 +05:30
Pratik Vyas
1582a0ce78 Merge branch 'develop' 2014-11-10 12:38:45 +05:30
Pratik Vyas
b5b821363d bumped to version 4.11.1 2014-11-10 13:08:45 +06:00
Nabin Hait
399afc87ef Merge pull request #2379 from nathando/develop
Remove get_server_field from leave_application
2014-11-10 12:05:40 +05:30
Nabin Hait
8c842af172 Merge pull request #2393 from nabinhait/fix1
Credit days and payment tool fixes
2014-11-10 11:44:37 +05:30
Nabin Hait
bf836277f9 Payment tool fix: get outstanding sales orders 2014-11-10 11:28:25 +05:30
Nabin Hait
10d1806d81 Credit days validation fixes 2014-11-10 11:11:58 +05:30
Pratik Vyas
bc41ce95fc Merge branch 'develop' 2014-11-06 14:36:51 +05:30
Pratik Vyas
4948d336c4 bumped to version 4.11.0 2014-11-06 15:06:51 +06:00
Nabin Hait
be2527d93d Merge pull request #2386 from nabinhait/fix1
Translation fixed for Croatia
2014-11-06 12:52:59 +05:30
Nabin Hait
7f5bb1c8aa Translation fixed for Croatia 2014-11-06 12:51:27 +05:30
Pratik Vyas
a8d40e4409 Merge branch 'develop' 2014-11-05 14:15:47 +05:30
Pratik Vyas
e9b4686fec bumped to version 4.10.0 2014-11-05 14:45:47 +06:00
Nabin Hait
5086ef2499 Update update_requested_and_ordered_qty.py 2014-11-05 12:33:29 +05:30
Nathan Do
8a55d9a795 Remove get_server_field from leave_application
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
1caca80203 Merge pull request #2378 from nabinhait/fix1
Requested and ordered qty calculation
2014-11-04 18:06:00 +05:30
Nabin Hait
9114c26857 Patch to recalculate requested qty and ordered qty for all items 2014-11-04 15:34:03 +05:30
Nabin Hait
941a965af4 Ordered qty calculation logic 2014-11-04 15:34:03 +05:30
Nabin Hait
4acd431b92 Requested qty calculation logic 2014-11-04 15:34:03 +05:30
Nabin Hait
fad0d566f9 Payment receipt voucher print format fixed 2014-11-04 15:34:03 +05:30
Pratik Vyas
e2d4079363 Merge branch 'develop' 2014-11-03 16:04:30 +05:30
Pratik Vyas
b9ce1f590b bumped to version 4.9.3 2014-11-03 16:34:29 +06:00
Nabin Hait
36463ed790 Merge pull request #2375 from nabinhait/fix1
Check credit limit only if customer debited
2014-11-03 15:55:03 +05:30
Nabin Hait
3c8838816d Check credit limit only if customer debited 2014-11-03 15:49:29 +05:30
Nabin Hait
11e50a8eee Merge pull request #2366 from ankitjavalkarwork/fixprinthideamt
Hide totals in DN, Auto set Bank/Cash acc. in JV
2014-11-03 15:38:45 +05:30
Nabin Hait
9de4c60bd6 Merge pull request #2374 from nabinhait/fix1
minor fix
2014-11-03 15:37:51 +05:30
Nabin Hait
5288bdeabb Minor fix 2014-11-03 15:08:21 +05:30
ankitjavalkarwork
f5804438bb Auto set default bank/cash account on select of Bank/Cash Voucher in JV 2014-11-03 12:23:55 +05:30
ankitjavalkarwork
6e06357dc5 Hide totals on checking print_without_amount field in DN 2014-11-03 11:57:44 +05:30
Nabin Hait
28913b97b0 [fix] Null issue fixed in stock analytics report 2014-10-31 14:46:25 +05:30
Pratik Vyas
c59cd46391 Merge branch 'develop' 2014-10-30 14:22:17 +05:30
Pratik Vyas
dda239fd49 bumped to version 4.9.2 2014-10-30 14:52:17 +06:00
Nabin Hait
b86a6ce26a Merge pull request #2358 from nabinhait/fix1
[fix] Floating point issue fixed in payment reconciliation
2014-10-29 14:26:41 +05:30
Nabin Hait
ee212e7bb5 [fix] Floating point issue fixed in payment reconciliation 2014-10-29 14:26:05 +05:30
Nabin Hait
4952c7b3b5 Merge pull request #2343 from ankitjavalkarwork/fixcustissue
Fix Customer Issue error on click event of Serial No. field
2014-10-27 11:40:18 +05:30
ankitjavalkarwork
4e61536f50 Fix Customer Issue error on click event of Serial No. field 2014-10-27 11:08:05 +05:30
Pratik Vyas
f2886f152b Merge pull request #2348 from pdvyas/fix-pdf-test
Fix PDF test
2014-10-27 10:47:00 +05:30
Pratik Vyas
b5c56f6cea [minor] add port to test site 2014-10-27 09:51:08 +05:30
Pratik Vyas
80e95388f5 Merge branch 'develop' 2014-10-27 09:26:36 +05:30
Pratik Vyas
daed0b655a bumped to version 4.9.1 2014-10-27 09:56:36 +06:00
Nabin Hait
fbb994c731 Merge pull request #2344 from nabinhait/fix1
cost center based on project
2014-10-23 13:30:51 +05:30
Nabin Hait
10b155a486 cost center based on project 2014-10-23 13:18:59 +05:30
Nabin Hait
ce6eda709b Merge pull request #2342 from ankitjavalkarwork/fixtimelogui
Change position of 'To Time' field for better UX
2014-10-22 16:57:52 +05:30
ankitjavalkarwork
14e1d20df3 Change position of 'To Time' field for better UX 2014-10-22 16:55:29 +05:30
Pratik Vyas
da8a02d56e Merge branch 'develop' 2014-10-22 14:19:17 +05:30
Pratik Vyas
16343683d9 bumped to version 4.9.0 2014-10-22 14:49:17 +06:00
Nabin Hait
2bdc017aff Merge pull request #2339 from nabinhait/fix1
Minor fixes
2014-10-22 13:11:21 +05:30
Nabin Hait
16e05c321c Removed stock ageing grid report 2014-10-22 13:10:43 +05:30
Nabin Hait
23d7919865 Stock ageing report fix 2014-10-22 13:06:26 +05:30
Nabin Hait
38265efc39 Minor fix 2014-10-21 20:23:39 +05:30
Rushabh Mehta
2d414706dc [hotfix] translation boo boo 2014-10-21 11:49:40 +05:30
Rushabh Mehta
d85e4b0d46 Merge pull request #2331 from rmehta/translation
[translations] update
2014-10-20 17:12:22 +05:30
Rushabh Mehta
45d03af8f6 [translations] update 2014-10-20 17:11:06 +05:30
Nabin Hait
73a3a2a131 Merge pull request #2327 from nabinhait/stock_reco
Fixes in credit note and quotation
2014-10-20 11:51:01 +05:30
Nabin Hait
73804580d4 validate quotation to lead or customer 2014-10-20 11:18:11 +05:30
Nabin Hait
259f9779db Credit Note: Set total amount and print format fix 2014-10-20 11:18:11 +05:30
Pratik Vyas
14e0e58a7d Merge branch 'develop' 2014-10-17 15:04:05 +05:30
Pratik Vyas
5eb373f7b5 bumped to version 4.8.0 2014-10-17 15:34:05 +06:00
Nabin Hait
4595c30a7b Merge pull request #2322 from nabinhait/stock_reco
Partial payment reconciliation
2014-10-17 15:01:13 +05:30
Nabin Hait
fc2dd44694 Partial payment reconciliation. Fixes #1982 2014-10-17 14:57:20 +05:30
Pratik Vyas
053c54017e [minor] add admin password to travis test site 2014-10-17 14:16:10 +05:30
Pratik Vyas
af473d78f2 Merge branch 'develop' 2014-10-15 15:34:39 +05:30
Pratik Vyas
26d096aa87 bumped to version 4.7.2 2014-10-15 16:04:39 +06:00
Nabin Hait
476c613ba6 Merge pull request #2317 from nabinhait/stock_reco
repost stock utility
2014-10-15 15:33:50 +05:30
Nabin Hait
2348a5f592 repost stock utility 2014-10-15 15:31:33 +05:30
Pratik Vyas
9d8d045c66 Merge branch 'develop' 2014-10-15 14:44:35 +05:30
Pratik Vyas
63914dd55b bumped to version 4.7.1 2014-10-15 15:14:35 +06:00
Nabin Hait
93a8042f08 Merge pull request #2316 from nabinhait/stock_reco
Minor fix
2014-10-15 14:44:06 +05:30
Nabin Hait
b2f32dac1b Minor fix 2014-10-15 14:42:18 +05:30
Pratik Vyas
577a3acaac Merge branch 'develop' 2014-10-15 14:35:47 +05:30
Pratik Vyas
5e46ce8a50 bumped to version 4.7.0 2014-10-15 15:05:47 +06:00
Nabin Hait
3b7342b7b5 Merge pull request #2315 from nabinhait/stock_reco
Strip company in setup wizard
2014-10-15 13:59:07 +05:30
Nabin Hait
531077e504 Strip company in setup wizard 2014-10-15 13:55:37 +05:30
Nabin Hait
147918ed66 Merge pull request #2313 from nabinhait/stock_reco
Fix gl entries for stock transactions
2014-10-15 12:44:59 +05:30
Nabin Hait
9bbfca9226 Fix gl entries for stock transactions 2014-10-15 12:24:38 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Nabin Hait
fb6e434315 Guess valuation rate in case of negative stock 2014-10-15 11:34:40 +05:30
Rushabh Mehta
3811d96feb Merge pull request #2308 from devdesco-ceo/patch-1
Update README.md
2014-10-15 10:02:06 +05:30
Viktor Zhuromskyy
1017615d02 Update README.md 2014-10-14 10:12:10 -05:00
Pratik Vyas
056d627f46 Merge branch 'develop' 2014-10-14 17:34:01 +05:30
Pratik Vyas
663bfeacf4 bumped to version 4.6.2 2014-10-14 18:04:01 +06:00
Nabin Hait
e918ebd721 Merge pull request #2307 from nabinhait/stock_reco
Minor fixes
2014-10-14 17:16:32 +05:30
Nabin Hait
0dc18f0102 Minor fixes 2014-10-14 17:15:02 +05:30
Pratik Vyas
8ddc882a66 Merge branch 'develop' 2014-10-14 16:16:29 +05:30
Pratik Vyas
49365d0982 bumped to version 4.6.1 2014-10-14 16:46:29 +06:00
Nabin Hait
50c29c7d0f Merge pull request #2306 from nabinhait/stock_reco
Negative stock in perpetual inventory
2014-10-14 16:10:46 +05:30
Nabin Hait
bf492122f8 minor fix 2014-10-14 16:09:14 +05:30
Nabin Hait
38d0ed9f3a Negative stock allowed for perpetual inventory. Blocked in specific case 2014-10-14 16:08:19 +05:30
Pratik Vyas
248a65b37d Merge branch 'develop' 2014-10-14 12:37:07 +05:30
Pratik Vyas
78f86e9385 bumped to version 4.6.0 2014-10-14 13:07:07 +06:00
Nabin Hait
d9f3e0c275 Merge pull request #2297 from neilLasrado/bom-issue
Fix - BOM calculated wrong cost on update cost
2014-10-14 12:28:16 +05:30
Neil Trini Lasrado
c40451ee2e Patch Fixed 2014-10-14 12:14:39 +05:30
Neil Trini Lasrado
6644406185 Fix - BOM calculated wrong cost on update cost 2014-10-14 12:14:38 +05:30
Nabin Hait
b3a962e121 Merge pull request #2304 from nabinhait/stock_reco
Repost gl entries where mismatch with stock balance
2014-10-14 11:58:41 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
Nabin Hait
0a75fa09ef Merge pull request #2300 from nabinhait/stock_reco
Minor fixes
2014-10-13 11:52:00 +05:30
Nabin Hait
17a16eeaf4 Tets case fixed for payment tool 2014-10-13 11:43:14 +05:30
Nabin Hait
3d3f0bcf54 Minor fix in setup wizard 2014-10-13 11:32:41 +05:30
Nabin Hait
bc8b20ae3c Allocate entire advance amount if advance against SO/PO 2014-10-13 10:48:26 +05:30
Nabin Hait
daf344e5fd Precision fixed in batch-wise balance report 2014-10-13 10:48:26 +05:30
Pratik Vyas
7916792f99 Merge pull request #2298 from pdvyas/fix-mariadb
add my_config patch to travis
2014-10-12 19:39:52 +05:30
Pratik Vyas
27e37e68b2 add my_config patch to travis 2014-10-12 19:35:46 +05:30
Nabin Hait
a538f8a24a Merge pull request #2296 from nabinhait/stock_reco
Stock balance report and valuation fixes
2014-10-10 21:23:30 +05:30
Nabin Hait
70ec88b733 fixed test cases 2014-10-10 21:22:46 +05:30
Nabin Hait
4f0e5db216 Stock balance grid report deprecated and moved to server side 2014-10-10 20:54:57 +05:30
Nabin Hait
79ed124939 Update journal_voucher.py 2014-10-10 18:19:03 +05:30
Nabin Hait
c0a3cd603b Merge pull request #2290 from ankitjavalkarwork/accreport
Bug Fixes
2014-10-10 18:11:36 +05:30
Nabin Hait
7c6f990cf9 Minor fix for moving average 2014-10-10 18:03:27 +05:30
Nabin Hait
7820b171d3 Stock balance grid report deprecated and moved to server side 2014-10-10 18:03:07 +05:30
ankitjavalkarwork
0cf4cc283c Add Shipping Addr to Sales Invoice 2014-10-10 16:55:03 +05:30
ankitjavalkarwork
9a4b173b88 Add validation for stopped orders, advance payment in journal voucher 2014-10-10 16:28:41 +05:30
ankitjavalkarwork
6d83454237 Disallow Stopped Orders in Against Voucher table 2014-10-10 13:30:10 +05:30
ankitjavalkarwork
ff231b5e62 Allow advance JV payments in Accounts Receivable/Payable 2014-10-10 13:13:39 +05:30
Nabin Hait
4d74216147 Maintain negative stock balance if balance qty is negative 2014-10-09 19:25:19 +05:30
Nabin Hait
b7e5ad0a31 Merge pull request #2276 from ankitjavalkarwork/sopofield
Rearrange To/From, Recurring Type field for better UX
2014-10-09 11:58:13 +05:30
Pratik Vyas
e435592d64 [minor] Fix default website style patch (reload doc) 2014-10-09 11:22:12 +05:30
Nabin Hait
7ddde8dc3a Merge pull request #2278 from nabinhait/stock_reco
stock reco and repost vouchers
2014-10-08 18:38:54 +05:30
Nabin Hait
fce2881de6 minor fix 2014-10-08 18:38:27 +05:30
Nabin Hait
e96e83d557 stock reco and repost vouchers 2014-10-08 18:06:14 +05:30
ankitjavalkarwork
1b2944e871 Rearrange To/From, Recurring Type field for better UX 2014-10-08 14:24:58 +05:30
Rushabh Mehta
074e73a0dd [translations] updated via translator 2014-10-08 14:16:33 +05:30
Nabin Hait
8923801881 Update stock_entry.py 2014-10-08 13:20:31 +05:30
Nabin Hait
cfafe93391 Merge pull request #2274 from nabinhait/stock_reco
Stock reco
2014-10-08 11:03:03 +05:30
Nabin Hait
6c48ef781b Utility: Repost stock ledger entries and gl entries for all stock transactions 2014-10-08 11:02:18 +05:30
Nabin Hait
adeb976a1b Block negative stock in perpetual inventory 2014-10-08 11:02:18 +05:30
Nabin Hait
bb19b91ef9 stock reco fixes 2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd Stock reconciliation sl entries 2014-10-08 11:02:18 +05:30
Nabin Hait
b96c014daf Stock Reconciliation logic simplified 2014-10-08 11:02:18 +05:30
Pratik Vyas
e0c83e22d9 Merge branch 'develop' 2014-10-07 17:05:32 +05:30
pdvyas
099ad0f5e1 bumped to version 4.5.2 2014-10-07 17:35:32 +06:00
Nabin Hait
cf9746dd84 Merge pull request #2270 from nabinhait/fix2
Voucher dynamic link in general ledger report
2014-10-07 11:33:40 +05:30
Nabin Hait
b70712dbba Voucher dynamic link in general ledger report 2014-10-07 11:32:54 +05:30
Rushabh Mehta
4c057fe693 Merge pull request #2269 from rmehta/fixes
[fix] packing slip
2014-10-07 11:06:08 +05:30
Nabin Hait
ee8ff51d60 Merge pull request #2261 from ankitjavalkarwork/sopofield
[#2253] Rearrange To/From fields and depend on is_recurring
2014-10-07 10:52:10 +05:30
Rushabh Mehta
9974b16c32 [fix] packing slip 2014-10-07 10:52:05 +05:30
ankitjavalkarwork
9e5f319d80 [#2253] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO 2014-10-06 12:58:38 +05:30
Nabin Hait
4f614b4030 Merge pull request #2195 from neilLasrado/manufacture-and-repack
[fix] Issue #2183 - Manufacturing and repack seprated in stock entry
2014-09-30 15:11:05 +05:30
Nabin Hait
3d458e973e Merge pull request #2236 from neilLasrado/upstream/develop
Has Batch No field should be freezed #2023
2014-09-30 14:56:15 +05:30
Neil Trini Lasrado
3a19a71262 patch fixed 2014-09-30 14:48:38 +05:30
Neil Trini Lasrado
29d1a1c593 manufacturing and repack sepreted, test cases fixed, patch fixed 2014-09-30 14:07:56 +05:30
Neil Trini Lasrado
3b90de558f Has Batch No field should be freezed #2023 2014-09-30 12:57:32 +05:30
Nabin Hait
af7e31acb3 Merge pull request #2235 from adityaduggal/develop
Added the dynamic link field in the accounts receivable report.
2014-09-30 10:39:40 +05:30
Aditya Duggal
a2c9d35efb Added the dynamic link field. 2014-09-29 17:44:28 +05:30
Aditya Duggal
4c058f4056 Added the dynamic link and removed the link column 2014-09-29 17:41:19 +05:30
Pratik Vyas
ad67b84d43 Merge branch 'develop' 2014-09-29 15:40:04 +05:30
Pratik Vyas
4e81e4065b bumped to version 4.5.1 2014-09-29 16:10:04 +06:00
Nabin Hait
81332789cb Merge pull request #2232 from nabinhait/hotfix
Fix gl entries for stock transactions
2014-09-29 15:25:02 +05:30
Nabin Hait
82d7c0c9eb Patch: Fix gl entries for stock transactions 2014-09-29 15:07:51 +05:30
Nabin Hait
d60235e239 minor fix in warehouse-wise stock balance report 2014-09-29 11:36:06 +05:30
Nabin Hait
9b50b0a762 Fixes for item list view 2014-09-29 11:36:06 +05:30
Pratik Vyas
21e14c4c98 Merge branch 'develop' 2014-09-26 16:49:59 +05:30
Pratik Vyas
16edacebc7 bumped to version 4.5.0 2014-09-26 17:19:59 +06:00
Nabin Hait
75027b4d54 Merge pull request #2225 from nabinhait/hotfix
GL Entries for future stock voucher and multiple minor fixes
2014-09-26 14:48:56 +05:30
Nabin Hait
b0bd99266d Fix in landed cost voucher 2014-09-26 14:30:02 +05:30
Nabin Hait
b9e04815f8 Repost gl entries for future stock vouchers 2014-09-26 14:24:42 +05:30
Nabin Hait
18ccc27b1b Minor fix in naming naming series 2014-09-26 14:23:00 +05:30
Nabin Hait
95f1fe92e2 Maintenance visit search field issue fixed 2014-09-26 14:23:00 +05:30
Nabin Hait
b783f519ee Fixes in sales/purchase invoice trends report 2014-09-26 14:23:00 +05:30
Nabin Hait
996a1010cb Moved Installation note from tools to documents section 2014-09-26 14:23:00 +05:30
Anand Doshi
32a9dfd983 Merge branch 'sbkolate-develop' into develop 2014-09-22 13:19:24 +05:30
Anand Doshi
1394509343 Fixes for recurring document 2014-09-21 19:45:49 +05:30
Pratik Vyas
0f31c36b2c Merge branch 'develop' 2014-09-19 14:46:07 +05:30
Pratik Vyas
14ac8f71b7 bumped to version 4.4.2 2014-09-19 15:16:07 +06:00
Nabin Hait
6a92d51383 Merge pull request #2212 from nabinhait/hotfix
Fetch and validate advance entries in sales/purchase invoice
2014-09-19 14:41:20 +05:30
Nabin Hait
7c831c3fe5 Get advance in sales/purchase invoice 2014-09-19 14:31:49 +05:30
Nabin Hait
778ff463af Minor fix in authorization control 2014-09-19 11:39:47 +05:30
Nabin Hait
70a31d5402 Gantt view fix for translations 2014-09-19 11:18:10 +05:30
Nabin Hait
48f5fa69f3 Fetch and validate advance entries in sales/purchase invoice 2014-09-18 15:04:11 +05:30
Pratik Vyas
83a2d12cd2 Merge branch 'develop' 2014-09-18 14:19:15 +05:30
Pratik Vyas
e539297e53 bumped to version 4.4.1 2014-09-18 14:49:14 +06:00
Nabin Hait
bbc3d015a3 Update authorization_control.py 2014-09-18 14:09:20 +05:30
Nabin Hait
e4475c635d Merge pull request #2211 from nabinhait/hotfix
Escaped single quote in authorization control queries
2014-09-18 13:01:33 +05:30
Anand Doshi
8370cb3e71 Merge branch 'develop' of https://github.com/sbkolate/erpnext into sbkolate-develop 2014-09-18 12:06:05 +05:30
Nabin Hait
4073880ecf Escaped single quote in authorization control queries 2014-09-18 11:01:26 +05:30
Nabin Hait
763c7a56dc Merge pull request #2209 from nabinhait/hotfix
Minor fix in gross profit report
2014-09-17 14:02:51 +05:30
Nabin Hait
556fbc487d Minor fix in gross profit report 2014-09-17 12:13:44 +05:30
Pratik Vyas
54938d431c Merge branch 'develop' 2014-09-16 15:58:28 +05:30
Pratik Vyas
31c61e7eae bumped to version 4.4.0 2014-09-16 16:28:28 +06:00
Anand Doshi
a23151b138 Merge pull request #2202 from 81552433qqcom/develop
hotfix for project wise report and translation.
2014-09-16 15:23:34 +05:30
Anand Doshi
11b75759d2 Merge pull request #2194 from ankitjavalkarwork/stockbalreport
Update report with Valuation rate, stock values, move to Main report
2014-09-16 15:22:25 +05:30
Rushabh Mehta
a2c562fea4 Update CONTRIBUTING.md 2014-09-16 15:21:43 +05:30
Anand Doshi
8950abc36f Merge pull request #2197 from anandpdoshi/anand-september-15
[minor] removed Suggest
2014-09-16 15:18:57 +05:30
Anand Doshi
27c7226d97 Merge pull request #2201 from nabinhait/hotfix
Columns added in report and fixes in customer's account creation
2014-09-16 15:18:31 +05:30
81552433qqcom
1db294e837 hotfix for project wise report
translation patch for email digest and support ticket.
2014-09-16 16:49:58 +08:00
Nabin Hait
16e943f120 Removed link of item-wise last purchase rate from buying home page 2014-09-16 12:57:31 +05:30
Nabin Hait
9d610214cf Strip party name before checking for account 2014-09-16 12:28:40 +05:30
Nabin Hait
c25681c36c Added item group and brand in sales-person-wise transaction summary report 2014-09-16 12:28:40 +05:30
Nabin Hait
1aea75261d Merge pull request #2200 from nabinhait/hotfix
Minor fix
2014-09-16 11:28:15 +05:30
Nabin Hait
5cd20e3d24 Minor fix 2014-09-16 11:26:53 +05:30
Nabin Hait
9968c7ef70 Merge pull request #2199 from nabinhait/hotfix
Minor fix
2014-09-16 11:25:06 +05:30
Nabin Hait
ca260618d8 Minor fix 2014-09-16 11:24:25 +05:30
Anand Doshi
30c5b41398 [minor] removed Suggest 2014-09-15 16:43:34 +05:30
Sambhaji Kolate
f37d4337a4 fix test for purchase order 2014-09-15 13:37:46 +05:30
Anand Doshi
93c2adb2cd Merge pull request #2193 from anandpdoshi/anand-september-15
Recurring fix, cherry-picked nabin's address template fix
2014-09-15 13:04:12 +05:30
Sambhaji Kolate
525ab0a925 fix build 2014-09-15 12:57:58 +05:30
Anand Doshi
a92c6886cd Merge pull request #2173 from ankitjavalkarwork/fix2043
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +05:30
Sambhaji Kolate
930e7f5578 fix conflict 2014-09-15 12:43:48 +05:30
Sambhaji Kolate
d14e15d432 fix conflict 2014-09-15 12:31:44 +05:30
Sambhaji Kolate
4d3a18890b fix conflict 2014-09-15 12:20:11 +05:30
Nabin Hait
65bef02607 Fixes in address template 2014-09-15 12:18:28 +05:30
Rushabh Mehta
cb9331ddca Merge pull request #2191 from 81552433qqcom/develop
#2190 hotfix, item page
2014-09-15 10:13:09 +05:30
81552433qqcom
ac0c3fb696 #2190 hotfix, item page 2014-09-15 10:21:36 +08:00
Anand Doshi
a844fb78bb Merge branch '81552433qqcom-master' into develop 2014-09-12 16:23:08 +05:30
81552433qqcom
6d02939256 changed indent. as well use tab instead of space. 2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c added __() for options that need label. 2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31 month options doesn't get translated. 2014-09-12 16:07:12 +05:30
81552433qqcom
c5a0ef8399 fix according to the suggestion. 2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Anand Doshi
97478b746d Merge pull request #2185 from anandpdoshi/ankit-payment-tool
Payment Tool
2014-09-12 15:53:03 +05:30
Anand Doshi
61a591944b [minor] ui/ux fixes in Payment Tool 2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Anand Doshi
84e08fd534 Merge pull request #2174 from neilLasrado/cost-of-production-cycle-magix
Cost of Production cycle
2014-09-12 14:45:19 +05:30
Anand Doshi
b0e56fa1b5 Merge pull request #2181 from nabinhait/hotfix
Report print format fixed for translated columns
2014-09-12 14:18:52 +05:30
Neil Trini Lasrado
e7c48ed3b0 bom operation inList view fix 2014-09-12 12:08:02 +05:30
Nabin Hait
c432270ca8 Report print format fixed for translated columns 2014-09-12 12:00:47 +05:30
Neil Trini Lasrado
6a7f75c3e3 Cost of Production cycle 2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
ankitjavalkarwork
3df10429db Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form 2014-09-11 16:58:18 +05:30
Anand Doshi
eee569bb20 Merge pull request #2177 from anandpdoshi/anand-september-11
[fix] transfer_qty in get_stock_and_rate
2014-09-11 16:47:59 +05:30
ankitjavalkarwork
2e07305616 Update report with Valuation rate, stock values, move to Main report 2014-09-11 16:47:19 +05:30
Anand Doshi
2f9c36a588 Merge pull request #2175 from ankitjavalkarwork/fix2153
[minor] Add Permission for additional roles to Customer, Supplier
2014-09-11 16:47:08 +05:30
Anand Doshi
907494c5d4 [fix] transfer_qty in get_stock_and_rate 2014-09-11 16:22:12 +05:30
Sambhaji Kolate
b14401c320 change convert_to_recurring() to take recurring_id dynamicaly 2014-09-11 16:09:05 +05:30
Anand Doshi
4d2520ea53 Merge pull request #2176 from nabinhait/hotfix
Opening entry should not be considered in bank reconciliation statement
2014-09-11 15:21:24 +05:30
Nabin Hait
cece0c7ffe Opening entry should not be considered in bank reconciliation statement 2014-09-11 13:59:00 +05:30
ankitjavalkarwork
5e34383e25 [minor] Add Permission for additional roles to Customer, Supplier 2014-09-10 17:54:42 +05:30
Sambhaji Kolate
b2a3f2d386 some minor changes get fixed for PO/PI 2014-09-10 17:40:48 +05:30
Anand Doshi
8e39ee79b0 Merge pull request #2167 from anandpdoshi/anand-september-9
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
2014-09-10 15:24:52 +05:30
Sambhaji Kolate
6b679c45df Updated purchase_invoice.json and purchase_order.json with some missed out changes 2014-09-10 13:57:45 +05:30
Sambhaji Kolate
e3d2643f2b Changes for Recurring PO/PI 2014-09-10 13:07:59 +05:30
Anand Doshi
fc33d5a75b Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810 2014-09-09 15:25:43 +05:30
Pratik Vyas
6e566fb154 Merge branch 'develop' 2014-09-09 15:10:47 +05:30
Pratik Vyas
6675ce9036 bumped to version 4.3.0 2014-09-09 15:40:47 +06:00
Pratik Vyas
2cf75fcca2 change version in hooks.py 2014-09-09 15:10:18 +05:30
Anand Doshi
941f698daf Merge pull request #2165 from anandpdoshi/anand-september-9
Fix in web clear cache for Item, cheque printing format
2014-09-09 13:59:39 +05:30
Anand Doshi
48b3d1383f [minor] Cheque Printing Format 2014-09-09 12:59:16 +05:30
Anand Doshi
dc79334f1c [fix] Clear website cache for Item Group on saving Item 2014-09-09 12:35:15 +05:30
Anand Doshi
ab74a502e2 Merge pull request #2162 from nabinhait/hotfix
Get items in PO from material requests based on supplier
2014-09-09 12:07:27 +05:30
Nabin Hait
fa18e7c21f Merge pull request #2140 from nathando/patch-1
get_item_list does not [item qty=0]
2014-09-09 12:06:21 +05:30
Nabin Hait
ff7e9b6b22 Get items in PO from material requests based on supplier 2014-09-09 11:01:55 +05:30
Rushabh Mehta
00e93d1c1d Merge pull request #2159 from anandpdoshi/anand-september-8
[minor] Set in_list_view for Sales and Purchase item tables
2014-09-09 09:21:04 +05:30
Anand Doshi
45c9b1c065 [minor] Set in_list_view for Sales and Purchase item tables 2014-09-08 17:42:17 +05:30
Anand Doshi
dcfcd693c2 Merge pull request #2158 from rmehta/translated
transations-08-sep-2014
2014-09-08 15:30:15 +05:30
RM
7ab4ee1d79 transations-08-sep-2014 2014-09-08 09:28:34 +00:00
Nabin Hait
c017ed251d Merge pull request #2151 from ankitjavalkarwork/fix1999
Allow renaming for Sales Partner Doctype
2014-09-08 14:23:17 +05:30
Nabin Hait
34b94aff73 Merge pull request #2154 from anandpdoshi/anand-september-5
Setup Wizard: set corrected number format in system settings
2014-09-08 14:23:07 +05:30
Anand Doshi
65a5f85af5 Setup Wizard: set corrected number format in system settings 2014-09-05 17:27:25 +05:30
Anand Doshi
52a39a00d5 Merge pull request #2149 from anandpdoshi/anand-september-5
[fix] Validate Expense Approver
2014-09-05 15:24:24 +05:30
ankitjavalkarwork
ce9a9eeecc Allow renaming for Sales Partner Doctype 2014-09-05 14:58:21 +05:30
Nabin Hait
cbd433603d Merge pull request #2150 from nabinhait/hotfix
minor fixes
2014-09-05 14:57:02 +05:30
Nabin Hait
91fb661d12 minor fixes 2014-09-05 14:56:24 +05:30
Anand Doshi
0b74b6d98c [fix] Validate Expense Approver 2014-09-05 14:41:53 +05:30
Anand Doshi
d42326bf43 [hotfix] hooks - recurring order 2014-09-05 11:20:29 +05:30
Anand Doshi
4c93f35c2b Merge pull request #2145 from nabinhait/hotfix
Minor fixes
2014-09-04 15:38:00 +05:30
Nabin Hait
84f0cc6614 Dont show opening entries in Bank reconciliation 2014-09-04 15:21:46 +05:30
Nabin Hait
0f798dda15 Valuation rate for finished goods in repack entries 2014-09-04 15:21:46 +05:30
Nabin Hait
629e51a8e9 Search field fixed in stock entry 2014-09-04 15:21:46 +05:30
Anand Doshi
4211aa41a0 [hotfix] Product Search 'More' button 2014-09-04 15:16:13 +05:30
Anand Doshi
5893e143f4 Merge pull request #2143 from anandpdoshi/anand-septemper-3
[minor] id.csv
2014-09-04 15:00:41 +05:30
Anand Doshi
d91c4d3e00 [translations] German translations from a user 2014-09-03 21:39:05 +05:30
Anand Doshi
3d911eba6c [minor] id.csv 2014-09-03 17:33:33 +05:30
Nabin Hait
0c8e4335f9 Merge pull request #2142 from nabinhait/hotfix
removed test records for landed cost voucher
2014-09-03 14:30:50 +05:30
nathando
247e9ffc96 get_item_list does not [item qty=0]
- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note 
- Should be changed to `if d.qty is None` 

Use case for empty DN: 
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times).
2014-09-03 15:03:31 +08:00
Pratik Vyas
3f4c3086df Remove frappe version pinning in requirements.txt 2014-09-03 10:35:13 +05:30
Nabin Hait
a84f3663dd removed test records for landed cost voucher 2014-09-02 23:11:06 +05:30
Nabin Hait
714b3ef7f8 Merge pull request #2139 from nabinhait/hotfix
Repost stock reconciliation and valuation rate in repack entry
2014-09-02 20:06:28 +05:30
Nabin Hait
96bdc5834c Get valuation rate in manufacturing/repack entry 2014-09-02 20:02:25 +05:30
Nabin Hait
3f4885e342 repost stock reconciliation 2014-09-02 20:02:24 +05:30
Nabin Hait
ee2bc92ab2 Merge pull request #2134 from nabinhait/hotfix
Stock reconciliation fixes
2014-09-02 20:01:57 +05:30
Pratik Vyas
144f06e381 Update patches.txt 2014-09-01 18:31:11 +05:30
Nabin Hait
7f3f2a0f0a Fixes in repost_stock utility 2014-09-01 18:16:24 +05:30
Nabin Hait
9e563e7b47 Stock reconciliation when valuation rate column is blank 2014-09-01 18:16:24 +05:30
Nabin Hait
12ce3eefca landed cost voucher added in module page 2014-09-01 18:16:24 +05:30
Anand Doshi
f395b7ce11 [hotfix] item grid rate visibility booboo 2014-09-01 17:26:00 +05:30
Anand Doshi
4228adfaa7 Merge pull request #2109 from ankitjavalkarwork/recurringorder2
Commonified Recurring for Sales Invoice and Sales Order
2014-09-01 16:34:12 +05:30
Anand Doshi
8ad474b910 Merge pull request #2122 from neilLasrado/print-templates-fix
[Cosmetics] Print Templates Layout Improved
2014-09-01 16:33:34 +05:30
ankitjavalkarwork
737d8e4d9f fix minor issue and set default value send as pdf 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
aaac7c17b8 Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
28a975dd32 Add patch for field name change in SI, rename email template 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
e60822b094 Add tests for Recurring Document, Sales Inv, Sales Order, fix minor errors 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
ac085e0f59 Add manage_recurring_documents and path to hooks, fix minor issues 2014-09-01 16:20:59 +05:30
ankitjavalkarwork
e8331d40f3 Commonify Recurring Sales Order/Invoice 2014-09-01 16:20:59 +05:30
Rushabh Mehta
21b8d30c80 Merge pull request #2131 from anandpdoshi/anand-september-1
Hide Rate, Amount in Item Grid template based on permlevel
2014-09-01 12:52:45 +05:30
Anand Doshi
24989b90ba Hide Rate, Amount in Item Grid template based on permlevel 2014-09-01 12:38:09 +05:30
Nabin Hait
4f1bccb53d Merge pull request #2129 from anandpdoshi/anand-september-1
[patch] Set company's country
2014-09-01 11:11:19 +05:30
Anand Doshi
98eacdb785 [patch] Set company's country 2014-09-01 10:23:47 +05:30
Neil Trini Lasrado
8331ec7482 [cosmetics] Cheque Print format 2 2014-08-29 20:27:45 +05:30
Neil Trini Lasrado
d43752fc4f [cosmetics] Cheque Print format 1 2014-08-29 16:43:48 +05:30
Neil Trini Lasrado
bd03c8b28a Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix 2014-08-29 16:42:44 +05:30
Anand Doshi
d490933fce Merge pull request #2125 from anandpdoshi/anand-august-29
[fix] Maintenance Schedule, Incoming Rate
2014-08-29 16:38:03 +05:30
Neil Trini Lasrado
f65817d4c2 [cosmetics] payment receipt Print format 1 2014-08-29 16:31:57 +05:30
Anand Doshi
40a8ae2907 [fix] get incoming rate 2014-08-29 16:28:31 +05:30
Anand Doshi
12b98027ee [fix] Maintenance Scheduler periodicity validation 2014-08-29 16:11:11 +05:30
Neil Trini Lasrado
45a0ea9628 Merge branch 'develop' of https://github.com/frappe/erpnext into print-templates-fix 2014-08-29 15:48:42 +05:30
Anand Doshi
98ff85dea1 Merge pull request #2108 from neilLasrado/fix-issue-448
[Fix] Issue #448
2014-08-29 15:46:13 +05:30
Anand Doshi
0015157cba Merge pull request #2120 from nabinhait/hotfix
Fixes in BOM and maintenance schedule
2014-08-29 15:43:00 +05:30
Anand Doshi
f513531d3a Merge pull request #2114 from neilLasrado/credit-note-feature
[print-template] Credit Note Issue #31
2014-08-29 15:32:42 +05:30
Neil Trini Lasrado
4e16e9ed89 Refactored Credit Note Print Format 2014-08-29 13:20:58 +05:30
Anand Doshi
9f0ea97d85 [fix] get future vouchers query
[print-template] Credit Note Issue #31 2
2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
7a435bb4f1 [print-template] Credit Note Issue #31 1 2014-08-29 12:50:28 +05:30
Neil Trini Lasrado
014346acba [print-template] Credit Note 2014-08-29 12:50:28 +05:30
Anand Doshi
c90773cc85 Merge pull request #2115 from anandpdoshi/user-permission-doctypes
HR permissions, translations
2014-08-29 11:55:51 +05:30
Nabin Hait
0514e07ef4 minor fix 2014-08-29 11:50:59 +05:30
Nabin Hait
14b8af2e65 Rounding issue fixed for bom quantity 2014-08-29 11:50:58 +05:30
Nabin Hait
818bacae49 Minor fix in maintenance schedule 2014-08-29 11:50:58 +05:30
Anand Doshi
6ba2e3deef Merge pull request #2118 from anandpdoshi/anand-august-28
[fix] default quotation list filter
2014-08-29 11:25:21 +05:30
Anand Doshi
bb370f3b6a HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions 2014-08-29 11:19:10 +05:30
Anand Doshi
f680626f53 [minor] send translations in response 2014-08-29 11:19:10 +05:30
Neil Trini Lasrado
83ca3e5563 [Cosmetics] Print Templates Layout Improved 2014-08-28 14:48:16 +05:30
Anand Doshi
37cb544839 [fix] default quotation list filter 2014-08-28 11:27:18 +05:30
Nabin Hait
ec8964dde5 Merge pull request #2117 from anandpdoshi/anand-august-27
[fix] get future vouchers query
2014-08-28 10:43:35 +05:30
Anand Doshi
913c51b1f8 [fix] get future vouchers query 2014-08-27 22:09:15 +05:30
Neil Trini Lasrado
cd1efb94ed Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448 2014-08-27 18:49:03 +05:30
Neil Trini Lasrado
d6d71e8078 [fix] issue 448 final 1 2014-08-27 18:48:57 +05:30
Pratik Vyas
4cb67339c5 Merge pull request #2112 from anandpdoshi/anand-august-27
Enqueue Newsletter sending in Longjob Queue
2014-08-27 15:14:26 +05:30
Neil Trini Lasrado
4b71fe6fc1 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-issue-448 2014-08-27 12:31:31 +05:30
Anand Doshi
46256cddd7 Enqueue Newsletter sending in Longjob Queue 2014-08-27 12:23:52 +05:30
Neil Trini Lasrado
ad24069cdc [fix] issue 448 final 2014-08-26 16:30:39 +05:30
Nabin Hait
3b1733bc04 minor fix in sales invoice test records 2014-08-26 16:30:39 +05:30
Anand Doshi
43f087c99d [hotfix] Supplier read permission for Purchase User
[Fix] Issue #448

[Fix] Issue #448 2
2014-08-26 16:30:39 +05:30
Nabin Hait
54ca95bc6e Merge pull request #2110 from nabinhait/hotfix
minor fix in sales invoice test records
2014-08-26 16:21:32 +05:30
Nabin Hait
e3f2323e14 minor fix in sales invoice test records 2014-08-26 16:20:38 +05:30
Anand Doshi
c147667486 [hotfix] Supplier read permission for Purchase User 2014-08-26 14:26:07 +05:30
Anand Doshi
5ed2c06eb5 Merge pull request #2089 from neilLasrado/item_group
Item group
2014-08-26 12:56:54 +05:30
Neil Trini Lasrado
9d1e8b61fe [Fix] Issue #980 final 2014-08-25 19:04:30 +05:30
Anand Doshi
e0ffe7a575 [hotfix] Product Search 2014-08-25 18:38:08 +05:30
Neil Trini Lasrado
d676491b6e Merge https://github.com/frappe/erpnext into item_group 2014-08-25 16:18:31 +05:30
Anand Doshi
580f447bbd Merge pull request #2100 from rmehta/aug-22
[cleanup] remove allow_attach
2014-08-25 16:07:50 +05:30
Rushabh Mehta
52f04da5f5 [style] default website 2014-08-25 15:17:20 +05:30
Nabin Hait
06927a20b2 Update repost_stock.py 2014-08-25 14:08:54 +05:30
Neil Trini Lasrado
caba531e89 [fix] issue#980 2014-08-25 13:22:15 +05:30
Rushabh Mehta
7a6ab91080 remove set_title_left 2014-08-25 13:04:22 +05:30
Rushabh Mehta
e8dd4160d4 [cleanup] remove allow_attach 2014-08-25 13:04:21 +05:30
Anand Doshi
bb6b58c271 Merge pull request #2074 from neilLasrado/purchase-invoice-fix
[fix] frappe/erpnext#1510
2014-08-25 12:51:16 +05:30
Anand Doshi
def374370f Merge pull request #2083 from geo-poland/basic-polish-language-support
Basic Polish language support
2014-08-25 12:48:33 +05:30
Nabin Hait
b748115609 Merge pull request #2101 from nabinhait/hotfix
Required raw materials qty in PP tool
2014-08-23 20:05:42 +05:30
Nabin Hait
a592a914b8 PP Tool: get query for sales order 2014-08-22 16:25:04 +05:30
Nabin Hait
1ae48f4988 Required raw materials qty in PP tool 2014-08-22 16:20:07 +05:30
Nabin Hait
bb29d15d5a Merge pull request #2099 from nabinhait/hotfix
Minor fixes
2014-08-22 15:26:38 +05:30
Nabin Hait
40e3d0c780 General ledger: debit/credit value rounding upto 3 decimals 2014-08-22 14:37:55 +05:30
Nabin Hait
00fc600e8b PP Tool: Raise material request based on projected qty in selected warehouse 2014-08-22 14:06:22 +05:30
Nabin Hait
f4ad37d208 Reset receiver list always on create receiver list button 2014-08-22 12:42:57 +05:30
Nabin Hait
79f91109cd Update pricing_rule.py 2014-08-21 19:21:25 +05:30
Nabin Hait
d67cbdf725 Merge pull request #2097 from nabinhait/hotfix
Escaped item group value in pricing rule condition
2014-08-21 19:19:34 +05:30
Nabin Hait
16aba71da0 Escaped item group value in pricing rule condition 2014-08-21 19:02:02 +05:30
Nabin Hait
9426522159 Merge pull request #2096 from nabinhait/hotfix
Fixex in payment reconciliation
2014-08-21 18:07:39 +05:30
Nabin Hait
8058832a48 Fixex in payment reconciliation 2014-08-21 18:06:35 +05:30
Nabin Hait
fa3f22c448 Merge pull request #2093 from nabinhait/hotfix
Packing list visibility and update status on communication
2014-08-21 17:34:58 +05:30
Nabin Hait
cabf9c5bee Minor fix in status updater 2014-08-21 16:44:32 +05:30
Nabin Hait
4417529952 Packing list visibility issue 2014-08-21 16:44:32 +05:30
Anand Doshi
bb3f192b07 Merge pull request #2091 from nabinhait/hotfix
Minor fixes
2014-08-21 12:42:40 +05:30
Nabin Hait
f71011aff0 Project query fixed 2014-08-21 11:34:31 +05:30
Nabin Hait
df5ab4e228 Minor fix in maintenance schedule 2014-08-21 11:32:39 +05:30
Neil Trini Lasrado
b02b59b8c8 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-invoice-fix 2014-08-20 14:57:24 +05:30
Rushabh Mehta
f29449ba07 Merge pull request #2086 from rmehta/route-redesign
Route redesign
2014-08-20 14:49:27 +05:30
Neil Trini Lasrado
bf4ceb981f Merge https://github.com/frappe/erpnext into purchase-invoice-fix 2014-08-20 14:39:22 +05:30
Neil Trini Lasrado
84e5a4a2c2 [fix-remarks-changed-issue#110] 2014-08-20 13:44:56 +05:30
Rushabh Mehta
ebd30beee4 [route] redesigned 2014-08-20 11:44:30 +05:30
Rushabh Mehta
cb067aa579 [route] refactor, wip 2014-08-20 11:44:30 +05:30
Rushabh Mehta
74bc2baa1d remove website route, wip 2014-08-20 11:43:58 +05:30
Tytus
f546ab3130 Add csv file with initial translations. 2014-08-19 15:53:08 +02:00
Tytus
35142cb206 Add Polish language to setup wizard. 2014-08-19 15:51:36 +02:00
Nabin Hait
13313b5cb6 Merge pull request #2082 from nabinhait/hotfix
Bank reconciliation statement: show amounts which has cleared in the ban...
2014-08-19 17:42:26 +05:30
Nabin Hait
432431f2e6 fix for translation 2014-08-19 16:49:44 +05:30
Anand Doshi
dd952146d1 Merge pull request #2081 from anandpdoshi/anand-august-19
[fix] Error Reports
2014-08-19 16:37:50 +05:30
Nabin Hait
237f3765e5 Bank reconciliation statement: show amounts which has cleared in the bank but not registered in the system 2014-08-19 16:29:31 +05:30
Anand Doshi
cca6460e65 [fix] Error Reports 2014-08-19 16:06:09 +05:30
Rushabh Mehta
354acf6fc9 Merge pull request #2076 from anandpdoshi/anand-august-19
[fix] Error Reports
2014-08-19 14:07:03 +05:30
Anand Doshi
7ce0609800 Merge pull request #2077 from nabinhait/hotfix
Precision issue in tax calculation
2014-08-19 13:43:23 +05:30
Nabin Hait
0a35effe49 Precision issue in tax calculation 2014-08-19 13:22:19 +05:30
Neil Trini Lasrado
95b395505f [new fix issue No #1510] 2014-08-19 13:12:33 +05:30
Neil Trini Lasrado
67e14a48b8 [fix issue No #1510] 2014-08-19 12:35:14 +05:30
Neil Trini Lasrado
2026148dbe [fix issue No #1510] 2014-08-19 12:22:45 +05:30
Anand Doshi
78b6366325 [fix] Error Reports 2014-08-19 12:20:48 +05:30
Neil Trini Lasrado
9c3535307f [fix] frappe/erpnext#1510 2014-08-19 10:41:34 +05:30
Rushabh Mehta
5e893ef8fd Merge pull request #2073 from anandpdoshi/anand-august-18
[fix] Leave Application Calendar - Fixes #2065
2014-08-18 22:11:28 +05:30
Anand Doshi
f72de95a38 [fix] SMS Center 2014-08-18 19:51:47 +05:30
Anand Doshi
6ab831b387 Allow Default Warehouse for Item, even if not a Stock Item 2014-08-18 19:04:19 +05:30
Anand Doshi
e4c434ab6f [fix] Leave Application Calendar 2014-08-18 17:04:04 +05:30
Pratik Vyas
1f3310e0d1 Merge pull request #2072 from nabinhait/hotfix
Multiple small fixes
2014-08-18 16:49:06 +05:30
Nabin Hait
c41a9480b8 Credit limit fixes 2014-08-18 15:40:36 +05:30
Nabin Hait
6394f5b1a9 minot fix in pro order 2014-08-18 15:40:36 +05:30
Nabin Hait
448c9b71c1 minot fix in material request 2014-08-18 15:40:36 +05:30
Nabin Hait
32a3a86a00 General ledger report: invalid account 2014-08-18 15:40:36 +05:30
Nabin Hait
dcce0c86ed Minimum ordered qty validation 2014-08-18 15:40:36 +05:30
Anand Doshi
f4b3d30312 Merge pull request #2071 from anandpdoshi/anand-august-18
[minor] Removed 'PIN: ' from default Address Template
2014-08-18 14:53:26 +05:30
Anand Doshi
62aa8fa4e7 [minor] Removed 'PIN: ' from default Address Template 2014-08-18 12:53:37 +05:30
Rushabh Mehta
e8a52d810f Merge pull request #2067 from dalwadani/develop
Improve Arabic translation
2014-08-18 09:54:12 +05:30
Dhaifallah Alwadani
5e27a759b7 Improve Arabic translation 2014-08-16 18:11:48 +01:00
Pratik Vyas
c0d31ce648 Merge pull request #2062 from nabinhait/hotfix
Hotfix
2014-08-15 11:06:44 +05:30
Anand Doshi
eb39435481 [hotfix] Allow on submit for Projected Qty 2014-08-14 18:08:19 +05:30
Nabin Hait
54498452b6 Stock entry minor fix 2014-08-14 15:49:44 +05:30
Nabin Hait
821aad5281 Sales/purchase return: fixes for qty validation 2014-08-14 15:15:14 +05:30
Nabin Hait
5145b1445b Fixes in production planning tool 2014-08-14 15:15:14 +05:30
Nabin Hait
e368091627 Fixes in Payment Reconciliation 2014-08-14 15:15:14 +05:30
Anand Doshi
d5a08ea449 Merge pull request #2055 from rmehta/aug-11
Timeline and Folds
2014-08-14 12:00:03 +05:30
Rushabh Mehta
c31a1eec5b [ux] fixes to timeline 2014-08-14 11:47:31 +05:30
Rushabh Mehta
0d0f5f6c25 [ux] fixes to timeline 2014-08-14 11:43:46 +05:30
Rushabh Mehta
ab8bde0149 [ux] added folds, show actual / projected qty in pos 2014-08-14 11:43:46 +05:30
Anand Doshi
cf8bb668b3 Merge pull request #2051 from anandpdoshi/anand-august-12
[logic] Email Digest - use transaction/posting date
2014-08-12 19:51:22 +05:30
Anand Doshi
f0075b9ce2 [fix] Opportunity communication listing 2014-08-12 15:20:39 +05:30
Anand Doshi
67d249eea9 [logic] Email Digest - use transaction/posting date 2014-08-12 12:45:23 +05:30
Anand Doshi
c7105a1a79 Merge branch 'nabinhait-landed_cost' into develop 2014-08-11 18:04:08 +05:30
Anand Doshi
f957cbd8ef [test] Purchase Receipt - update rejected serial no 2014-08-11 18:03:43 +05:30
Nabin Hait
5c0db8d05e Landed Cost voucher test case for serialized items 2014-08-11 16:28:29 +05:30
Nabin Hait
200e8d971f Landed Cost voucher test case for serialized items 2014-08-11 16:12:32 +05:30
Nabin Hait
a97e700371 Add rejected serial nos in Purchase Receipt if auto-created based on series 2014-08-11 16:12:32 +05:30
Nabin Hait
4e6c52dd24 Test case fixes 2014-08-11 16:12:32 +05:30
Nabin Hait
2b776e8c3a Landed cost voucher minor fixes 2014-08-11 16:12:32 +05:30
Nabin Hait
f3e1181ad9 Landed cost voucher fixes 2014-08-11 16:12:32 +05:30
nabinhait
9cbcf96aeb no copy property for landed cost voucher amount field 2014-08-11 16:12:32 +05:30
nabinhait
8ca3189f07 pr and pi gl entries 2014-08-11 16:12:31 +05:30
nabinhait
98e7dcfe2c landed cost voucher minor fix 2014-08-11 16:12:31 +05:30
nabinhait
cfd1b10980 Purchase receipt gl entries if there is warehouse without account 2014-08-11 16:12:31 +05:30
nabinhait
f807cda375 PR and PI gl entries fixes for landed cost 2014-08-11 16:12:31 +05:30
nabinhait
11594c7927 purchase receipt gl entries 2014-08-11 16:12:31 +05:30
nabinhait
509aa52efc minor fix 2014-08-11 16:12:31 +05:30
nabinhait
e2c3f7ab14 Added help in landed cost voucher 2014-08-11 16:12:31 +05:30
nabinhait
fe39442c48 Removed old landed cost wizard 2014-08-11 16:12:31 +05:30
nabinhait
b21b6598f1 Test case for landed cost voucher 2014-08-11 16:12:31 +05:30
nabinhait
5e1b0014c2 GL entries for sub-contracting and rejected qty 2014-08-11 16:12:31 +05:30
nabinhait
cc0692d714 landed cost fix 2014-08-11 16:12:31 +05:30
nabinhait
87f2401c1e Landed Cost on_submit and gl entries for PR 2014-08-11 16:12:31 +05:30
nabinhait
f6ea21c8ae landed cost voucher design changed #1921 2014-08-11 16:12:30 +05:30
nabinhait
4436157da1 Landed cost redesign initial commit #1921 2014-08-11 16:12:30 +05:30
Anand Doshi
b00a2422e4 [hotfix] Allow on Submit - Actual / Projected Qty for Packed Item 2014-08-11 15:54:20 +05:30
Anand Doshi
475b118fba Merge pull request #2050 from anandpdoshi/anand-august-11
Feed, Form Grid
2014-08-11 13:44:01 +05:30
Anand Doshi
42335fb2cb [minor] Allow on Submit - Actual / Projected Qty 2014-08-11 13:28:29 +05:30
Anand Doshi
15ec1e1860 Merge pull request #2049 from nabinhait/hotfix
Fixes in Order trends report
2014-08-11 12:48:16 +05:30
Anand Doshi
96964a4e03 [minor] Visible Columns' Label should show ellipsis on overflow 2014-08-11 12:28:32 +05:30
Anand Doshi
e4aaa3d18f [minor] Truncate comment in Feed to 240 chars 2014-08-11 12:27:47 +05:30
Nabin Hait
a6b597a0bd Fixes in Order trends report 2014-08-11 11:54:37 +05:30
Anand Doshi
52d1ea83a0 [hotfix] Stock Entry List 2014-08-11 09:16:59 +05:30
Anand Doshi
5d64f5abd4 [hotfix] Sales Order list 2014-08-09 14:54:52 +05:30
Anand Doshi
3e103ebffe [minor] ERPNext uses MariaDB 2014-08-08 17:36:25 +05:30
Rushabh Mehta
992bc448a2 Merge pull request #2045 from rmehta/fixes-aug-8
[fix] [pos] pos view only for draft docs
2014-08-08 17:30:12 +05:30
Rushabh Mehta
23607f91cd [fix] [pos] pos view only for draft docs 2014-08-08 17:29:16 +05:30
Anand Doshi
3a97739f83 Merge pull request #2042 from rmehta/pos-module
added icon for pos
2014-08-08 16:56:45 +05:30
Rushabh Mehta
e0ee6fe8cd Merge pull request #2044 from nabinhait/hotfix
PO-PI mapping: divisional loss issue fixed
2014-08-08 16:44:15 +05:30
Rushabh Mehta
a3f76fc14d Update sales_invoice.js 2014-08-08 16:43:21 +05:30
Nabin Hait
c85abbfeca PO-PI mapping: divisional loss issue fixed 2014-08-08 16:07:02 +05:30
Rushabh Mehta
139ec2a64f Update note_list.html 2014-08-08 15:47:56 +05:30
Rushabh Mehta
72e1719220 added icon for pos 2014-08-08 15:43:26 +05:30
Pratik Vyas
3de7757ba4 Update update_project_milestones.py 2014-08-08 14:49:53 +05:30
Anand Doshi
7c3fad63b1 Merge pull request #2040 from anandpdoshi/anand-august-8
[patch] Add currency Turkish Lira
2014-08-08 14:17:39 +05:30
Anand Doshi
6b8145a813 [patch] Add currency Turkish Lira 2014-08-08 14:05:01 +05:30
Nabin Hait
688a7a7329 Merge pull request #2039 from anandpdoshi/anand-august-8
[fix] Show Employee Name in Employee Birthday report
2014-08-08 13:21:36 +05:30
Anand Doshi
26201a5828 [fix] Show Employee Name in Employee Birthday report 2014-08-08 12:49:11 +05:30
Anand Doshi
6cd59537b6 Merge pull request #2037 from nabinhait/hotfix
Fixes in 'Received Items to be Billed' report
2014-08-08 12:45:56 +05:30
Anand Doshi
854f9895e4 Merge branch 'rmehta-microtemplate-fixes' into develop 2014-08-08 11:56:52 +05:30
Anand Doshi
4cc94df752 [tests] Fixed Test Records 2014-08-08 11:56:32 +05:30
Anand Doshi
03eadb74ab Fixes to microtemplate feature 2014-08-08 11:56:32 +05:30
Rushabh Mehta
7a4e739d6c templating for hr 2014-08-08 11:56:32 +05:30
Rushabh Mehta
a660464cec added for support 2014-08-08 11:56:32 +05:30
Rushabh Mehta
c9bd3f5d4a added templates for projects 2014-08-08 11:56:32 +05:30
Rushabh Mehta
873141c1a5 more updates to lists and started sane filters 2014-08-08 11:56:32 +05:30
Rushabh Mehta
8544447b19 added more listview templates 2014-08-08 11:56:32 +05:30
Rushabh Mehta
18eb4f5015 added listviews for sales, purchase 2014-08-08 11:56:31 +05:30
Rushabh Mehta
67af99794d start custom list rendering for Sales Order 2014-08-08 11:56:31 +05:30
Rushabh Mehta
b5e768906a built item grids for sales, purchase, stock 2014-08-08 11:56:31 +05:30
Anand Doshi
c13727adba Merge branch 'rmehta-primary-action-fixes' into develop 2014-08-08 11:55:37 +05:30
Anand Doshi
69ccf9695c [minor] primary action 2014-08-08 11:51:24 +05:30
Rushabh Mehta
995185d02d [ux] fixed primary action 2014-08-08 11:51:23 +05:30
Nabin Hait
f4de6e21fa Fixes in 'Received Items to be Billed' report 2014-08-08 11:23:59 +05:30
Nabin Hait
a6db05e18d Fixes in 'Received Items to be Billed' report 2014-08-08 11:02:06 +05:30
Nabin Hait
d91cefb23d Update fix_account_master_type.py 2014-08-07 19:22:02 +05:30
Anand Doshi
e7f7416190 Merge pull request #2035 from nabinhait/hotfix
Account master type patch and Stock RBNB Diff
2014-08-07 18:15:25 +05:30
Nabin Hait
67cd3fb89c Fixes in making credit note from Sales Return 2014-08-07 15:34:53 +05:30
Nabin Hait
849b7b172a minor fix 2014-08-07 15:13:52 +05:30
Nabin Hait
9a0c46fda7 Get Stock Rreceived But Not Billed Difference Amount 2014-08-07 15:10:05 +05:30
Nabin Hait
05b56d0d08 Fix account's master type 2014-08-07 15:03:41 +05:30
Anand Doshi
43ffa64849 Merge pull request #2030 from nabinhait/hotfix
Hotfix
2014-08-06 17:39:33 +05:30
Nabin Hait
7881df2138 minor fix 2014-08-06 17:29:07 +05:30
Nabin Hait
fd90571d49 fiscal year validation in financial statement 2014-08-06 17:25:23 +05:30
Nabin Hait
9f7e00bb3a Send salary slip mail after submit via Salary Manager 2014-08-06 17:25:23 +05:30
Nabin Hait
45b7d17ee8 Employee can be reselected but not changed in salary structure 2014-08-06 17:25:23 +05:30
Rushabh Mehta
859a995bd6 Merge pull request #2025 from anandpdoshi/anand-august-5
[test] Block Delivery Note if it is linked to a cancelled Sales Order
2014-08-05 14:44:38 +05:30
Anand Doshi
959bd6e9e7 [test] Block Delivery Note if it is linked to a cancelled Sales Order 2014-08-05 14:25:40 +05:30
Anand Doshi
9c47cae5c7 Merge pull request #2024 from anandpdoshi/anand-august-5
Print Fixes
2014-08-05 14:13:17 +05:30
Anand Doshi
f16fefafe3 [print] [fix] empty item grid issue 2014-08-05 13:57:29 +05:30
Anand Doshi
8d16e9fd6d [print] convert newlines to <br> based on fieldtype for Text/Small Text 2014-08-05 11:39:51 +05:30
Anand Doshi
2b8344e75c [print] [fix] when item grid is empty 2014-08-05 11:30:37 +05:30
Rushabh Mehta
a8755af0fa Merge pull request #2022 from nabinhait/hotfix
Fixes for customer / supplier renaming
2014-08-05 10:42:44 +05:30
Rushabh Mehta
ca70eaa388 Merge pull request #2019 from anandpdoshi/anand-august-1
Account Issues
2014-08-05 10:36:08 +05:30
Pratik Vyas
1271bc4457 [hotfix] [patch] remove missing patch 2014-08-05 06:54:11 +05:30
Nabin Hait
4d18b3f96d Fixes for standard print formats 2014-08-04 17:01:01 +05:30
Nabin Hait
1279f1d430 Fixes for customer / supplier renaming 2014-08-04 13:05:59 +05:30
Anand Doshi
e88b7fbcc4 Journal Voucher Detail: show Account Balance as Dr or Cr. Fixes #675 2014-08-01 16:56:32 +05:30
Anand Doshi
8c838061f9 [minor] Check account read permission for get_balance_on 2014-08-01 16:13:44 +05:30
Anand Doshi
6c608e04bc Fixes #699 - Cost Center mandatory 2014-08-01 16:04:35 +05:30
Anand Doshi
6e4efa7edd Merge pull request #2013 from anandpdoshi/anand-july-31
Fixes and Translations
2014-08-01 11:12:19 +05:30
Anand Doshi
a66ef778ec [translations] Added Turkish, Vietnamese. Updated rest of the translations. [frappe/erpnext#2012] 2014-08-01 00:06:42 +05:30
Anand Doshi
1b90207360 [minor] [fix] Serial No Servic Contract Expiry 2014-07-31 18:57:51 +05:30
Anand Doshi
3f28ac3205 Merge pull request #2010 from anandpdoshi/anand-july-31
[print] Labels and Total Taxes and Charges
2014-07-31 16:31:57 +05:30
Anand Doshi
29817d6d8b [print] Moved Total Taxes and Charges to the right column 2014-07-31 16:05:19 +05:30
Anand Doshi
92980e6882 Merge pull request #2009 from anandpdoshi/anand-july-31
Labels: Use Date instead of Posting Date
2014-07-31 15:07:11 +05:30
Anand Doshi
b4ad175b13 Merge pull request #2008 from pdvyas/print-format-patch-fix
[patch] remove reloading of removed print formats
2014-07-31 14:53:45 +05:30
Pratik Vyas
b91079676d [patch] remove reloading of removed print formats 2014-07-31 14:31:58 +05:30
Anand Doshi
fbe37c9158 Labels: Use Date instead of Posting Date 2014-07-31 14:31:25 +05:30
Pratik Vyas
1483e9d8d2 Merge pull request #2007 from nabinhait/hotfix
Activity: fix for timeline-wise display
2014-07-31 12:45:43 +05:30
nabinhait
8efd74b9b1 Activity: fix for timeline-wise display 2014-07-31 12:12:05 +05:30
Anand Doshi
c2371af779 Merge pull request #2001 from nabinhait/hotfix
Validation: Account must belong to the same company
2014-07-31 11:55:56 +05:30
nabinhait
8dbd295c9b bom operations on_delete_row function 2014-07-31 11:40:41 +05:30
nabinhait
d6ff58daa1 Minor fix in customer issue 2014-07-31 11:40:41 +05:30
nabinhait
4859b48c43 message fix 2014-07-31 11:40:41 +05:30
nabinhait
c34329284b Post gl entries only if there are atleast 2 distinct account head 2014-07-31 11:40:41 +05:30
nabinhait
0ad677045a Test record fixed for warehouse 2014-07-31 11:40:40 +05:30
nabinhait
c1f65dd863 Validation: Account must belong to the same company 2014-07-31 11:40:40 +05:30
Anand Doshi
b9fed3f046 Merge pull request #2004 from anandpdoshi/anand-july-30
[fixes] Leave Application and Toggle Rounded Totals
2014-07-30 17:40:01 +05:30
Anand Doshi
35cc320e21 [fixes] Leave Application and Toggle Rounded Totals 2014-07-30 17:00:26 +05:30
Pratik Vyas
5a5b405a18 Update .travis.yml 2014-07-30 16:49:05 +05:30
Pratik Vyas
cd4d6a228b Update .travis.yml 2014-07-30 16:42:39 +05:30
Anand Doshi
6c5e1c9701 Merge pull request #2003 from anandpdoshi/anand-july-30
Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text
2014-07-30 14:10:16 +05:30
Anand Doshi
627f13ea26 Changed fieldtype of 'contact_email', 'contact_mobile' to Small Text 2014-07-30 13:09:01 +05:30
Anand Doshi
20fbfa2a44 [travis] 2014-07-30 11:50:05 +05:30
Anand Doshi
3f790eae55 [travis] 2014-07-29 23:42:30 +05:30
Anand Doshi
ddbf14adba Merge pull request #2002 from anandpdoshi/anand-july-29
[print] Hide Rate, Amount if Print Without Amount in Delivery Note
2014-07-29 23:38:24 +05:30
Anand Doshi
22608ad206 [travis] 2014-07-29 23:20:42 +05:30
Anand Doshi
60ee2ea8af [hotfix] Stock Entry search fields 2014-07-29 23:16:24 +05:30
Anand Doshi
bc708ee4c2 [print] Disable rounded total 2014-07-29 22:24:31 +05:30
Anand Doshi
0e93352c8d [print] Hide Rate, Amount if Print Without Amount in Delivery Note 2014-07-29 22:03:40 +05:30
Anand Doshi
a12312553b Merge pull request #1997 from nabinhait/hotfix
Fixes
2014-07-29 15:48:04 +05:30
nabinhait
78777e141a minor fix 2014-07-29 15:19:41 +05:30
Anand Doshi
9d9192d496 Merge pull request #2000 from anandpdoshi/anand-july-29
[print] Improvements to Item grid
2014-07-29 15:13:22 +05:30
Anand Doshi
ad1638e6b6 [print] Improvements to Item grid 2014-07-29 14:38:48 +05:30
nabinhait
0bab81aef9 minor fix in chart of accounts help message 2014-07-29 12:59:47 +05:30
nabinhait
92a1e06665 message fix 2014-07-29 12:46:56 +05:30
nabinhait
079611936f Delete Payment-to-invoice-matching-tool through patch 2014-07-29 12:12:09 +05:30
nabinhait
d4b92a1d20 Set ignore pricing rule while mapping SI to DN 2014-07-29 11:35:41 +05:30
nabinhait
7555d619f2 Message for frozen stock entries 2014-07-29 11:35:41 +05:30
Anand Doshi
bd748bd115 [hotfix] [patch] Delete old print formats 2014-07-29 08:51:41 +05:30
Anand Doshi
85eefadada [fix] [print] Print Hide Item Code 2014-07-28 21:17:20 +05:30
Anand Doshi
07d3261467 [hotfix] don't override default print format if specified in POS Sales Invoice 2014-07-28 19:55:13 +05:30
Anand Doshi
11586eda4c [minor] [fix] taxes print 2014-07-28 17:38:08 +05:30
Anand Doshi
423361946d Merge pull request #1996 from nabinhait/hotfix
Fixes
2014-07-28 16:56:11 +05:30
nabinhait
0a35277c96 Stock reconciliation only for valuation 2014-07-28 16:41:34 +05:30
nabinhait
16317748dd Issue fixes related to length of the report result 2014-07-28 16:41:34 +05:30
nabinhait
3d48a4ef65 Sales / purchase return: Get party details fix 2014-07-28 16:41:33 +05:30
nabinhait
b739264243 Don't run company trigger on amendment 2014-07-28 16:41:33 +05:30
nabinhait
957971eb1d Column added 'Reqd by Date' in po_items_to_be_billed report 2014-07-28 16:41:33 +05:30
Anand Doshi
e3c161f0ea Merge pull request #1995 from anandpdoshi/anand-july-28
[minor] apply pricing rule / price list only if item_code
2014-07-28 16:05:42 +05:30
Anand Doshi
39edcbc93b [minor] apply pricing rule / price list only if item_code 2014-07-28 16:00:19 +05:30
Anand Doshi
beb3e35153 Merge pull request #1989 from dalwadani/develop
Improve Arabic Translation
2014-07-28 15:46:22 +05:30
Anand Doshi
0416e59267 Merge pull request #1994 from anandpdoshi/anand-july-28
[minor] Show company name in General Ledger print
2014-07-28 15:44:07 +05:30
Anand Doshi
57f8dabf59 [minor] Show company name in General Ledger print 2014-07-28 15:28:44 +05:30
Anand Doshi
9ea4154b81 Merge pull request #1993 from anandpdoshi/anand-july-28
[minor] Fixed address listing
2014-07-28 14:21:29 +05:30
Anand Doshi
9c018fe984 [minor] Fixed address listing 2014-07-28 12:59:52 +05:30
Dhaifallah Alwadani
faeca7cf11 Improve Arabic Translation 2014-07-26 05:43:03 +03:00
Nabin Hait
f8b318aef1 Merge pull request #1987 from anandpdoshi/anand-july-25
[fix] Feed listing based on permissions
2014-07-25 15:08:30 +05:30
Anand Doshi
93e2defc96 [fix] Feed listing based on permissions 2014-07-25 14:57:37 +05:30
Anand Doshi
1c735365d0 Merge pull request #1986 from anandpdoshi/rmehta-print-formats
Print Formats (by Rushabh)
2014-07-25 13:58:18 +05:30
Anand Doshi
161f63d393 [travis] Install wkhtmltopdf 2014-07-25 13:36:47 +05:30
Anand Doshi
8f49cf7c03 [minor] fixed testcase 2014-07-25 13:02:29 +05:30
Anand Doshi
62b1cbf003 [impact] Limit available functions in jinja environment 2014-07-25 13:02:29 +05:30
Anand Doshi
a5437cdac1 Fixes for print 2014-07-25 13:02:28 +05:30
Anand Doshi
16deabef82 Format Qty 2014-07-25 13:02:28 +05:30
ankitjavalkarwork
82ec488b99 Payment Reconciliation Feature/Tool - Patch 2014-07-25 13:02:28 +05:30
Rushabh Mehta
781ddc3a25 added patch to remove old print formats 2014-07-25 13:02:28 +05:30
Rushabh Mehta
85ff3bcd04 updated pos invoice 2014-07-25 13:01:53 +05:30
Rushabh Mehta
5b51cc86a9 many fixes to print 2014-07-25 13:01:53 +05:30
Rushabh Mehta
d82352eacc item grid, added other printable fields in description 2014-07-25 13:01:53 +05:30
Rushabh Mehta
f84c240d1c cleanup for print format 2014-07-25 13:01:52 +05:30
Rushabh Mehta
28804bfb62 started sales order print format (new style) 2014-07-25 13:01:52 +05:30
Nabin Hait
5cf3a6bcd2 Merge pull request #1975 from anandpdoshi/anand-july-22
Trial Balance and Newsletter sending via Worker
2014-07-25 11:21:13 +05:30
Anand Doshi
329a8ef9a1 Merge pull request #1985 from ankitjavalkarwork/payrec
Remove Payment To Invoice Matching Tool
2014-07-24 18:57:46 +05:30
Anand Doshi
9e89dcf855 Merge pull request #1984 from nabinhait/hotfix
Fix for company in chart of accounts
2014-07-24 18:57:31 +05:30
ankitjavalkarwork
344dd3793a Merge branch 'develop' of https://github.com/frappe/erpnext into payrec 2014-07-24 15:15:12 +05:30
ankitjavalkarwork
d93f4c99e1 Remove Payment To Invoice Matching Tool 2014-07-24 15:14:36 +05:30
nabinhait
ffd57a0565 Fix for company in chart of accounts 2014-07-24 10:40:18 +05:30
Rushabh Mehta
92c043423e updated bench 2014-07-23 15:57:01 +05:30
Anand Doshi
d1a2ce2750 [minor] is_ajax check in newsletter 2014-07-23 12:51:17 +05:30
Rushabh Mehta
3c78ab5841 [email digest] [fix] [hot] only open to-do items 2014-07-23 10:19:31 +05:30
Anand Doshi
de85a3af15 Newsletter: Bulk Send via worker 2014-07-22 19:49:16 +05:30
Anand Doshi
cb86d597b7 Report: Trial Balance 2014-07-22 19:49:16 +05:30
Nabin Hait
9df4196597 Merge pull request #1970 from ankitjavalkarwork/payrec
Added Payment Reconciliation to list accounts.py
2014-07-22 18:24:58 +05:30
ankitjavalkarwork
87633d6be6 Payment Reconciliation Feature/Tool - Patch 2014-07-22 18:14:30 +05:30
Anand Doshi
33a94a74df Merge pull request #1968 from nabinhait/hotfix
Fixes
2014-07-22 17:39:07 +05:30
ankitjavalkarwork
b5ae643b6e Payment Reconciliation Feature/Tool - minor change 2014-07-22 15:26:04 +05:30
ankitjavalkarwork
b0cffac79d Payment Reconciliation Feature/Tool - add in module list 2014-07-22 15:02:59 +05:30
nabinhait
b5f9b5de45 PP Tool: data for required raw materials 2014-07-22 11:38:15 +05:30
nabinhait
c772b3d86a Purchase invoice: Copy project name from first row on addition of row 2014-07-22 11:38:14 +05:30
nabinhait
7d7123de37 Merge branch 'ankitjavalkarwork-wip_payrec' into develop 2014-07-21 19:23:20 +05:30
nabinhait
7f1e4a29c5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2014-07-21 19:23:07 +05:30
nabinhait
97ab902895 payment reconciliation fixes 2014-07-21 19:22:02 +05:30
Anand Doshi
6e15f675a5 Merge pull request #1966 from anandpdoshi/anand-july-21
Stock Entry Warehouse prefill, Item autosuggest by description
2014-07-21 18:25:16 +05:30
Anand Doshi
67ecce695d [fix] Show against account in General Ledger Print Format 2014-07-21 18:13:05 +05:30
Anand Doshi
ac11d6ff97 Merge pull request #1964 from frappe/new-production-order-fix
[minor] fix server error for new production order if sales order is invalid
2014-07-21 18:05:06 +05:30
Anand Doshi
4c5d7617fb [minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form 2014-07-21 18:02:22 +05:30
Anand Doshi
7fcb3c9865 [minor] Item query - search by description 2014-07-21 17:51:32 +05:30
Pratik Vyas
994d9075b4 Change TRAVIS_BRANCH to develop 2014-07-21 17:36:50 +05:30
Pratik Vyas
649d18c4f7 [minor] fix server error for new production order if sales order is invalid 2014-07-21 17:17:59 +05:30
Nabin Hait
cbf0cb7de7 Merge pull request #1955 from anandpdoshi/financial-statements
Balance Sheet and Profit and Loss Statement
2014-07-21 16:44:46 +05:30
Anand Doshi
5f0459c321 Fixes to Financial Statements 2014-07-21 16:13:06 +05:30
nabinhait
2d355c7478 Merge branch 'wip_payrec' of github.com:ankitjavalkarwork/erpnext into ankitjavalkarwork-wip_payrec 2014-07-21 15:33:50 +05:30
ankitjavalkarwork
4dfe19e613 Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-21 14:23:52 +05:30
Rushabh Mehta
1c6313679b Update material_request.js 2014-07-21 13:08:49 +05:30
Anand Doshi
f457bce0e7 Changed localize_date to formatdate 2014-07-21 12:03:04 +05:30
Anand Doshi
6cc5babd2e Use include directive to embed common print format 2014-07-21 11:43:19 +05:30
Anand Doshi
db4ba39824 Better handling of ignore zero values 2014-07-21 11:43:19 +05:30
Anand Doshi
825d014616 Commonfied code for Financial Statements and added Profit and Loss Statement 2014-07-21 11:43:18 +05:30
Anand Doshi
fa576a22e3 Balance Sheet 2014-07-21 11:43:18 +05:30
Anand Doshi
059f1e09a8 Balance Sheet - first cut 2014-07-21 11:43:18 +05:30
Anand Doshi
7a7675c7ef Merge pull request #1957 from nabinhait/hotfix
Hotfix
2014-07-19 18:17:52 +05:30
nabinhait
b1e7bf16ba Translate while creating India specific accounts 2014-07-19 17:56:43 +05:30
nabinhait
711e8bec3d Fixes overflow tolerance 2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67 Fixes overflow tolerance 2014-07-19 16:53:45 +05:30
ankitjavalkarwork
5283e5a7d8 Add Payment Reconciliation Feature/Tool - JS changes1 2014-07-18 15:54:29 +05:30
Anand Doshi
1a2516d4be Merge pull request #1953 from anandpdoshi/anand-july-18
Minor fix in reorder item
2014-07-18 10:32:14 +05:30
Anand Doshi
d141cf7293 Minor fix in reorder item 2014-07-18 10:31:34 +05:30
Anand Doshi
3c45c37428 Merge pull request #1952 from nabinhait/hotfix
Country mandatory in company master
2014-07-18 10:22:13 +05:30
nabinhait
d4e080be29 Country mandatory in company master 2014-07-17 19:32:12 +05:30
ankitjavalkarwork
84fd33ea7a Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-17 19:11:07 +05:30
ankitjavalkarwork
87e30f68b9 Add Payment Reconciliation Feature/Tool - Complete 2014-07-17 19:10:45 +05:30
Anand Doshi
e8332be285 Merge pull request #1949 from anandpdoshi/anand-july-17
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
e5df7a7f01 Merge pull request #1935 from nabinhait/hotfix
Default letter head in general ledger and bank reco statement print
2014-07-17 12:31:34 +05:30
Anand Doshi
fa0db761da Fix in Stock Entry test case 2014-07-17 12:30:55 +05:30
nabinhait
5f2f955224 From date and to date in general ledger print format 2014-07-17 12:29:56 +05:30
nabinhait
e26204e61d From date and to date in general ledger print format 2014-07-17 12:22:58 +05:30
nabinhait
fa1cd5faff Fixed root type of liability accounts 2014-07-17 11:52:50 +05:30
nabinhait
d16081c4d9 Batch no get query fix 2014-07-17 11:08:19 +05:30
nabinhait
143400d444 Batch no get query fix 2014-07-17 11:00:13 +05:30
nabinhait
96cb130263 Default letter head in general ledger and bank reco statement print 2014-07-17 10:56:07 +05:30
Nabin Hait
0a4c824a06 Merge pull request #1946 from anandpdoshi/anand-july-16
Fixes in load defaults of transaction.js
2014-07-16 20:04:37 +05:30
Anand Doshi
b8189d7d23 Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified 2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067 Fixes in Stock Entry test cases 2014-07-16 19:23:58 +05:30
Anand Doshi
f214bfcfc3 Fixes in load defaults of transaction.js 2014-07-16 17:53:02 +05:30
Rushabh Mehta
2e21e25613 Merge pull request #1945 from anandpdoshi/anand-july-16
Fixes in Stock Entry and test cases
2014-07-16 17:04:18 +05:30
Anand Doshi
d93fa2f78b Fixes in Stock Entry and test cases 2014-07-16 16:08:15 +05:30
Anand Doshi
75936cdde5 Merge pull request #1942 from anandpdoshi/anand-july-16
Fixes in Setup Wizard and Support Ticket
2014-07-16 13:17:50 +05:30
Anand Doshi
e73ed2afae Setup Wizard: fixed attachment issue #1940 2014-07-16 11:48:51 +05:30
Anand Doshi
c70d2d23a8 Support Ticket: set resolution_date as None if missing 2014-07-16 11:48:51 +05:30
ankitjavalkarwork
540a1eb6d9 Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-15 18:02:08 +05:30
ankitjavalkarwork
d934cd105b Add Payment Reconciliation Feature/Tool - invoice entries table population 2014-07-15 18:01:36 +05:30
ankitjavalkarwork
ec05d7f8a1 Add Payment Reconciliation Feature/Tool - javascript validation 2014-07-14 18:28:10 +05:30
ankitjavalkarwork
345753ed19 Add Payment Reconciliation Feature/Tool - fetch unreconciled entries 2014-07-14 16:38:27 +05:30
Anand Doshi
c58e6c0dff Merge pull request #1932 from nabinhait/hotfix
Fixes
2014-07-14 14:28:05 +05:30
Anand Doshi
1829bd84d3 hotfix: website_image 2014-07-14 14:26:42 +05:30
nabinhait
7700c62fa8 Minor fix 2014-07-14 14:21:21 +05:30
Anand Doshi
8efbf5ef33 Merge pull request #1933 from anandpdoshi/anand-july-14
Fixed Address and Contact report name
2014-07-14 14:16:26 +05:30
Anand Doshi
e8c5cb8c9a Fixed Address and Contact report name 2014-07-14 13:10:24 +05:30
nabinhait
d5fd535909 Minor fix, if no default company 2014-07-14 12:39:50 +05:30
nabinhait
b0a8d000b1 Utility: reset serial no status and warehouse 2014-07-14 11:56:03 +05:30
nabinhait
5c38488590 Utility: reset serial no status and warehouse 2014-07-14 11:44:42 +05:30
nabinhait
614fb750b7 set qty as per stock uom in entire purchase cycle 2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f Expense account can be liability account for stock reconciliation 2014-07-14 10:48:11 +05:30
ankitjavalkarwork
0e57b971ad Add Payment Reconciliation Feature/Tool - minor changes 2014-07-11 16:08:55 +05:30
ankitjavalkarwork
90b79fcd1f Add Payment Reconciliation Feature/Tool - minor changes 2014-07-11 15:23:26 +05:30
webnotes
9d31705f75 Merge https://github.com/frappe/erpnext into wip_payrec 2014-07-11 11:21:51 +05:30
webnotes
059922cef1 Add Payment Reconciliation Feature/Tool 2014-07-11 11:20:44 +05:30
Rushabh Mehta
8e4a9ba831 Merge pull request #1927 from anandpdoshi/anand-july-10
Bank Reconciliation Statement Print Format
2014-07-10 21:59:05 +05:30
Anand Doshi
9b7b9b2e93 Bank Reconciliation Statement Print Format 2014-07-10 18:45:03 +05:30
Rushabh Mehta
e0d7a6869c Merge pull request #1926 from anandpdoshi/anand-july-10
Production Planning Tool - Fixed bom get query
2014-07-10 17:37:34 +05:30
Anand Doshi
28c4bee0b1 Production Planning Tool - Fixed bom get query 2014-07-10 16:43:31 +05:30
Rushabh Mehta
052b5a68ed Merge pull request #1925 from nabinhait/hotfix
Overflow validation fixed
2014-07-10 15:46:08 +05:30
nabinhait
ee8b6f28b8 minor fix 2014-07-10 15:27:27 +05:30
nabinhait
d5fb5d91e9 overflow validation fixed 2014-07-10 15:27:27 +05:30
Anand Doshi
16658c14fe Merge pull request #1924 from anandpdoshi/anand-july-10
Print Hide other charges calculation
2014-07-10 13:09:39 +05:30
Anand Doshi
a96cf5b96b Print Hide other charges calculation 2014-07-10 12:16:39 +05:30
Anand Doshi
287fe0559e Merge pull request #1920 from anandpdoshi/anand-july-9
Fixes in queries
2014-07-09 13:39:51 +05:30
Anand Doshi
9006bba11e Merge pull request #1919 from nabinhait/hotfix
Github issue fixes
2014-07-09 13:39:38 +05:30
Anand Doshi
48d3b54e02 Fixes in queries 2014-07-09 13:15:03 +05:30
Anand Doshi
0c3bb75fd9 Added error_report_email in hooks 2014-07-09 12:59:56 +05:30
nabinhait
7e848b1924 Title mandatory in Note. Fixes #1913 2014-07-09 12:54:56 +05:30
nabinhait
8e4fcca216 Get query fixes in address in contact listing. Fixes #1911 2014-07-09 12:50:50 +05:30
nabinhait
fcfa42d992 Minor fixes #1917 2014-07-09 11:31:11 +05:30
nabinhait
5e0de79c0d Account validated in general ledger report. Fixed #1912 2014-07-09 11:10:40 +05:30
Anand Doshi
8adb211216 Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py 2014-07-09 11:09:53 +05:30
nabinhait
5eea6f1b6d Account validated in general ledger report. Fixed #1912 2014-07-09 11:08:59 +05:30
Rushabh Mehta
3f606b6c64 Update project.py 2014-07-09 09:27:02 +05:30
Rushabh Mehta
f31221d0d3 Changed raise Exception to frappe.throw 2014-07-09 09:13:00 +05:30
nabinhait
5220b462fd Merge branch 'anandpdoshi-reapply-price-list' into develop 2014-07-08 16:03:53 +05:30
nabinhait
89b5e3e2ea Set discount zero while fetching price list rate 2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list 2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc Sales Order: Fixed test case 2014-07-07 18:46:02 +05:30
Anand Doshi
46d64849b4 Merge pull request #1902 from nabinhait/hotfix
Run trigger of company field on onload function, even if company exists
2014-07-07 18:08:51 +05:30
nabinhait
6c40079139 Update delivery and billing status in SO 2014-07-07 18:02:53 +05:30
nabinhait
2c0c66e756 Update delivery and billing status in SO 2014-07-07 17:56:25 +05:30
nabinhait
bc408d8d0b Run trigger of company field on onload function, even if company exists 2014-07-07 17:56:24 +05:30
Anand Doshi
06cf2c7b51 Merge pull request #1903 from anandpdoshi/anand-july-7
Translations: Indonesian, Japanese and Russian
2014-07-07 17:44:04 +05:30
Anand Doshi
37f15ea664 Translations: Indonesian, Japanese and Russian 2014-07-07 17:26:51 +05:30
Anand Doshi
0da9060a80 Merge pull request #1900 from anandpdoshi/anand-july-7
Fix in Purchase Order and Re-order Item
2014-07-07 16:12:50 +05:30
Anand Doshi
e729516af7 Minor fix 2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c Catch FiscalYearError in Re-order Item 2014-07-07 15:21:18 +05:30
Anand Doshi
484b092720 BugFix in Purchase Order: Validate minimum order qty using Qty in Stock UOM 2014-07-07 14:03:26 +05:30
Rushabh Mehta
ada6e5a5c4 Merge pull request #1899 from anandpdoshi/anand-july-7
BugFix: Maintenance Visit against Customer Issue
2014-07-07 13:57:59 +05:30
Anand Doshi
2cf256c6d0 Merge pull request #1898 from rmehta/pdf-etc
sales order status bugfix, add leading / in website_image and removed se...
2014-07-07 13:09:22 +05:30
Rushabh Mehta
58692fe4d1 sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment 2014-07-07 12:29:43 +05:30
Anand Doshi
3a389788bf BugFix: Maintenance Visit against Customer Issue
+ Map Item details from Customer Issue into Maintenance Visit Purpose Table
+ Map Prev DocType and Prev DocName
+ Changed prevdoc_doctype and prevdoc_docname into Dynamic Link
2014-07-07 12:24:19 +05:30
Rushabh Mehta
47f26b0df4 Merge pull request #1896 from anandpdoshi/anand-july-7
BugFix: selling_controller.py
2014-07-07 11:50:54 +05:30
Anand Doshi
80a988c04f BugFix: selling_controller.py 2014-07-07 11:35:54 +05:30
Anand Doshi
51f722d20f Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate 2014-07-04 15:44:49 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
Anand Doshi
f9cae65df5 Merge pull request #1884 from nabinhait/hotfix
Hotfix
2014-07-04 15:31:15 +05:30
Rushabh Mehta
bcad536a90 Merge pull request #1883 from anandpdoshi/anand-july-3
Issues originating due to sql_mode='STRICT_ALL_TABLES'
2014-07-03 15:18:06 +05:30
Anand Doshi
d2f44006bd Issues originating due to sql_mode='STRICT_ALL_TABLES'
Fixes frappe/frappe-bench#18
2014-07-03 14:32:21 +05:30
nabinhait
23cce731ab Fixes in action, not defined if called from outside document class 2014-07-03 12:25:06 +05:30
Prakash Hodage
c01f4582de Description removed for default cost center 2014-07-03 10:50:35 +05:30
Rushabh Mehta
0e085e15bb Merge pull request #1881 from anandpdoshi/anand-wip
Fixes to end_of_life conditions
2014-07-02 18:16:54 +05:30
Anand Doshi
e673a664ac Fixes to end_of_life conditions 2014-07-02 18:15:01 +05:30
Anand Doshi
57f76e936a Merge pull request #1880 from rmehta/fixes-july-2
formatting fix in support ticket autoreply
2014-07-02 18:13:55 +05:30
Rushabh Mehta
501b2cc617 duplicate name fix for customer 2014-07-02 18:01:30 +05:30
Anand Doshi
843cdbe690 Merge pull request #1879 from anandpdoshi/anand-wip
Fixed Employee Birthday Report
2014-07-02 17:44:05 +05:30
Anand Doshi
df7f1c17ac Fixed Employee Birthday Report 2014-07-02 17:35:00 +05:30
Anand Doshi
1601742092 Merge pull request #1878 from anandpdoshi/anand-wip
Automatic Outstanding Writeoff
2014-07-02 17:17:29 +05:30
Rushabh Mehta
6084a3e63a formatting fix in support ticket autoreply 2014-07-02 17:13:08 +05:30
Anand Doshi
adfada707d Automatic Outstanding Writeoff 2014-07-02 17:10:46 +05:30
Anand Doshi
e8533d15b3 Hotfix: Get Balance query 2014-07-01 19:46:22 +05:30
Anand Doshi
67721444b9 Merge pull request #1875 from rmehta/develop
status_updater.py
2014-07-01 18:50:25 +05:30
Rushabh Mehta
5f42276dbd added patch for fixing sales order delivered qty 2014-07-01 18:42:59 +05:30
Rushabh Mehta
c53efc0d6c fix status_updater - update delivery status in Sales Order from Sales Invoice 2014-07-01 18:42:30 +05:30
Rushabh Mehta
ddd2648c1e fix travis, build website before tests 2014-07-01 18:42:30 +05:30
Rushabh Mehta
079e640b6b Merge pull request #1876 from anandpdoshi/anand-wip
Fix JV Remarks
2014-07-01 18:35:13 +05:30
Anand Doshi
bc71f737b8 Fix JV Remarks 2014-07-01 18:12:26 +05:30
Anand Doshi
c33ae0c7df Minor fix: commonified message. 2014-07-01 16:27:24 +05:30
Rushabh Mehta
e9f43251ab Update journal_voucher.py 2014-07-01 15:19:15 +05:30
Rushabh Mehta
bc920dd2a5 Merge pull request #1868 from anandpdoshi/anand-wip
Fix comments
2014-07-01 12:34:17 +05:30
Anand Doshi
9398932c47 Merge pull request #1869 from nabinhait/v4-hotfix
Minor fix in authorization rule
2014-06-30 18:47:42 +05:30
Anand Doshi
da8adea0a9 Fixed customer test 2014-06-30 17:28:52 +05:30
Nabin Hait
669e789bc3 Minor fix in authorization rule 2014-06-30 17:15:52 +05:30
Anand Doshi
02cb347ac7 Fix comments after naming series records rename 2014-06-30 17:05:51 +05:30
Anand Doshi
0e72a87613 Improved test_rename: check if comments are also moved on rename 2014-06-30 17:05:51 +05:30
Anand Doshi
8ac4643fd7 Merge pull request #1867 from nabinhait/v4-hotfix
Multiple fixes
2014-06-30 13:20:49 +05:30
Rushabh Mehta
578a6db659 Merge pull request #1866 from anandpdoshi/anand-wip
Fixed get_sender for Sales and Jobs
2014-06-30 12:33:10 +05:30
Anand Doshi
4aa2380de2 Fixed get_sender for Sales and Jobs 2014-06-30 12:19:22 +05:30
Anand Doshi
2adf73cca1 Fixed requirements.txt 2014-06-30 12:18:08 +05:30
Anand Doshi
27b0d16422 Bumped to v4.1.0 2014-06-30 12:09:41 +05:30
Anand Doshi
c459fe21f8 Merge pull request #1865 from frappe/wip-4.1
Wip 4.1
2014-06-30 12:00:55 +05:30
Nabin Hait
6c7cd70202 Pricing rule condition if item group missing 2014-06-30 11:50:17 +05:30
Nabin Hait
606c601fc0 Make debit/credit note from sales/purchase return 2014-06-30 11:50:17 +05:30
Nabin Hait
7c9652997b Item website specification from item group 2014-06-30 11:50:17 +05:30
Nabin Hait
4e4a83bcef Fixes in maintenance schedule 2014-06-30 11:50:17 +05:30
Anand Doshi
7cac2884ae Merge pull request #1862 from anandpdoshi/anand-wip-4.1
Fixes in Website Route system and other misc fixes
2014-06-30 11:30:30 +05:30
Anand Doshi
11ada53ed5 Fixes related to Website Route system and other misc fixes 2014-06-28 12:13:11 +05:30
Anand Doshi
5ba7ab0fed Outgoing Mail Footer patch 2014-06-27 21:00:51 +05:30
Anand Doshi
ebcb654649 Minor: General Ledger Report - print format improvements 2014-06-27 20:53:13 +05:30
Nabin Hait
a46af033b9 Merge pull request #1860 from nabinhait/v4-hotfix
item  query fixed in stock entry
2014-06-27 13:04:58 +05:30
Nabin Hait
a0a18d963d item query fixed in stock entry 2014-06-27 13:04:22 +05:30
Anand Doshi
4105f324f7 Merge pull request #1858 from nabinhait/v4-hotfix
with_doc issue fixes
2014-06-26 16:16:35 +05:30
Nabin Hait
b7e91ee95e with_doc issue fixes 2014-06-26 15:54:45 +05:30
Anand Doshi
f1af06c00d Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-26 15:05:42 +05:30
Anand Doshi
779111d781 Merge pull request #1856 from nabinhait/v4-hotfix
V4 hotfix
2014-06-26 15:03:59 +05:30
Nabin Hait
3e6586f58d minor fix 2014-06-26 14:56:47 +05:30
Nabin Hait
cf2632fe59 Fetch warehouse from pos settings 2014-06-26 13:05:10 +05:30
Anand Doshi
322f3caec6 Merge pull request #1854 from anandpdoshi/anand-wip-4.1
Changed System Signature to Footer
2014-06-26 12:59:08 +05:30
Anand Doshi
56198f40ac Changed System Signature to Footer 2014-06-26 12:47:45 +05:30
Nabin Hait
4a1c897b2d Select field options in serial no 2014-06-26 12:35:14 +05:30
Rushabh Mehta
2b62accee0 Merge pull request #1853 from anandpdoshi/anand-wip
Material Request: fixed series issue in insert_purchase_request
2014-06-26 12:31:17 +05:30
Rushabh Mehta
16e543e734 Merge pull request #1852 from anandpdoshi/anand-wip-4.1
Fixes frappe/erpnext#1849
2014-06-26 12:30:29 +05:30
Anand Doshi
1030af7b48 Material Request: fixed series issue in insert_purchase_request 2014-06-26 12:07:55 +05:30
Anand Doshi
7f41ff26fa Fixes frappe/erpnext#1849 2014-06-26 12:02:55 +05:30
Rushabh Mehta
994f0c3d49 Merge pull request #1851 from nabinhait/v4-hotfix
Show Frozen field in account to all if Frozen Account Modifier is not sp...
2014-06-26 10:59:27 +05:30
Nabin Hait
500e1bc9b5 Show Frozen field in account to all if Frozen Account Modifier is not specified in Accounts Settings 2014-06-26 10:53:32 +05:30
Nabin Hait
23152f68f2 Merge pull request #1845 from nabinhait/v4-hotfix
V4 hotfix
2014-06-25 19:16:05 +05:30
Nabin Hait
00778c9a1e Validate expense account for perpetual inventory 2014-06-25 19:12:24 +05:30
Nabin Hait
33a21ffbdc Minor fixes in recurring invoice 2014-06-25 18:35:36 +05:30
Anand Doshi
5263b1a9c1 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-25 17:06:51 +05:30
Anand Doshi
3fc1088d73 Merge branch 'rmehta-wip-4.1' into wip-4.1 2014-06-25 17:04:37 +05:30
Anand Doshi
d12be12f72 Fixed gantt chart query for Task 2014-06-25 16:57:51 +05:30
Anand Doshi
fda8858fc3 Warehouse query filtered by company 2014-06-25 16:57:50 +05:30
Nabin Hait
29de86253f minor fixes 2014-06-25 16:57:50 +05:30
Nabin Hait
c7c89a5927 Cost center-wise net profit in financial analytics report 2014-06-25 16:57:50 +05:30
Nabin Hait
48f1142523 Fixed address deletion issue 2014-06-25 16:57:50 +05:30
Nabin Hait
9c2459658a Fixes for recurring invoice 2014-06-25 16:57:50 +05:30
Anand Doshi
ca37ff8b08 Fix in pricing rule patch 2014-06-25 16:57:50 +05:30
Nabin Hait
e6440a75b5 Allowed renaming for project 2014-06-25 16:57:50 +05:30
Nabin Hait
2b400dc2ad stock entry incoming rate based on precision 2014-06-25 16:57:49 +05:30
Nabin Hait
860b2e2bbb Fixes in pricing rule 2014-06-25 16:57:49 +05:30
Nabin Hait
f27fa5cbf3 Fixes in pricing rule 2014-06-25 16:57:49 +05:30
Nabin Hait
98bec6f96b Fixes in pricing rule 2014-06-25 16:57:49 +05:30
Nabin Hait
379d86f9a3 sms sending issue fixed 2014-06-25 16:57:49 +05:30
Anand Doshi
8b2dfcff29 Naming Series Property Setter Patch 2014-06-25 16:57:49 +05:30
Nabin Hait
b569930b2a Made warehouse and selling pricing list non-mandatory in pos setting 2014-06-25 16:57:48 +05:30
Nabin Hait
061c9744af Set status button in serial no 2014-06-25 16:57:48 +05:30
Nabin Hait
43616619ec Set status button in serial no 2014-06-25 16:57:48 +05:30
Nabin Hait
838aeb149f minor fix in sales invoice 2014-06-25 16:57:48 +05:30
Rushabh Mehta
37f809a1f4 fix end of life query for item 2014-06-25 16:57:48 +05:30
Rushabh Mehta
32303daf63 fixes to bom.js 2014-06-25 16:57:48 +05:30
Anand Doshi
d709f4dfdd Naming Series property type as Text 2014-06-25 16:57:47 +05:30
Nabin Hait
80142af9b8 Minor fixes 2014-06-25 16:57:47 +05:30
Nabin Hait
1b1b3a8fd6 validate pricing rule discount with item max discount 2014-06-25 16:57:47 +05:30
Nabin Hait
afffd656f6 Reload pricing rule in patch 2014-06-25 16:57:47 +05:30
Nabin Hait
4f6e31eb08 validate pricing rule discount with item max discount 2014-06-25 16:57:47 +05:30
Nabin Hait
9daca108b3 Pricing Rule fixes and improvements. Fixes #1795 2014-06-25 16:57:47 +05:30
Anand Doshi
de5e397fd4 Inventory Accounting: Cost Center only required for Expense Account 2014-06-25 16:57:46 +05:30
Anand Doshi
f5ec92c79a Validate Select field values 2014-06-25 16:57:46 +05:30
Anand Doshi
f654fea736 Fixed feed type options 2014-06-25 16:57:08 +05:30
Anand Doshi
daa56ca50f Fixed number format in currency 2014-06-25 16:57:08 +05:30
Anand Doshi
c20de7b264 Minor fix in Journal Voucher 2014-06-25 16:57:07 +05:30
Nabin Hait
c5e813f9f4 Overwrite from POS Settings if value exists 2014-06-25 16:57:07 +05:30
Nabin Hait
3b7dd0396f Get party details fixes 2014-06-25 16:57:07 +05:30
Nabin Hait
c226292d8e Stocvk entry incoming rate for sales return 2014-06-25 16:57:07 +05:30
Nabin Hait
216e5bb208 Incoming rate for sales return 2014-06-25 16:57:07 +05:30
Nabin Hait
afdc0a5f59 Valuation rate and amount for fg item 2014-06-25 16:57:07 +05:30
Anand Doshi
5a9e00ce71 Fixed Employee Leave Balance Report 2014-06-25 16:57:07 +05:30
Anand Doshi
ca3d60c160 Fixed Sales Order -> Delivery Note mapping of address fields 2014-06-25 16:57:06 +05:30
Anand Doshi
222b7b660e Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-25 16:57:06 +05:30
Anand Doshi
a469954ef3 Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
2014-06-25 16:57:06 +05:30
Anand Doshi
be1d11f98d Travis: Install frappe of targetted branch
For example:
If pull request is for wip-4.1 branch of erpnext, install frappe with branch as wip-4.1
2014-06-25 16:57:05 +05:30
Anand Doshi
457515fc08 Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-25 16:57:05 +05:30
Anand Doshi
e3ac8dd5a8 Don't set default for warehouse when creating serial no 2014-06-25 16:57:05 +05:30
Anand Doshi
14920b447c Fixed Currency Exchange error 2014-06-25 16:57:04 +05:30
Nabin Hait
0c6177dd9a Patch: update users report view settings for rename fields 2014-06-25 16:57:04 +05:30
Nabin Hait
cea571fc31 Fixes in fetching valuation rate in stock entry 2014-06-25 16:57:03 +05:30
Nabin Hait
d5a4c871f2 Field renamed in sms center 2014-06-25 16:57:02 +05:30
Nabin Hait
7c6c2e0ccf Do not make packing list after submission 2014-06-25 16:57:02 +05:30
Rushabh Mehta
476d1fb334 Update sms_center.json
changed total words to total characters
2014-06-25 16:57:01 +05:30
Rushabh Mehta
7ca3be57df Merge pull request #1844 from anandpdoshi/anand-wip
Serial No Validation in Stock Entry, Warehouse query fix
2014-06-25 16:05:17 +05:30
Anand Doshi
d1419edfd0 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-25 15:25:48 +05:30
Anand Doshi
a740f750c7 Stock Entry: Serial No Mandatory when purpose in Material Transfer, Sales Return, Purchase Return 2014-06-25 13:31:02 +05:30
Anand Doshi
610a405c85 Fix in warehouse query 2014-06-25 13:30:26 +05:30
Rushabh Mehta
aa1edfb6ae Merge pull request #1842 from anandpdoshi/anand-wip
Warehouse query filtered by Company, Fixed Gantt Chart query for task
2014-06-25 10:18:35 +05:30
Anand Doshi
4864c9e96a Fixed gantt chart query for Task 2014-06-24 18:53:17 +05:30
Anand Doshi
faefeaa644 Warehouse query filtered by company 2014-06-24 18:53:04 +05:30
Anand Doshi
e0a7ff77df Merge pull request #1838 from nabinhait/v4-hotfix
Multiple fixes
2014-06-24 17:37:39 +05:30
Nabin Hait
60c48fee16 minor fixes 2014-06-24 17:34:52 +05:30
Anand Doshi
1ef3dbabfc Merge pull request #1837 from anandpdoshi/anand-wip
Fix in pricing rule patch
2014-06-24 17:11:29 +05:30
Nabin Hait
0b15755441 Cost center-wise net profit in financial analytics report 2014-06-24 17:02:45 +05:30
Nabin Hait
e9b95bbfe8 Fixed address deletion issue 2014-06-24 16:35:00 +05:30
Nabin Hait
d0bf91d639 Fixes for recurring invoice 2014-06-24 16:19:16 +05:30
Anand Doshi
a1be6021c4 Fix in pricing rule patch 2014-06-24 15:26:40 +05:30
Nabin Hait
21efc93e54 Allowed renaming for project 2014-06-24 12:44:49 +05:30
Nabin Hait
fdf38dab6f stock entry incoming rate based on precision 2014-06-24 12:42:36 +05:30
Rushabh Mehta
5dfacf2615 Merge pull request #1834 from nabinhait/v4-hotfix
Multiple fixes
2014-06-24 12:09:12 +05:30
Nabin Hait
613d784cfb Fixes in pricing rule 2014-06-24 12:07:56 +05:30
Nabin Hait
efd426650d Fixes in pricing rule 2014-06-24 11:11:08 +05:30
Nabin Hait
f62b75c731 Fixes in pricing rule 2014-06-24 11:00:13 +05:30
Nabin Hait
65efd0a9a1 sms sending issue fixed 2014-06-23 18:21:37 +05:30
Anand Doshi
f08881a2b7 Merge pull request #1831 from anandpdoshi/anand-wip
Naming Series Property Setter Patch
2014-06-23 18:15:01 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Nabin Hait
16fa6472b3 Made warehouse and selling pricing list non-mandatory in pos setting 2014-06-23 16:42:36 +05:30
Anand Doshi
6781f62c70 Merge pull request #1828 from rmehta/develop
item query fix
2014-06-23 15:53:38 +05:30
Anand Doshi
a445c39901 Merge pull request #1829 from nabinhait/v4-hotfix
V4 hotfix
2014-06-23 15:52:54 +05:30
Nabin Hait
da490e3f53 Set status button in serial no 2014-06-23 15:51:03 +05:30
Nabin Hait
ccd2e2496c Merge pull request #1827 from anandpdoshi/anand-wip
Naming Series property type as Text
2014-06-23 15:44:29 +05:30
Nabin Hait
36da171a3d Set status button in serial no 2014-06-23 15:36:31 +05:30
Nabin Hait
e84f8b23aa minor fix in sales invoice 2014-06-23 15:36:30 +05:30
Rushabh Mehta
864d1ea87f fix end of life query for item 2014-06-23 12:20:39 +05:30
Rushabh Mehta
58ff651c6d fixes to bom.js 2014-06-23 12:20:39 +05:30
Anand Doshi
c027563b13 Merge pull request #1826 from nabinhait/v4-hotfix
V4 hotfix
2014-06-20 20:44:17 +05:30
Anand Doshi
f0a1735ac8 Naming Series property type as Text 2014-06-20 20:19:51 +05:30
Nabin Hait
56f6d01757 Minor fixes 2014-06-20 19:37:53 +05:30
Nabin Hait
3c946b2a72 validate pricing rule discount with item max discount 2014-06-20 19:07:44 +05:30
Nabin Hait
1d37698d4c Reload pricing rule in patch 2014-06-20 16:30:44 +05:30
Nabin Hait
be50c289f8 validate pricing rule discount with item max discount 2014-06-20 16:19:55 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Rushabh Mehta
b35d84156f Merge pull request #1822 from anandpdoshi/anand-wip
Inventory Accounting: Cost Center only required for Expense Account
2014-06-20 11:24:45 +05:30
Anand Doshi
496123a646 Inventory Accounting: Cost Center only required for Expense Account 2014-06-19 19:25:19 +05:30
Anand Doshi
861747ec26 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-19 17:44:33 +05:30
Anand Doshi
7bbaf0298e Merge pull request #1821 from nabinhait/v4-hotfix
Overwrite from POS Settings if value exists
2014-06-19 16:48:53 +05:30
Rushabh Mehta
a2f5a7f3cd Merge pull request #1820 from anandpdoshi/anand-wip
Validate Select Fields
2014-06-19 16:32:50 +05:30
Anand Doshi
a5cfc59d81 Validate Select field values 2014-06-19 16:05:08 +05:30
Anand Doshi
da342c7855 Fixed feed type options 2014-06-18 21:09:19 +05:30
Anand Doshi
aecddefbc8 Fixed number format in currency 2014-06-18 20:55:39 +05:30
Anand Doshi
fd05f458e1 Minor fix in Journal Voucher 2014-06-18 20:55:18 +05:30
Nabin Hait
faf176d78c Overwrite from POS Settings if value exists 2014-06-18 19:52:24 +05:30
Rushabh Mehta
151125e537 fixed for travis 2014-06-18 17:33:01 +05:30
Anand Doshi
64a0eb42ed Merge pull request #1816 from nabinhait/v4-hotfix
Stock Entry incoming rate
2014-06-18 17:32:04 +05:30
Nabin Hait
ba6cc2864a Merge pull request #1817 from anandpdoshi/anand-wip
Fixed Employee Leave Balance Report
2014-06-18 17:18:26 +05:30
Nabin Hait
4d7c4fc0f4 Get party details fixes 2014-06-18 16:40:59 +05:30
Nabin Hait
e7c2f74a07 Stocvk entry incoming rate for sales return 2014-06-18 16:40:59 +05:30
Nabin Hait
a7da6e1480 Incoming rate for sales return 2014-06-18 16:40:59 +05:30
Nabin Hait
ae0d753cad Valuation rate and amount for fg item 2014-06-18 16:40:59 +05:30
Anand Doshi
31c977b906 Fixed Employee Leave Balance Report 2014-06-18 16:26:45 +05:30
Nabin Hait
87179346d4 Merge pull request #1814 from anandpdoshi/anand-wip
Don't set warehouse when creating serial no, fixed currency exchange error message
2014-06-18 16:00:53 +05:30
Anand Doshi
d768afb80b Fixed Sales Order -> Delivery Note mapping of address fields 2014-06-18 15:23:25 +05:30
Anand Doshi
de12a0941f Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-18 14:05:29 +05:30
Anand Doshi
987a28fc6a Revert "Stock Entry: get fg item incoming rate if bom is mentioned"
This reverts commit 297939325a.
2014-06-18 14:05:08 +05:30
Anand Doshi
c5dbf0f8ad Travis: Install frappe of targetted branch
For example:
If pull request is for wip-4.1 branch of erpnext, install frappe with branch as wip-4.1
2014-06-18 13:35:37 +05:30
Anand Doshi
297939325a Stock Entry: get fg item incoming rate if bom is mentioned 2014-06-18 13:10:10 +05:30
Anand Doshi
2f800521cb Don't set default for warehouse when creating serial no 2014-06-18 12:48:46 +05:30
Anand Doshi
72a178a37e Fixed Currency Exchange error 2014-06-18 12:14:17 +05:30
Anand Doshi
8c7b4549ed Merge pull request #1812 from nabinhait/v4-hotfix
Multiple fixes
2014-06-18 10:59:05 +05:30
Nabin Hait
91090042d1 Patch: update users report view settings for rename fields 2014-06-18 10:29:53 +05:30
Nabin Hait
0693937c1e Fixes in fetching valuation rate in stock entry 2014-06-18 10:20:01 +05:30
Nabin Hait
ac1a4ed576 Field renamed in sms center 2014-06-18 10:20:01 +05:30
Nabin Hait
b73d3f925d Do not make packing list after submission 2014-06-18 10:18:50 +05:30
Rushabh Mehta
69641ddc36 Update sms_center.json
changed total words to total characters
2014-06-18 09:04:09 +05:30
Rushabh Mehta
36881807ed Merge branch 'wip-4.2' into wip-4.1 2014-06-17 17:36:22 +05:30
Rushabh Mehta
1a18b427a8 make font size smaller for erpnext powered 2014-06-17 16:54:55 +05:30
Rushabh Mehta
69ce97b80a added print format for general ledger 2014-06-17 16:54:55 +05:30
Rushabh Mehta
9f887b436c fixes new routing, for frappe/frappe#600 2014-06-17 16:53:44 +05:30
Anand Doshi
5780163fb7 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-17 14:58:18 +05:30
Anand Doshi
1c5fb9495e Merge pull request #1806 from nabinhait/v4-hotfix
Fixes
2014-06-17 14:54:44 +05:30
Rushabh Mehta
5df521bad5 updated generators for wip-4.2 2014-06-17 14:21:26 +05:30
Nabin Hait
be75d0265b Merge pull request #1805 from anandpdoshi/anand-wip
Sales Invoice List: show percent paid as 100% if grand total is 0
2014-06-17 14:12:26 +05:30
Anand Doshi
b20de6a3ec Sales Invoice List: show percent paid as 100% if grand total is 0 2014-06-17 13:58:06 +05:30
Nabin Hait
4ee8704b99 Fixes in financial analytics 2014-06-17 13:52:03 +05:30
Nabin Hait
d2e8a0a96a Delivery note update after submission 2014-06-17 12:55:52 +05:30
Anand Doshi
ff367c7b31 Merge pull request #1798 from nabinhait/v4-hotfix
Account common get_query
2014-06-16 16:04:32 +05:30
Nabin Hait
98d9d797fd Tax category validation ignored in material request 2014-06-16 15:54:05 +05:30
Nabin Hait
a6fc3f6337 Ignore pricing rule for material request 2014-06-16 15:34:52 +05:30
Nabin Hait
539f352318 Delivery note to packing slip mapping 2014-06-16 15:03:36 +05:30
Nabin Hait
e1b2b3e995 Account common get_query 2014-06-16 15:03:36 +05:30
Rushabh Mehta
3b7bcf0f4f make font size smaller for erpnext powered 2014-06-16 14:21:37 +05:30
Rushabh Mehta
03ae32d937 added print format for general ledger 2014-06-16 14:21:37 +05:30
Anand Doshi
ccf370f813 Fixed item query 2014-06-16 13:50:11 +05:30
Anand Doshi
0521814dea Fixed item query 2014-06-16 13:25:20 +05:30
Anand Doshi
e35841a2ea Reload Shopping Cart Settings in create price list patch 2014-06-16 12:59:54 +05:30
Anand Doshi
3474c273a5 Ignore mandatory in employee patch 2014-06-16 12:14:21 +05:30
Anand Doshi
3dc722b096 Create price list only if setup complete 2014-06-13 15:30:38 +05:30
Rushabh Mehta
5002a6467d Merge pull request #1793 from anandpdoshi/anand-wip
Create price list if missing
2014-06-13 13:20:46 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Anand Doshi
27e295a4cb Merge pull request #1789 from nabinhait/v4-hotfix
V4 hotfix
2014-06-12 15:39:58 +05:30
Rushabh Mehta
99703a95c2 Merge pull request #1790 from anandpdoshi/wip-anand
Fixes split email settings, removed clear custom buttons, pos view switch
2014-06-12 15:25:03 +05:30
Nabin Hait
f2202fc014 minor fix 2014-06-12 15:20:47 +05:30
Anand Doshi
3761ff3522 Fix in patch: split email settings 2014-06-12 15:00:52 +05:30
Anand Doshi
205438669a Removed clear_custom_buttons, pos view switch fix 2014-06-12 15:00:51 +05:30
Nabin Hait
e7f2d3179d update other_charges in custom print formats 2014-06-12 14:58:09 +05:30
Anand Doshi
277f4a1bfe Removed clear_custom_buttons, pos view switch fix 2014-06-12 12:59:23 +05:30
Nabin Hait
46dc3b1442 validations added in stock entry 2014-06-12 12:48:28 +05:30
Nabin Hait
2128c98c35 available qty validation. Fixes #1045 2014-06-12 12:42:22 +05:30
Nabin Hait
e98b326ba3 Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932 2014-06-12 12:25:23 +05:30
Rushabh Mehta
7bcd31bddb Merge pull request #1785 from rmehta/develop
minor fix for outgoing communication email
2014-06-12 10:32:21 +05:30
Rushabh Mehta
6def968c3c minor fix for outgoing communication email 2014-06-12 10:31:43 +05:30
Nabin Hait
f2ee3cec19 Merge pull request #1784 from nabinhait/v4-hotfix
Minor fixes in salary manager. Fixes #1754
2014-06-12 10:19:27 +05:30
Nabin Hait
589a298096 Minor fixes in salary manager. Fixes #1754 2014-06-11 13:00:31 +05:30
Rushabh Mehta
94c17bdf85 Update CONTRIBUTING.md 2014-06-11 10:45:57 +05:30
Anand Doshi
fdfea0c17b Fixed Recurring Sales Invoice 2014-06-10 17:54:04 +05:30
Anand Doshi
862fe60368 Minor fix in newsletter 2014-06-10 17:15:50 +05:30
Nabin Hait
6a3e97a9f8 Merge pull request #1781 from anandpdoshi/hotfix
Reload sales taxes and charges in patch
2014-06-10 16:37:59 +05:30
Anand Doshi
7656377f3f Show website route for generator via set_intro, fix in Support Email Settings 2014-06-10 15:48:37 +05:30
Anand Doshi
82029be6f9 Reload sales taxes and charges in patch 2014-06-10 14:52:49 +05:30
Anand Doshi
339f75eb53 Merge pull request #1780 from nabinhait/v4-hotfix
minor fix in global defaults
2014-06-10 14:36:29 +05:30
Nabin Hait
7425634692 minor fix in global defaults 2014-06-10 14:12:28 +05:30
Anand Doshi
38d5407ea1 Merge pull request #1779 from nabinhait/v4-hotfix
Fixes
2014-06-10 11:40:26 +05:30
Nabin Hait
6febfca5a6 changed insert after for india related custom fields 2014-06-10 11:21:38 +05:30
Nabin Hait
7cba72a0b7 Pricing Rule: price / discount percentage can not be negative 2014-06-10 11:09:21 +05:30
Anand Doshi
fb6c003c97 Merge pull request #1778 from nabinhait/v4-hotfix
update custom print formats for renamed fields
2014-06-10 10:43:51 +05:30
Nabin Hait
91016ba989 update custom print formats for renamed fields 2014-06-10 10:41:37 +05:30
Nabin Hait
2aaf1de7fe Merge pull request #1777 from anandpdoshi/hotfix
Default Letterhead, Item wise Price List Rate
2014-06-09 18:52:28 +05:30
Anand Doshi
b527e54809 Fixed report: Item wise Price List Rate 2014-06-09 18:08:46 +05:30
Anand Doshi
c01db5fe9c Save default letterhead 2014-06-09 18:01:14 +05:30
Anand Doshi
534ebde638 Merge pull request #1775 from nabinhait/v4-hotfix
create custom fields for india specific fields
2014-06-09 16:23:21 +05:30
Nabin Hait
d532d2f64f create custom fields for india specific fields 2014-06-09 16:00:49 +05:30
Nabin Hait
7bcd69e157 Merge pull request #1774 from anandpdoshi/hotfix
Also save Global Defaults in System Settings patch
2014-06-09 15:52:03 +05:30
Anand Doshi
af63d053b1 Also save Global Defaults in System Settings patch 2014-06-09 15:51:12 +05:30
Nabin Hait
d9ff118b40 Merge pull request #1771 from anandpdoshi/hotfix
Fix in HR patch
2014-06-09 15:33:14 +05:30
Anand Doshi
be3f914acd Fixed add address template 2014-06-09 15:18:45 +05:30
Anand Doshi
edb9efd9a6 Fixed manifest and website 2014-06-09 15:11:18 +05:30
Anand Doshi
cdfa9a371d Export perm for GL Entry and Stock Ledger Entry 2014-06-09 15:11:17 +05:30
Anand Doshi
390efdc884 Fix in HR patch 2014-06-09 15:04:00 +05:30
Anand Doshi
ac276a27b7 Merge pull request #1772 from nabinhait/v4-hotfix
Update tax amount after discount in existing documents
2014-06-09 14:04:15 +05:30
Nabin Hait
b63e99eb43 Update tax amount after discount in existing documents 2014-06-09 12:49:09 +05:30
Anand Doshi
00976cfe47 Merge pull request #1768 from anandpdoshi/hotfix
Fixed HR patch
2014-06-06 22:11:39 +05:30
Anand Doshi
6f561aa846 Fixed HR patch 2014-06-06 22:10:18 +05:30
Anand Doshi
276386c94a Merge pull request #1765 from anandpdoshi/hotfix
Fixed Purchase Receipt qty trigger
2014-06-06 20:39:52 +05:30
Anand Doshi
0aa125304d Fixed Reset Permissions patch 2014-06-06 20:39:21 +05:30
Anand Doshi
482d29dc53 Fixed Purchase Receipt qty trigger 2014-06-06 20:34:08 +05:30
Anand Doshi
cd0aed993a Fixed Address Template Patch 2014-06-06 17:37:31 +05:30
Anand Doshi
f56656f6b4 Merge pull request #1763 from anandpdoshi/hotfix
Fixed address template and changed case
2014-06-06 17:20:57 +05:30
Anand Doshi
fc601659f5 Fixed Address Template 2014-06-06 17:07:50 +05:30
Anand Doshi
4a069a1e7f Changed case in modules.txt 2014-06-06 16:28:03 +05:30
Anand Doshi
04badf7e6e Hotfix: module name case for HR 2014-06-06 15:29:55 +05:30
Rushabh Mehta
0b31a163a3 Merge pull request #1761 from anandpdoshi/hotfix
Improved FIscal Year Error Messages, Reset Permissions for some DocTypes
2014-06-06 15:20:07 +05:30
Anand Doshi
171c00cfd6 Reload permissions for master and setting documents 2014-06-06 15:13:20 +05:30
Anand Doshi
b5cefa92fa Improved Fiscal Year validation messages 2014-06-06 15:10:00 +05:30
Anand Doshi
8cead48342 Merge pull request #1756 from rmehta/develop
removed sms control and related cleanup, fixes frappe/erpnext#462
2014-06-06 14:52:22 +05:30
Rushabh Mehta
1989e4fca0 Merge pull request #1755 from nabinhait/v4-hotfix
Fixes in trends report
2014-06-06 12:49:34 +05:30
Rushabh Mehta
880b3ef6c0 added qty updating option multi-item selector 2014-06-06 11:45:30 +05:30
Anand Doshi
2ec93590e4 Minor fix in address template 2014-06-06 11:45:30 +05:30
Anand Doshi
5fe69fb556 Fixes 2014-06-06 11:45:29 +05:30
Anand Doshi
290ed09dc6 Update new_address_template.py 2014-06-06 11:45:29 +05:30
Anand Doshi
65018daebc Minor fix in address template 2014-06-05 18:33:26 +05:30
Rushabh Mehta
0739937fa2 bug: added empty class for sms settings 2014-06-05 18:15:00 +05:30
Anand Doshi
ede8ea52b0 Fixes 2014-06-05 18:06:20 +05:30
Rushabh Mehta
ba83e9cfbe removed sms control and related cleanup, fixes frappe/erpnext#462 2014-06-05 17:56:42 +05:30
Nabin Hait
977331806b Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
86207afe15 Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
704a453b7a Set missing values only in unsubmitted documents 2014-06-05 17:55:00 +05:30
Nabin Hait
b7438894f6 Fixes in trends report 2014-06-05 17:55:00 +05:30
Anand Doshi
4022586015 Update new_address_template.py 2014-06-05 17:34:59 +05:30
Anand Doshi
26fcef69c7 Merge pull request #1753 from rmehta/develop
Address Template
2014-06-05 16:28:10 +05:30
Rushabh Mehta
5036706f81 removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c02fbd22fa removed address_title from address and removed test 2014-06-05 16:16:13 +05:30
Rushabh Mehta
33020a63b8 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Rushabh Mehta
c22e11d483 added address template: 2014-06-05 16:01:55 +05:30
Rushabh Mehta
41471c3b44 fixed description in salary manager 2014-06-05 16:01:55 +05:30
Anand Doshi
17e7538937 Merge pull request #1746 from nabinhait/v4-hotfix
Multiple issues
2014-06-05 15:27:57 +05:30
Nabin Hait
c8be8ba42c function renamed 2014-06-05 15:18:10 +05:30
Nabin Hait
4d4df03f88 Added total debit / credit row in trial balance. Fixes #1313 2014-06-04 19:00:57 +05:30
Nabin Hait
deb6e06336 minor fix 2014-06-04 19:00:56 +05:30
Nabin Hait
c3d1d6a946 cleanup raw materials supplied table for sub-contraction. Fixes #1743 2014-06-04 19:00:56 +05:30
Nabin Hait
1055139c83 get accounts for opening entry 2014-06-04 19:00:56 +05:30
Nabin Hait
19d1e499c3 Removed Purchase in transit report #1435 2014-06-04 19:00:56 +05:30
Nabin Hait
b161eea793 Account balance must be debit / credit, validate if balance already in credit / debit. Fixes #1442 2014-06-04 18:57:53 +05:30
Anand Doshi
8fbe4b9c3b Merge pull request #1747 from anandpdoshi/apply_user_permissions
Apply user permissions
2014-06-04 18:38:25 +05:30
Anand Doshi
85479bcbc0 Fixes for apply user permissions and momentjs 2014-06-04 18:15:43 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Anand Doshi
221dec8cac transaction.js: calculate only if one entry in table 2014-06-04 17:48:57 +05:30
Anand Doshi
9a0f6f5bb4 Enable Scheduler in System Settings when Setup Wizard is completed 2014-06-04 17:48:57 +05:30
Anand Doshi
38dedf402b Fixes in patches for migration 2014-06-04 17:48:56 +05:30
Anand Doshi
c280d0655c Set Employee Name if missing 2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9 Fixes in user permissions patches 2014-06-04 17:48:56 +05:30
Anand Doshi
37993dd713 Romanian and Korean Translations 2014-06-04 17:48:55 +05:30
Anand Doshi
cd25301607 Translations 2014-06-04 17:48:55 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
69eec9e344 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Anand Doshi
ffc28faa51 Merge pull request #1744 from rmehta/develop
added multiple item select and allow non purchase items in Material Requ...
2014-06-04 17:47:58 +05:30
Rushabh Mehta
b6843f2087 added multiple item select and allow non purchase items in Material Request of type transfer 2014-06-04 13:10:41 +05:30
Anand Doshi
3f6606acdb Merge pull request #1702 from pdvyas/put-version-in-file
keep version in separate file
2014-06-04 12:28:37 +05:30
Anand Doshi
7a3885863c Merge pull request #1740 from nabinhait/v4-hotfix
fixes
2014-06-04 11:56:42 +05:30
Nabin Hait
67d8b91690 Fixes in bank reconciliation statement 2014-06-04 11:18:25 +05:30
Nabin Hait
ce6977ffe6 Minor fixes in fetching item details 2014-06-03 23:02:02 +05:30
Nabin Hait
bc7efa6da6 Parent account mandatory for all non-root accounts 2014-06-03 23:02:02 +05:30
Anand Doshi
9198444a3b Merge pull request #1737 from nabinhait/v4-hotfix
Grid report translations and closing balance in trial balance
2014-06-03 14:40:26 +05:30
Nabin Hait
b15764ef2c Translation issue fixed in analytics/grid report 2014-06-03 13:02:39 +05:30
Nabin Hait
abb62c76d8 Removed allocated to field from serach fields in support ticket 2014-06-03 10:50:55 +05:30
Nabin Hait
51b7f322cc Closing balance fixes in trial balance. Fixes #1730 2014-06-02 18:47:46 +05:30
Anand Doshi
be99b1240c Merge pull request #1722 from nabinhait/v4-hotfix
multiple fixes
2014-06-02 11:09:32 +05:30
Anand Doshi
315e3b563b Merge pull request #1725 from rmehta/develop
Fix for awesome bar
2014-06-02 11:07:26 +05:30
Rushabh Mehta
430d132ee0 awesomebar: add tree links 2014-05-31 10:36:42 +05:30
Rushabh Mehta
cc37cc83cd removed section_style 2014-05-31 10:36:41 +05:30
Nabin Hait
0984f227a8 minor fixes related to path 2014-05-30 19:10:12 +05:30
Nabin Hait
548cf96c44 Minor fixes in sales return 2014-05-30 19:09:59 +05:30
Nabin Hait
0be378af6a Purchase ordered qty can not be less than minimum order qty. fixes #1529 2014-05-30 15:53:20 +05:30
Nabin Hait
fb988ba834 Salary Slip: pull details from salary struture. fixes #1719 2014-05-30 15:53:20 +05:30
Nabin Hait
e6ddd28067 Don't execute reorder_item, if initial setup not completed. fixes #1668 2014-05-30 15:53:20 +05:30
Nabin Hait
0acd3159db Merge pull request #1718 from nabinhait/v4-hotfix
Remove blank lines from uploaded file of attendance
2014-05-30 14:33:59 +05:30
Nabin Hait
1897e75894 Remove blank lines from uploaded file of attendance #1714 2014-05-30 14:31:10 +05:30
Anand Doshi
852e7cdb41 Merge pull request #1691 from nabinhait/v4-hotfix
build_filter_conditions and pricing rules
2014-05-30 11:51:36 +05:30
Nabin Hait
c1367d9d10 minor fixes 2014-05-30 11:43:00 +05:30
Nabin Hait
cb9bdf43f6 over billing validation fixed 2014-05-30 11:22:16 +05:30
Nabin Hait
6b1a8e0a40 minor fixes 2014-05-30 11:22:16 +05:30
Nabin Hait
7f32cbeb06 Total valuation for manufactured or repacked item(s) can not be less than total valuation of raw materials #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
c7253b3a37 Get valuation rate for fg item base don issued item cost + operation cost. #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
7f03e24c55 Valuation rate of raw materials in BOM. #1688 2014-05-30 11:22:15 +05:30
Nabin Hait
66cecf4824 uom trigger issue in stock entry fixes #1712 2014-05-30 11:22:15 +05:30
Nabin Hait
f3552ca737 packing slip fixes #1711 2014-05-30 11:22:15 +05:30
Nabin Hait
3dc6a80198 deleted delivery note packing list wise print format 2014-05-30 11:22:14 +05:30
Nabin Hait
e71159d6ea Standard Rate field removed from item. Fixes #1688 2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0 Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706 2014-05-30 11:22:14 +05:30
Nabin Hait
c3cbe2a30c minor fixes in sales invoice validation 2014-05-30 11:22:13 +05:30
Nabin Hait
9bc9b8795b Fixes in stock reconciliation 2014-05-30 11:22:13 +05:30
Nabin Hait
d0605443fb removed print statement 2014-05-30 11:22:13 +05:30
Nabin Hait
47a8670d37 pricing rule testcase fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
e7546e2305 SMS Settings added in setup and selling module page. Fixes #1693 2014-05-30 11:22:12 +05:30
Nabin Hait
ccb9826afd pricing list tets case fixes 2014-05-30 11:22:12 +05:30
Nabin Hait
8de61559b0 Minor fixes in sales / purchase analytics. Fixes #1701 2014-05-30 11:22:11 +05:30
Nabin Hait
ea4aa04cc4 Search query for account cleanup 2014-05-30 11:22:11 +05:30
Nabin Hait
a3dd72a759 Pricing Rule 2014-05-30 11:22:10 +05:30
Nabin Hait
62ec60188b use build_filter_conditions from db_query. Fixes #1679 2014-05-30 11:22:10 +05:30
Anand Doshi
10cb4799bc Merge pull request #1700 from rmehta/develop
Various UI Bug Fixes
2014-05-30 11:12:21 +05:30
Pratik Vyas
8e0438bad4 keep version in separate file 2014-05-28 16:58:55 +05:30
Pratik Vyas
76e48b5c3f hotfix: update_account_root_type.py patch 2014-05-28 15:22:34 +05:30
Rushabh Mehta
1bf9df7c85 removed about 2014-05-28 13:15:32 +05:30
Anand Doshi
32063bb472 Removed designation 'Director' owing to problems with Greek translation 2014-05-27 22:40:53 +05:30
Rushabh Mehta
f944e819e9 fixes #1581 and added icons to grid reports 2014-05-27 15:22:04 +05:30
Nabin Hait
9c1ae09994 Merge pull request #1689 from rmehta/develop
fix to pos invoice
2014-05-26 16:22:03 +05:30
Rushabh Mehta
d82e85d099 fix to pos invoice 2014-05-26 16:01:01 +05:30
Nabin Hait
c1d0851a56 Merge pull request #1687 from nabinhait/v4-hotfix
Update status based on communication. Fixes #1682
2014-05-26 15:07:31 +05:30
Nabin Hait
08dd6af446 Update status based on communication. Fixes #1682 2014-05-26 15:06:42 +05:30
Nabin Hait
ff8f32ca80 Merge pull request #1686 from rmehta/develop
Fixes
2014-05-26 13:36:28 +05:30
Rushabh Mehta
a7c46e4d83 removed debug in query (packing_slip.py) 2014-05-26 13:35:47 +05:30
Rushabh Mehta
b15d760406 fix to packing slip (validation) 2014-05-26 13:05:19 +05:30
Rushabh Mehta
9f399f139b Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-26 11:40:46 +05:30
Rushabh Mehta
3b0f026522 fix to sales parter 2014-05-24 12:04:13 +05:30
Anand Doshi
8db94e7407 Merge pull request #1680 from anandpdoshi/hotfix
Updated Translations
2014-05-23 10:43:16 +05:30
Anand Doshi
8d321446ad Updated translations 2014-05-23 10:29:37 +05:30
Anand Doshi
c783c2636f Updated translations 2014-05-23 09:22:12 +05:30
Anand Doshi
5468740042 Fixed setup wizard errors for chinese simplified 2014-05-23 09:21:55 +05:30
Anand Doshi
69e4b16817 Setup Wizard: clear cache on language change 2014-05-22 22:52:36 +05:30
Pratik Vyas
e35a1025c9 hotfix: communication email bug 2014-05-22 18:37:55 +05:30
Rushabh Mehta
0f5601dad4 Merge pull request #1677 from rmehta/develop
Added title_field and added ignore_permission while creating Event from Lead
2014-05-22 11:23:03 +05:30
Pratik Vyas
a5f35e2b3c Merge pull request #1678 from anandpdoshi/hotfix
Fixed global_defaults_to_system_settings
2014-05-22 11:15:21 +05:30
Anand Doshi
c57d7dea8b Fixed global_defaults_to_system_settings 2014-05-22 11:05:46 +05:30
Rushabh Mehta
a39cae9c2e added title field to support ticket, lead and employee 2014-05-21 17:34:22 +05:30
Anand Doshi
53142f125b Merge pull request #1675 from nabinhait/v4-hotfix
Create serial no based on series only if item is serialized
2014-05-21 16:08:14 +05:30
Nabin Hait
edf87a258f Create serial no based on series only if item is serialized 2014-05-21 15:38:56 +05:30
Anand Doshi
18144da755 Merge pull request #1674 from anandpdoshi/hotfix
Hook: setup_wizard_success
2014-05-21 15:25:11 +05:30
Anand Doshi
d6007e7d9c Hook: setup_wizard_success 2014-05-21 15:22:15 +05:30
Rushabh Mehta
92ce693e6f added ignore_permission in Lead for creating Event 2014-05-21 14:59:56 +05:30
Anand Doshi
d2802cab6c Merge pull request #1672 from nabinhait/v4-hotfix
Account root type and email digest for income / expense
2014-05-21 12:50:08 +05:30
Nabin Hait
177fb132b9 description added in setup wizard 2014-05-21 12:39:37 +05:30
Nabin Hait
d811303d7b minor fix 2014-05-21 12:36:43 +05:30
Nabin Hait
27b12ef1b6 update account root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
4efc5d74d4 Setup Wizard: company abbr length validation on onchange trigger 2014-05-21 11:53:59 +05:30
Nabin Hait
b5c552faf3 minor fix 2014-05-21 11:53:59 +05:30
Nabin Hait
dec02340e8 reload account doc in root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
3f80ef0648 reload account doc in root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
44ae408b36 Income/expense info in email digest 2014-05-21 11:53:58 +05:30
Nabin Hait
0e6554edc1 Root Type field added in account and patch for existing accoutns 2014-05-21 11:53:58 +05:30
Pratik Vyas
c8c5d37bcf Release 4.0.2 2014-05-20 16:42:10 +05:30
Pratik Vyas
5873e50c50 Release 4.0.2 2014-05-20 16:42:01 +05:30
Pratik Vyas
4f1371945d hotfix: frappe version in requirements.txt 2014-05-20 16:39:29 +05:30
Pratik Vyas
444d496c8b Release v4.0.1 2014-05-20 16:32:21 +05:30
Pratik Vyas
98c09e2a91 Release v4.0.1 2014-05-20 16:17:22 +05:30
Nabin Hait
f5ac91da06 Merge pull request #1671 from nabinhait/v4-hotfix
V4 hotfix
2014-05-20 15:25:20 +05:30
Nabin Hait
f7361fc982 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-20 15:08:13 +05:30
Nabin Hait
c49b7f8c63 minor fix 2014-05-20 15:07:18 +05:30
Anand Doshi
1a7c3897b1 Merge pull request #1667 from nabinhait/v4-hotfix
Server side onload functionality in multiple docs && support ticket status
2014-05-20 10:46:37 +05:30
Nabin Hait
956d7868b5 removed print statement 2014-05-20 10:36:14 +05:30
Nabin Hait
85786f3071 Support ticket / lead status based on communication. Fixes #1645 2014-05-19 19:31:40 +05:30
Nabin Hait
2e0620e370 Server side onload functionality in multiple docs 2014-05-19 18:15:58 +05:30
Pratik Vyas
f87c72646c Merge pull request #1660 from anandpdoshi/hotfix
Fixed multilingual UOM issue
2014-05-17 00:12:14 +05:30
Anand Doshi
6664af9557 Fixed multilingual UOM issue 2014-05-17 00:07:45 +05:30
Nabin Hait
097227d5ea Merge pull request #1659 from nabinhait/v4-hotfix
translation and fraction issue fixes
2014-05-16 20:11:26 +05:30
Nabin Hait
e60853930b traslation issue fixed in setup wizard and desktop 2014-05-16 19:56:43 +05:30
Nabin Hait
091b48168e Journal voucher debit != credit #fraction issue 2014-05-16 19:56:43 +05:30
Nabin Hait
ad68d64d93 Leave approver select options in leave application and employee 2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94 fix shipping rule test cases (copy name with copy_doc) 2014-05-16 15:19:51 +05:30
Pratik Vyas
3d8f8f68d8 Merge pull request #1652 from anandpdoshi/hotfix
Do not create Feed when frappe.flags.in_patch
2014-05-16 12:38:24 +05:30
Nabin Hait
a220e5d850 Update global_defaults_to_system_settings.py 2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9 Update global_defaults_to_system_settings.py 2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc Update global_defaults_to_system_settings.py 2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac Update global_defaults_to_system_settings.py 2014-05-15 18:18:32 +05:30
Pratik Vyas
740dd447b4 Merge pull request #1654 from nabinhait/v4-hotfix
fixes and patches
2014-05-15 18:11:39 +05:30
Nabin Hait
9419575126 Merged language patch with global_defaults_to_system_settings patch 2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a Global Defaults to system settings. Fixes #1653 2014-05-15 16:42:23 +05:30
Nabin Hait
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Nabin Hait
bc7659ab90 Employee leave balance report fixes #1647 2014-05-15 11:37:12 +05:30
Anand Doshi
38d5424b21 Do not create Feed when frappe.flags.in_patch 2014-05-14 19:33:21 +05:30
Anand Doshi
3c4dba3e51 Merge pull request #1650 from nabinhait/v4-hotfix
Clear default for price_list_currency
2014-05-14 19:15:49 +05:30
Nabin Hait
ea7e3d6405 Clear default for price_list_currency 2014-05-14 18:52:06 +05:30
Anand Doshi
f70c7320d5 Merge pull request #1649 from anandpdoshi/hotfix
Pass frm to open_mapped_doc
2014-05-14 18:00:30 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Nabin Hait
7b1698dbae Merge pull request #1646 from anandpdoshi/hotfix
Setup Wizard width, Stock Reconcilation
2014-05-14 16:57:30 +05:30
Anand Doshi
39cc1df560 Fixes #1635, Stock Reconcilation 2014-05-14 15:10:00 +05:30
Anand Doshi
5ce287d611 Setup Wizard width fix for chrome 2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b Fixed Setup Wizard 2014-05-13 21:02:47 +05:30
Nabin Hait
a8e7191b14 Merge pull request #1640 from anandpdoshi/print_format_lowercase
Changed Print Format files to lowercase
2014-05-13 18:21:22 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Pratik Vyas
b1f212d653 Merge pull request #1638 from anandpdoshi/hotfix
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 17:38:30 +05:30
Anand Doshi
0e2cf69345 Merge pull request #1636 from nabinhait/v4-hotfix
reports, print formats modified and minor fix
2014-05-13 17:31:14 +05:30
Anand Doshi
8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 2014-05-13 16:52:26 +05:30
Nabin Hait
03f3a8a2ef Get taxes and charges records from matser. Fixes #1634 2014-05-13 16:38:31 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
10f97d2e9e Merge pull request #1631 from nabinhait/v4-hotfix
daily time log summary report fixes
2014-05-13 11:41:12 +05:30
Nabin Hait
54f0d24d80 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-13 11:33:09 +05:30
Nabin Hait
b76061530e Daily time log fixes #1614 2014-05-13 11:32:39 +05:30
Anand Doshi
d711209dde Fixed patches.txt 2014-05-12 19:42:38 +05:30
Nabin Hait
3b5f107a11 Merge pull request #1630 from nabinhait/v4-hotfix
fixes
2014-05-12 17:50:03 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Nabin Hait
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35 added description to letter head in setup wizard 2014-05-12 16:45:49 +05:30
Pratik Vyas
b2ce9c5487 Merge pull request #1625 from anandpdoshi/hotfix
Added hook: setup_wizard_exception
2014-05-12 12:53:38 +05:30
Anand Doshi
02edae8fac Added hook: setup_wizard_exception 2014-05-12 12:37:32 +05:30
Nabin Hait
fb7fb73ba3 Merge pull request #1621 from nabinhait/v4-hotfix
BOM validation message fixed
2014-05-11 18:30:41 +05:30
Nabin Hait
bbfe2517ea BOM validation message fixed 2014-05-11 18:27:07 +05:30
Nabin Hait
0baf1479a3 Merge pull request #1618 from nabinhait/v4-hotfix
Test case fixes for serial no
2014-05-11 13:11:02 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
8ae4bcac58 Merge pull request #1617 from nabinhait/v4-hotfix
test case fixes
2014-05-11 12:13:16 +05:30
Nabin Hait
0ff6e3a6bb Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-11 12:11:50 +05:30
Nabin Hait
75e50ee082 Fixes for subcontracting 2014-05-11 12:11:15 +05:30
Nabin Hait
6d5c248402 Test case fixes for serial no 2014-05-11 12:10:57 +05:30
Nabin Hait
5365108ef9 Test case fixes for pos setting 2014-05-11 12:10:17 +05:30
Nabin Hait
7e373010d7 Test case fixes in time log batch 2014-05-11 12:08:39 +05:30
Rushabh Mehta
409c8e9732 removed confirmation date validations (wtf) 2014-05-11 10:01:16 +05:30
Rushabh Mehta
75e11a7270 Merge pull request #1616 from pdvyas/migrate-3to4
3 to 4 migration fixes
2014-05-10 22:19:07 +05:30
Pratik Vyas
6e686224eb fix patches 2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc fix update user properties patch 2014-05-10 22:16:39 +05:30
Rushabh Mehta
2667a50334 clear cache before running setup wizard 2014-05-09 19:20:31 +05:30
Rushabh Mehta
9591b8ec93 Merge pull request #1613 from anandpdoshi/deprecate-link-selects
Deprecate Select fields with options as link:
2014-05-09 14:09:51 +05:30
Anand Doshi
78e9c6ef70 Deprecate Select fields with options as link: 2014-05-09 13:36:13 +05:30
Nabin Hait
a5ac0149af Merge pull request #1612 from pdvyas/migrate-3to4
3 to 4 migration
2014-05-09 12:07:11 +05:30
Pratik Vyas
34e36a233c Patch changes for 3 to 4 migration 2014-05-09 12:01:25 +05:30
Nabin Hait
d64a952b5d Stock reco: item and warehouse validation and translation fixes 2014-05-09 11:50:24 +05:30
Nabin Hait
7dada72085 Merge pull request #1610 from nabinhait/v4-hotfix
minor fix
2014-05-09 10:54:53 +05:30
Nabin Hait
966edff222 minor fix 2014-05-09 10:54:12 +05:30
Nabin Hait
b52c6e866f Merge pull request #1609 from nabinhait/v4-hotfix
V4 hotfix
2014-05-08 19:10:55 +05:30
Nabin Hait
344f4436f1 Create / update raw materials supplied table for sub-contracting 2014-05-08 19:08:20 +05:30
Nabin Hait
5d070753fd Item managed batch-wise, can not be reconciled through stock reconciliation 2014-05-08 19:08:06 +05:30
Nabin Hait
844dd36ff9 PP tool: get items from SO based on item filter 2014-05-08 19:07:34 +05:30
Nabin Hait
3c5bc544ea Serial no and batch no field added in purchase receipt item supplied table 2014-05-08 19:07:02 +05:30
Nabin Hait
227db769a0 Item valuation rate on material transfer based on fifo 2014-05-08 19:06:01 +05:30
Anand Doshi
713e453126 Merge pull request #1607 from anandpdoshi/hotfix
Fixed clear cache for item page
2014-05-08 17:46:30 +05:30
Anand Doshi
0c85169539 Fixed clear cache for item page 2014-05-08 17:46:00 +05:30
Anand Doshi
3415cdb208 Merge pull request #1604 from anandpdoshi/bugfix-v4
Newsletter status display. Fixes #1593
2014-05-08 12:09:29 +05:30
Anand Doshi
08ef467fc6 Fixed moduleview language issue 2014-05-08 11:43:18 +05:30
Nabin Hait
5da2f21aed Merge pull request #1603 from nabinhait/v4-hotfix
fixes
2014-05-07 19:22:02 +05:30
Nabin Hait
e37b8e6682 fixed conflict 2014-05-07 19:20:56 +05:30
Nabin Hait
23649c6852 fixe in query.py 2014-05-07 19:18:15 +05:30
Anand Doshi
7e1b75a705 Newsletter status display. Fixes #1593 2014-05-07 18:44:02 +05:30
Nabin Hait
17425a24c6 Merge pull request #1602 from anandpdoshi/better-default-permissions
Better default permissions, ignore_restrictions for defaults, removed fi...
2014-05-07 17:51:08 +05:30
Anand Doshi
f410bd9bf9 Better default permissions, ignore_restrictions for defaults, removed field trash_reason
Additions:
	Account --> Material User: Read
	Cost Center --> Sales User, Purchase User: Read
	Mode of Payment --> Accounts User: Read
	Supplier --> Material User, Accounts User: Read
	Employee --> Employee: Restricted Read
	Leave Type --> Employee: Read
	Production Order --> Material User: Read
	Sales Order --> Material User: Read
	Print Heading --> All: Read
	Terms and Conditions --> Purchase User, Material User: Read
	Territory --> Material User, Maintenance User: Read
	Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
	Price List --> Manufacturing User: Read
	Purchase Receipt --> Accounts User: Read
	Warehouse --> Manufacturing User: Read
2014-05-07 17:20:42 +05:30
Nabin Hait
706eb7f2c7 fixed conflict 2014-05-07 15:13:52 +05:30
Nabin Hait
90f2d8d9fc minor fix 2014-05-07 14:55:09 +05:30
Anand Doshi
dc644c37e6 Merge pull request #1597 from anandpdoshi/naming-series-by-fiscal-year
Naming series by fiscal year
2014-05-07 11:06:36 +05:30
Anand Doshi
4b438eee6d Revert "Autocreate naming series options based on Fiscal Year"
This reverts commit 8a6febbaa5.
2014-05-07 10:58:39 +05:30
Anand Doshi
8a6febbaa5 Autocreate naming series options based on Fiscal Year 2014-05-06 19:44:22 +05:30
Anand Doshi
8c2dbab878 Changed default naming series options
C-Form: C-FORM-.#####
	Purchase Invoice: PINV-.#####
	Sales Invoice: SINV-.#####
	Purchase Order: PO-.#####
	Quality Inspection: QI-.#####
	Supplier: SUPP-.#####
	Supplier Quotation: SQTN-.#####
	Attendance: ATT-.#####
	Production Order: PRO-.#####
	Installation Note: IN-.#####
	Lead: LEAD-.#####
	Opportunity: OPTY-.#####
	Quotation: QTN-.#####
	Sales Order: SO-.#####
	Delivery Note: DN-.#####
	Item: ITEM-.#####
	Material Request: MREQ-.#####
	Packing Slip: PS-.#####
	Purchase Receipt: PREC-.#####
	Stock Entry: STE-.#####
	Customer Issue: CI-.#####
	Support Ticket: SUP-.#####
	Customer: CUST-.#####
	Journal Voucher: JV-.#####
2014-05-06 19:43:11 +05:30
Nabin Hait
cc6b20b614 Merge pull request #1596 from nabinhait/v4-hotfix
V4 fixes and updates
2014-05-06 19:17:13 +05:30
Nabin Hait
3fcec56f7b Bulk rename tool fixes #1594 2014-05-06 19:13:46 +05:30
Nabin Hait
a521343063 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-06 18:53:02 +05:30
Nabin Hait
ce4a87ce83 Maintenance schedule: get no of visits and period validation. Fixes #1591 2014-05-06 18:52:36 +05:30
Anand Doshi
7fc9b63dc7 Merge pull request #1590 from anandpdoshi/remove-india-specific-fields
Remove India specific fields
2014-05-06 16:48:18 +05:30
Nabin Hait
50e962b279 Special characters allowed in company name. Fixes #1259 2014-05-06 16:46:32 +05:30
Anand Doshi
4b7a6b13ec Additions to remove India specific fields 2014-05-06 16:41:31 +05:30
Nabin Hait
3190f99ebe Option for selecting already reconciled entries in bank reconciliation #1310 2014-05-06 16:39:24 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Nabin Hait
8b22fab2f7 Merge pull request #1589 from nabinhait/v4-hotfix
V4 hotfix
2014-05-06 14:20:19 +05:30
Nabin Hait
5c82014ba9 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-06 14:01:30 +05:30
Nabin Hait
c82e967e97 Cannada translation 2014-05-06 14:01:04 +05:30
Nabin Hait
b63384b3d4 Merge pull request #1588 from nabinhait/v4-hotfix
Allow Rename option added in multiple docs. Fixes #1521
2014-05-06 12:34:50 +05:30
Nabin Hait
02d37bbb5a Allow Rename option added in multiple docs. Fixes #1521 2014-05-06 12:18:50 +05:30
Anand Doshi
728be8c4d4 Merge pull request #1587 from anandpdoshi/bugfix-v4
Enable frequently used currencies. Fixes #1561
2014-05-06 12:18:37 +05:30
Nabin Hait
07a31d2975 Merge pull request #1586 from nabinhait/v4-hotfix
V4 hotfix
2014-05-06 12:03:06 +05:30
Anand Doshi
de560aa094 Enable frequently used currencies. Fixes #1561 2014-05-06 12:02:23 +05:30
Nabin Hait
b1285f9fce Time Log Batch creation from time log list 2014-05-06 11:58:00 +05:30
Nabin Hait
cea4cd4e5f Pull stock entry difference account from company 2014-05-06 11:57:33 +05:30
Pratik Vyas
4d911db902 Release 4.0.0 2014-05-05 19:14:45 +05:30
Nabin Hait
b99a3517c3 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 18:42:07 +05:30
Nabin Hait
98c2a052e5 Fixes in pricing rule testcases #565 2014-05-05 18:41:41 +05:30
Nabin Hait
ac1bc212ea Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 18:27:31 +05:30
Anand Doshi
91b451b8ce Updated validate v3 patch 2014-05-05 18:25:37 +05:30
Anand Doshi
648062d071 Fixes in test cases 2014-05-05 16:46:38 +05:30
Rushabh Mehta
45a3226645 minor 2014-05-05 15:16:11 +05:30
Nabin Hait
f2db87a766 Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565 2014-05-05 15:04:55 +05:30
Nabin Hait
53dab55703 Pricing Rule: if multiple rules, ask to resolve conflict #565 2014-05-05 14:49:40 +05:30
Nabin Hait
0c7e28ec9f Pricing Rule improvements #565 2014-05-05 11:13:36 +05:30
Nabin Hait
ed8a845e83 POS Make Payment dialog box fix #1441 2014-05-05 11:01:32 +05:30
Nabin Hait
d5886f36af Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-05 10:28:20 +05:30
Nabin Hait
f57f0a661a Stock Entry: pulling items from BOM fixed #1579 2014-05-05 10:27:53 +05:30
Anand Doshi
69e0cb5d6f Fixed POS and Sales Invoice paid amount display, when invoice not submitted. Fixes #1573 2014-05-04 19:37:45 +05:30
Anand Doshi
2af558598c Fixed travis 2014-05-04 16:13:33 +05:30
Nabin Hait
6dad4e9e89 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-04 16:02:44 +05:30
Nabin Hait
a096b2004f Financial analytics graph fix #1542 2014-05-04 16:02:26 +05:30
Anand Doshi
4ab5382d3f Item Group delete permission, Serial No status and item code should be non-editable. Fixes #1564 2014-05-04 11:50:10 +05:30
Rushabh Mehta
24a3ec57e3 update to tests 2014-05-03 16:22:46 +05:30
Anand Doshi
75042fd502 Show Activity entries based on permissions. Completely fixes #1481 2014-05-02 19:44:28 +05:30
Anand Doshi
2b0e4266cf Go to home page on clicking left arrow in note list 2014-05-02 19:43:11 +05:30
Anand Doshi
ef5407479a Show Chart of Accounts in Accounts > Documents. Fixes #1559 2014-05-02 19:42:27 +05:30
Anand Doshi
56f29cbb27 Fixed contact page response. Fixes #1557 2014-05-02 18:17:39 +05:30
Nabin Hait
232954d4b9 Fixed updating cost on BOM after submission #1563 2014-05-02 17:51:24 +05:30
Nabin Hait
053a87edf6 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-02 17:37:38 +05:30
Nabin Hait
296d626e53 Back flush issue fixed in sub contracting #1567 2014-05-02 17:36:13 +05:30
Nabin Hait
bc83b9c1ac minor fix 2014-05-02 17:03:18 +05:30
Anand Doshi
b71a18cd1e Leave Allocation Tool and Employee. Fixes #1555 2014-05-02 16:23:51 +05:30
Nabin Hait
2cebf9b499 minor fix #1565 2014-05-02 16:12:07 +05:30
Nabin Hait
ef30932807 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-02 15:45:52 +05:30
Nabin Hait
6b03914731 asynchronus issue in get_party_details 2014-05-02 15:45:10 +05:30
Anand Doshi
f29bcaf436 Added new fixtures (Fixes #1540). Removed Employee Grade from HR. 2014-05-02 13:55:07 +05:30
Rushabh Mehta
4ceb20e07f hooks.txt -> hooks.py 2014-05-02 12:15:11 +05:30
Nabin Hait
1e6c32e95f Address and contact creation from opportunity #1570 2014-05-02 11:42:24 +05:30
Nabin Hait
92c4fc4e19 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-02 10:27:17 +05:30
Nabin Hait
d341254786 Purchase receipt to purchase invoice item 2014-05-01 17:42:21 +05:30
Anand Doshi
51e6d2228d Salary Slip - read permission for Employee. Fixes #1553 2014-05-01 16:28:13 +05:30
Nabin Hait
292a254bc1 payment to invoice matching tool disabled temporarily 2014-05-01 15:46:37 +05:30
Nabin Hait
5b98340d15 payment to invoice matching 2014-05-01 15:43:22 +05:30
Nabin Hait
e5bd955f4d Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-05-01 09:56:14 +05:30
Anand Doshi
d9f0f27cd4 Fixes in test cases 2014-04-30 22:16:25 +05:30
Nabin Hait
dcfad4f645 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-30 20:32:07 +05:30
Nabin Hait
613919325d Fixes in link field queries 2014-04-30 20:30:33 +05:30
Rushabh Mehta
a15164750d started client side testing using selenium and other related and unrelated fixes 2014-04-30 19:39:13 +05:30
Nabin Hait
b85a9108eb Payment to invoice matching tool 2014-04-30 19:32:16 +05:30
Nabin Hait
498ecfc192 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-30 19:31:22 +05:30
Nabin Hait
576f025c84 Payment to invoice matching tool 2014-04-30 19:30:50 +05:30
Anand Doshi
a47bf2ab66 Removed check for duplicate in sales bom, set default income account in Company 2014-04-30 18:54:05 +05:30
Anand Doshi
f62da519d6 Sales BOM Parent Item search - Fixes #1544 2014-04-30 16:50:39 +05:30
Anand Doshi
04f8990c11 Fixed can freeze account check for account doc in client side 2014-04-30 15:02:17 +05:30
Rushabh Mehta
33003c6168 fix for feature setup in install.py 2014-04-30 11:16:02 +05:30
Rushabh Mehta
104c9f465d updated translations 2014-04-29 18:36:27 +05:30
Rushabh Mehta
d21f55b5d2 fix in naming and feature setup on install: 2014-04-29 16:25:07 +05:30
Nabin Hait
b54307d58e minor fixes for pos trigger 2014-04-29 13:40:54 +05:30
Nabin Hait
b1777ecfd8 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-29 11:31:37 +05:30
Nabin Hait
17910aa0d6 Removed income and expense related info temporarily from email digest 2014-04-29 11:31:11 +05:30
Anand Doshi
cd17bdffcd Fixes in account query, fiscal year and cost center 2014-04-28 20:34:48 +05:30
Nabin Hait
6777efa7fa Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-04-28 17:09:13 +05:30
Nabin Hait
985918d42b Minor fixes in company and account 2014-04-28 17:08:28 +05:30
Anand Doshi
69aa8ffac4 Fixed as_dict of employee.py 2014-04-28 16:51:34 +05:30
Nabin Hait
2594e41462 Removed Stock Ledger doctype 2014-04-28 16:23:45 +05:30
Nabin Hait
48962e1148 Minor fix in sales funnel report 2014-04-28 15:43:32 +05:30
Anand Doshi
65f83cbae7 BugFix: Sales Order with Order Type as Shopping Cart 2014-04-28 15:33:34 +05:30
Anand Doshi
3b3d55cda2 Usability: Set For Warehouse and Work-in-Progress Warehouse as mandatory, when the user clicks Submit 2014-04-28 15:33:34 +05:30
Anand Doshi
4c90bae16d BugFix: Item search in Production Planning Tool 2014-04-28 15:33:34 +05:30
Anand Doshi
6916baa299 BugFix: Item search in Stock UOM Replace Utility 2014-04-28 15:33:34 +05:30
Nabin Hait
ac87c1d618 Merge pull request #1537 from n3storm/develop
Update mode_of_payment.py
2014-04-28 15:32:31 +05:30
Néstor Díaz Valencia
21412ddf65 Update mode_of_payment.py
Renamed solves issue #1536
2014-04-28 11:54:31 +02:00
Rushabh Mehta
41d126586e fix get_server_fields in stock_entry.js 2014-04-27 12:30:20 +05:30
Anand Doshi
8e5b2af0fb Set conversion_factor in stock entry test case 2014-04-25 19:35:06 +05:30
Anand Doshi
fc79efb97c Fixes #1532. Only show an error message for missing Quality Inspection but let the user submit Purchase Receipt. 2014-04-25 18:44:28 +05:30
Anand Doshi
1872312cc6 Deprecated client side mapper: frappe.model.map. Fixes #1530 2014-04-25 18:38:08 +05:30
Anand Doshi
e3f6b6d899 Fixed Opportunity Lost UX 2014-04-25 18:36:06 +05:30
Anand Doshi
69a2c25ca5 Fixed set_query 2014-04-25 18:35:45 +05:30
Anand Doshi
bbffaf78fb BugFix: use transfer_qty instead of actual_qty in check_duplicate_entry_for_production_order - ported webnotes/erpnext@942ff2583b 2014-04-25 18:31:09 +05:30
Anand Doshi
8bde7f9b3a Conditionally toggle Naming Series. Fixes #1526 2014-04-24 18:11:49 +05:30
Anand Doshi
7f2d08b03f Fixed Naming Series page loading fails #1524 2014-04-24 13:51:35 +05:30
Anand Doshi
8c62c40a3d Fixed Make Sales Order from Quotation #1522 2014-04-24 12:40:19 +05:30
Anand Doshi
78eeacb53c Fixes in Lead, Opportunity, Quotation, Setup Wizard 2014-04-23 19:15:15 +05:30
Anand Doshi
f50a65294f Fixed NameError handling 2014-04-23 13:41:28 +05:30
Anand Doshi
b054eb7a4f Call calculate_taxes_and_totals after mapping 2014-04-22 20:35:22 +05:30
Anand Doshi
4bb87373dc Fixed default website creation
Default website generation was creating company page twice,
which led to duplicate website route validation
2014-04-22 19:50:08 +05:30
Anand Doshi
68d0b7c7ff get_item_details fixed for Material Request 2014-04-22 19:30:53 +05:30
Anand Doshi
3e41fd1fd3 List route for tree browser based doctypes; Fixes to add child in tree browsers 2014-04-22 18:55:21 +05:30
Rushabh Mehta
4ef1835bee website updates 2014-04-22 16:52:35 +05:30
Anand Doshi
2944f49974 Setup Wizard: on country select, change date format, save logo in Website Settings > Brand HTML 2014-04-22 16:25:58 +05:30
Anand Doshi
07339fc69e Fixes in Setup Wizard and Attachments 2014-04-22 15:30:24 +05:30
Rushabh Mehta
3f51705ba4 website cleanups 2014-04-21 22:10:43 +05:30
Anand Doshi
0549b1c5c9 Duplicate supplier delivery number validation in Purchase Receipt should happen per financial year 2014-04-21 15:59:47 +05:30
Anand Doshi
21ae930b4c Removed controller.py 2014-04-21 15:12:50 +05:30
Anand Doshi
424c033395 Removed controller.py 2014-04-21 15:06:56 +05:30
Rushabh Mehta
40b2b03bcb demo fixes 2014-04-21 13:43:35 +05:30
Rushabh Mehta
f63513ed38 minor fixes to website 2014-04-21 13:43:35 +05:30
Anand Doshi
9365b616b8 Added an exist check for accounts.utils.get_balance_on 2014-04-21 12:42:21 +05:30
Anand Doshi
cbbf451974 Fixes throw 2014-04-21 11:33:49 +05:30
Rushabh Mehta
0900beecb2 added languages.txt 2014-04-18 16:24:28 +05:30
Anand Doshi
5d591ebe83 Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext 2014-04-18 16:20:07 +05:30
Rushabh Mehta
603e6e21b5 test fixes 2014-04-18 16:17:29 +05:30
Rushabh Mehta
370a024e46 cleaned up sample website and separated fixtures by country 2014-04-18 16:00:41 +05:30
Rushabh Mehta
169c1fd93b fixed translation for setup-wizard and removed purchase validation for Material Request #925 2014-04-18 10:40:17 +05:30
Anand Doshi
ac32bad25a Fixes in Taxes, Quotation and Address Territory 2014-04-18 01:32:02 +05:30
Pratik Vyas
33e1db8c40 Add language to setup wizard (travis) 2014-04-17 19:04:34 +05:30
Rushabh Mehta
52e618d0b2 updates to Setup Wizard, set language as first input 2014-04-17 18:50:33 +05:30
Anand Doshi
dbfcd328fb Fixes update_after_submit validation errors 2014-04-17 12:35:04 +05:30
Anand Doshi
0d345c9152 Fixes Item Price duplicate entry validation 2014-04-17 11:40:22 +05:30
Anand Doshi
de1a97d506 Fixes get_voucher_detail for Stock Reconcilation 2014-04-17 11:37:46 +05:30
Anand Doshi
094610d7ce Fixes in Production, Stock Entry and Stock Controller 2014-04-16 20:23:24 +05:30
Rushabh Mehta
eea802298e refactor get_voucher_details in stock_controller 2014-04-16 19:38:40 +05:30
Rushabh Mehta
052fe82688 production order: test fixed and added in test_stock_entry.py 2014-04-16 19:20:11 +05:30
Rushabh Mehta
166bc2a0e0 translations: updated German 2014-04-16 18:37:57 +05:30
Rushabh Mehta
c38fc713c6 updated translations 2014-04-16 17:46:30 +05:30
Rushabh Mehta
8c51318d82 added naming series for campaign #1413 2014-04-16 17:41:52 +05:30
Rushabh Mehta
e8b0402a10 added naming series for campaign #1413 2014-04-16 17:41:52 +05:30
Rushabh Mehta
c635875765 added naming series for campaign #1413 2014-04-16 17:41:51 +05:30
Anand Doshi
652bc0784a Ported v3 fixes to v4
Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe
2014-04-16 15:26:42 +05:30
Nabin Hait
13429a3b34 Space allowed in naming series
Conflicts:
	setup/doctype/naming_series/naming_series.py
2014-04-16 15:24:04 +05:30
Nabin Hait
a0c239db8d perpetual inventory fix related to sub-contracting
Cherry-picked and modified by @anandpdoshi

Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py
2014-04-16 15:23:10 +05:30
Nabin Hait
450d9d72d7 Minor fix in monthly attendance report
Cherry-picked and modified by @anandpdoshi

Conflicts:
	hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
2014-04-16 15:23:09 +05:30
Nabin Hait
6298536e46 set stock balance as per serial no count
Cherry Picked and Modified by @anandpdoshi

Conflicts:
	stock/doctype/stock_ledger/stock_ledger.py
	utilities/repost_stock.py
2014-04-16 15:23:08 +05:30
Anand Doshi
88a869f34d No Copy for Paid and Write Off Amount in Sales Invoice
Ported webnotes/erpnext@f739bffedd
2014-04-16 15:23:08 +05:30
Rushabh Mehta
1d8f1a9a46 #1481 2014-04-16 09:32:51 +05:30
Rushabh Mehta
82d8a637ac #1252 2014-04-16 09:20:00 +05:30
Rushabh Mehta
d85dc868ca more message fixes for translation 2014-04-15 22:54:34 +05:30
Rushabh Mehta
ff93802d58 more message fixes 2014-04-15 18:40:31 +05:30
Anand Doshi
a6e2ca9d3b Fixes #1491 2014-04-15 17:12:15 +05:30
Rushabh Mehta
8a40c136ce more message fixing 2014-04-15 16:31:20 +05:30
Anand Doshi
c5e057f676 Fixed exploded BOM construction 2014-04-15 16:14:15 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Anand Doshi
5d4ffa6cf8 Fixed splash.svg 2014-04-15 13:09:09 +05:30
Pratik Vyas
f37d6fe32b Merge pull request #1514 from frappe/js-translate-refactor
JS translation refactor
2014-04-15 11:44:16 +05:30
Pratik Vyas
e1eeb22f1e remove linebreaks for translation strings (js) 2014-04-15 10:50:36 +05:30
Pratik Vyas
13c92e3ad5 fix accounts browser and cost center strings (js) 2014-04-15 10:08:53 +05:30
Pratik Vyas
ec9c448ccf fix taxes and charges strings and labels 2014-04-15 09:49:40 +05:30
Rushabh Mehta
549977bf4f typo fix in journal_voucher.py 2014-04-14 22:40:17 +05:30
Rushabh Mehta
354b32177d fix for leave application test 2014-04-14 22:23:41 +05:30
Rushabh Mehta
9f0d625300 update translation strings #1403 2014-04-14 19:20:45 +05:30
Pratik Vyas
b0f279a34e js translations refactor 2014-04-14 17:14:23 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Pratik Vyas
7da01d6007 fix manifest 2014-04-13 03:12:12 +05:30
Anand Doshi
bd67e87921 Fixes saving of Sales Order and fetching Prices frappe/frappe#478 2014-04-11 16:51:27 +05:30
Anand Doshi
13ae548ff6 Fixes for model-cleanup frappe/frappe#478 2014-04-10 18:43:07 +05:30
Pratik Vyas
f7daab7393 pass only valid columns to get_item_details 2014-04-10 17:53:30 +05:30
Anand Doshi
233fbb08b2 Minor fix 2014-04-10 12:53:16 +05:30
Anand Doshi
61649c1d43 Verbose in travis 2014-04-10 12:40:29 +05:30
Anand Doshi
ddd2b8a398 Merge pull request #1504 from frappe/model-cleanup
Model cleanup
2014-04-10 11:39:16 +05:30
Anand Doshi
8c45d4ce3c Fixed travis frappe/frappe#478 2014-04-10 11:38:11 +05:30
Anand Doshi
20771621e7 Verbose app install in travis 2014-04-09 20:03:27 +05:30
Anand Doshi
9fd50bcfb6 Fixed rest of the test cases frappe/frapp#478 2014-04-09 19:20:01 +05:30
Anand Doshi
d29465029d Fixed Test Cases frappe/frappe#478 2014-04-08 20:15:22 +05:30
Anand Doshi
cd71e1d8ab Test Cases - Journal Voucher, Purchase Invoice, Period Closing Voucher frappe/frappe#478 2014-04-08 13:53:35 +05:30
Anand Doshi
2ce39cf770 Fixed Stock Entry Test Cases frappe/frappe#478 2014-04-07 18:51:58 +05:30
Nabin Hait
103cc58cb6 material request testcase #478 2014-04-07 16:40:43 +05:30
Nabin Hait
4155e58a61 Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-07 16:00:49 +05:30
Nabin Hait
088dec6c09 testcase fixes #478 2014-04-07 16:00:28 +05:30
Rushabh Mehta
322d39f3a6 Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-07 15:09:25 +05:30
Rushabh Mehta
49f49ea603 started party frappe/erpnext#1503 2014-04-07 15:09:09 +05:30
Nabin Hait
dc82d4f0cd frappe/frappe#478 fixes 2014-04-07 12:02:57 +05:30
Nabin Hait
9f66c306ea Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-07 12:01:59 +05:30
Anand Doshi
bedc62f090 Fixed Feed 2014-04-04 16:26:45 +05:30
Nabin Hait
e7885e3ee0 frappe/frappe#478 replaced doclist in testcases 2014-04-04 13:26:50 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Nabin Hait
312ba99e71 frappe/frappe#478 fixes 2014-04-04 11:06:10 +05:30
Rushabh Mehta
c10213d861 Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-03 17:43:28 +05:30
Rushabh Mehta
0cf531c8a6 frappe/frappe#478 fixes 2014-04-03 17:43:06 +05:30
Nabin Hait
c272f2020b Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-03 17:39:50 +05:30
Nabin Hait
365ae27acf frappe/frappe#478 fixes 2014-04-03 17:38:54 +05:30
Rushabh Mehta
7db7112d3f frappe/frappe#478 fix and added print heading 2014-04-03 15:04:18 +05:30
Rushabh Mehta
99f914b782 frappe/frappe#478, fixes 2014-04-03 14:47:03 +05:30
Rushabh Mehta
2fbb00fd8d frappe/frappe#478, more changes, removed bean 2014-04-03 14:38:22 +05:30
Rushabh Mehta
f14b809ab5 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:42 +05:30
Rushabh Mehta
d36cb5c812 frappe/frappe#478 removed more instances of doclist 2014-04-03 12:38:42 +05:30
Rushabh Mehta
cfb6ccfe51 frappe/frappe#478 removed self.doclist 2014-04-03 11:46:52 +05:30
Rushabh Mehta
f191f854cd frappe/frappe#478 erpnext install works 2014-04-02 18:09:34 +05:30
Anand Doshi
943e614810 frappe/frappe#478 2014-04-02 16:37:35 +05:30
Anand Doshi
63dfe3d3b3 Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup 2014-04-02 15:03:51 +05:30
Anand Doshi
5b552b51f1 frappe/frappe#478 2014-04-02 15:03:35 +05:30
Rushabh Mehta
732825cb23 frappe/frappe#478 fixed todo and renamed hooks 2014-04-02 12:08:03 +05:30
Anand Doshi
dd32d6eb1f frappe/frappe#478 2014-04-01 12:22:14 +05:30
Rushabh Mehta
f2227d033c frappe/frappe#478, removed instances of .fields 2014-03-31 23:37:40 +05:30
Rushabh Mehta
231f6a5b58 frappe/frappe#478 added test_records.json 2014-03-31 23:05:12 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Nabin Hait
0e13cd5ac9 frappe/frappe#478 2014-03-28 17:01:32 +05:30
Nabin Hait
0d8d30e1cc frappe/frappe#478 2014-03-28 16:57:21 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
43405203b2 frappe/frappe#478 2014-03-28 16:43:50 +05:30
Anand Doshi
81ba0b29da frappe/frappe#478 2014-03-28 15:23:26 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Anand Doshi
67d6a4e3aa Merge remote-tracking branch 'frappe/develop' into model-cleanup
Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py
2014-03-28 13:41:59 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Nabin Hait
4090c78c3f coa: payment to invoice matching tool fixes 2014-03-27 17:19:32 +05:30
Nabin Hait
becf75d791 Perpetual inventory cleanup 2014-03-27 17:18:29 +05:30
Rushabh Mehta
d2b34dc30c frappe/frappe#478 2014-03-27 16:12:56 +05:30
Rushabh Mehta
66d52b55c0 #478 2014-03-27 14:17:33 +05:30
Rushabh Mehta
aa355af2cf refactored client side Model and Meta - frappe/frappe#478 2014-03-26 18:24:30 +05:30
Nabin Hait
5c6b34a84c minor fix 2014-03-26 10:30:25 +05:30
Nabin Hait
3a70ba3ba1 Merge github.com:frappe/erpnext into develop 2014-03-26 10:23:53 +05:30
Nabin Hait
d6e4ab3fd4 maintenance schedule: validate amc dates and update in serial no 2014-03-26 10:23:27 +05:30
Nabin Hait
1d630ccaa5 Update serial no maintenance status based on warranty/amc expiry date 2014-03-26 10:23:14 +05:30
Anand Doshi
754cbd4036 Fixed Permissions and Time Log 2014-03-25 20:09:12 +05:30
Nabin Hait
6fa0f25e7c Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-03-25 19:36:16 +05:30
Nabin Hait
0c9d42258c Minor fix related to pos paid amount 2014-03-25 19:35:41 +05:30
Anand Doshi
79196a9ef7 Fixed install 2014-03-25 19:32:08 +05:30
Anand Doshi
059b83a2ce Fixed MariaDB install steps in travis 2014-03-25 18:40:46 +05:30
Anand Doshi
3be9e26934 Fixed MariaDB install steps in travis 2014-03-25 18:39:56 +05:30
Nabin Hait
2c517e0a62 Fixes related to countrywise coa 2014-03-25 18:28:49 +05:30
Nabin Hait
ec9fb67d84 fixed conflict 2014-03-25 16:53:50 +05:30
Anand Doshi
7fbdba02ab Fixed Countrywise Chart of Accounts patch 2014-03-25 13:50:52 +05:30
Nabin Hait
221a8fff1c minor fix in patch 2014-03-23 17:35:24 +05:30
Nabin Hait
96c0afe0f1 minor fix in patch 2014-03-23 17:25:02 +05:30
Nabin Hait
06a595090d coa: minor fix 2014-03-21 18:30:46 +05:30
Nabin Hait
425bfc5c8d minor fix in serial no 2014-03-21 18:15:26 +05:30
Nabin Hait
c07537b1e9 unidecode added to the erpnext requirements 2014-03-21 12:25:49 +05:30
Nabin Hait
155c96b410 patch to delete mis control and financial statements and set bank/cash account 2014-03-21 12:15:13 +05:30
Nabin Hait
19dadb4a82 unidecode added to the erpnext requirements 2014-03-21 11:46:51 +05:30
Nabin Hait
f7f95ea37a Merge pull request #1482 from nabinhait/countrywise_coa
Countrywise coa
2014-03-21 11:38:35 +05:30
Nabin Hait
0c21e2afef Is_pl_account and debit_or_credit field removed and added report_type field in account 2014-03-21 11:35:59 +05:30
Nabin Hait
b5e6d7e171 Account balance in debit and credit columns in trial balance and financial analytics report 2014-03-21 11:26:09 +05:30
Nabin Hait
47a3c10334 Patch to update old accounts property 2014-03-21 11:26:08 +05:30
Nabin Hait
e67202484d Imported charts with proper report types 2014-03-21 11:26:08 +05:30
Nabin Hait
e0f98d7202 account properties file added 2014-03-21 11:26:08 +05:30
Nabin Hait
102842ba79 Leave allocation fix 2014-03-21 11:26:08 +05:30
Nabin Hait
73083dc960 Fix related to user_default 2014-03-21 11:26:08 +05:30
Nabin Hait
27bb7892b3 Fixes in pos settings 2014-03-21 11:26:07 +05:30
Nabin Hait
482ffac83f Set paid amount to zero if not pos 2014-03-21 11:26:07 +05:30
Nabin Hait
439dceebd8 minor fix in landed cost wizard 2014-03-21 11:25:17 +05:30
Nabin Hait
e848914da1 consider all entries against bank account in bank reconciliation statement, even if no reference no 2014-03-21 11:25:17 +05:30
Nabin Hait
d8dcdfbf4f Warehouse disable option 2014-03-21 11:25:17 +05:30
Nabin Hait
eb1192771f set root type from parent or child 2014-03-21 11:25:17 +05:30
Nabin Hait
e71cf6d6a1 More country charts imported from openerp 2014-03-21 11:25:17 +05:30
Nabin Hait
037bf6b382 More country charts imported from openerp 2014-03-21 11:25:17 +05:30
Nabin Hait
24e136e3f3 Patch: set root_type for old existing accounts 2014-03-21 11:25:16 +05:30
Nabin Hait
3dfe854108 Rename duplicate account 2014-03-21 11:25:16 +05:30
Nabin Hait
fc37fd8b6e Set Paid amount and write off amount for pos 2014-03-21 11:25:16 +05:30
Nabin Hait
55a03dbf69 major fixes in importing charts from openerp 2014-03-21 11:22:42 +05:30
Nabin Hait
b93ebaebe4 Added new account types and patch for existing 2014-03-21 11:22:41 +05:30
Nabin Hait
a18bf07920 updated charts json with proper account and root types 2014-03-21 11:22:41 +05:30
Nabin Hait
d7d9d25d71 Country and chart fields added in company master 2014-03-21 11:22:40 +05:30
Nabin Hait
813a93d78d import chart records into database frm json 2014-03-21 11:22:40 +05:30
Nabin Hait
a69c30edec country code added 2014-03-21 11:22:39 +05:30
Nabin Hait
d89f3403ac charts of account doctype added and imported charts json from openerp 2014-03-21 11:22:39 +05:30
Nabin Hait
b77773ca07 fixes in financial statements 2014-03-21 11:22:38 +05:30
Nabin Hait
2b57ecbd6c fixes for debit_or_credit in account tree grid report 2014-03-21 11:22:38 +05:30
Nabin Hait
53822ae9d0 Account balance must be of type debit/credit 2014-03-21 11:22:38 +05:30
Nabin Hait
49a6f0754e Removed debit_or_credit field 2014-03-21 11:22:38 +05:30
Nabin Hait
133490a0c5 Removed max roots validation 2014-03-21 11:22:37 +05:30
Nabin Hait
4d713ac5ba sql injection fixes 2014-03-21 11:22:37 +05:30
Anand Doshi
eb7fea673b Fixed set_single_defaults during install 2014-03-19 17:10:01 +05:30
Anand Doshi
4b2692182a Fixes after change in fields handling in Document 2014-03-19 16:58:42 +05:30
Anand Doshi
76f330ca66 Fixed Fiscal Year input issue in Setup Wizard 2014-03-19 15:45:05 +05:30
Anand Doshi
2134d24b36 Removed cloud subscription logic 2014-03-14 15:24:57 +05:30
Pratik Vyas
9d1e8640ef Update README.md 2014-03-13 20:45:27 +05:30
Anand Doshi
49e0a687b3 Minor Fixes 2014-03-13 20:44:28 +05:30
Nabin Hait
54106807e4 Set paid amount to zero if not pos 2014-03-13 17:26:41 +05:30
Nabin Hait
a8dbb0dd41 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-03-13 17:23:24 +05:30
Pratik Vyas
65e8676f8b Profile -> User 2014-03-13 03:09:15 +05:30
Pratik Vyas
5c81f9c44e check docstatus before updating employee 2014-03-13 02:35:23 +05:30
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec Fixed Dropbox, Scheduler, 3to4 migration 2014-03-11 15:17:13 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Anand Doshi
ec621194fc Verbose is default in cli.py 2014-03-07 14:01:56 +05:30
Rushabh Mehta
c12ccdb6ea bugfix erpnext/frappe#1446 2014-03-06 15:45:45 +05:30
Rushabh Mehta
d8de921c40 fixed erpnext/frappe#1441 and other pos related cleanups 2014-03-06 15:40:22 +05:30
Rushabh Mehta
73f0bf36c1 fixed #1454 2014-03-06 14:45:02 +05:30
Rushabh Mehta
2e7ad8980c fix for queries 2014-03-06 12:28:47 +05:30
Rushabh Mehta
4541875c81 removed searchfield condition from get_match_cond frappe/erpnext#1457 2014-03-06 11:19:46 +05:30
Rushabh Mehta
0fabc6a841 minor fix 2014-03-06 11:19:46 +05:30
Rushabh Mehta
2a45e1cfd0 Merge pull request #1437 from ddimmich/patch-1
Update README.md
2014-03-06 10:46:03 +05:30
Anand Doshi
2d5727b17b Ignore mandatory during email pulling 2014-03-05 19:24:07 +05:30
Anand Doshi
b2c2fca8a5 Added Pricing Rule to Accounts, Buying, Selling home 2014-03-05 18:25:10 +05:30
Nabin Hait
9472247b6e Update stock_entry.js 2014-03-05 17:45:58 +05:30
Anand Doshi
ebdac5db5c Fix in Pricing Rule Patch 2014-03-05 17:31:37 +05:30
Anand Doshi
7ea8528d50 Fixed Pricing Rule Cleanup Fieldname 2014-03-05 17:27:00 +05:30
Anand Doshi
74d0e40bdc Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields 2014-03-05 15:24:29 +05:30
Nabin Hait
2d57b0aa52 Merge branch 'develop' of github.com:frappe/erpnext into develop 2014-03-05 10:51:04 +05:30
Anand Doshi
0c4ef64b32 Fixed booboo: Moved website moduleview to framework 2014-03-04 11:15:08 +05:30
Anand Doshi
e30511d315 Email Settings split into Outgoing Email Settings and Support Email Settings 2014-03-03 20:32:20 +05:30
Anand Doshi
64f2ccd9e1 Global Settings in Setup, Sales Master Manager can restrict for Customer 2014-03-03 19:28:30 +05:30
Anand Doshi
6b12b07b33 Fixes to Module Views 2014-03-03 16:05:00 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Nabin Hait
8e4640f464 minor fix in report 2014-03-03 12:06:50 +05:30
Nabin Hait
f976143063 pricing rule patch fix 2014-02-28 19:02:27 +05:30
Nabin Hait
177b86a15b fix in pricing rule 2014-02-28 15:47:22 +05:30
Nabin Hait
e7e615cf18 pricing rule: fixes in testcase 2014-02-28 15:21:49 +05:30
Nabin Hait
13b93ebed8 pricing rule: fixes in testcase 2014-02-28 15:04:05 +05:30
Nabin Hait
3319170805 pricing rule: condition for tree-type docs 2014-02-28 13:04:19 +05:30
Nabin Hait
ed5f423e65 pricing rule: condition for tree-type docs 2014-02-28 13:04:19 +05:30
Nabin Hait
311079a311 Patch: copy customer discount to pricing rule 2014-02-28 13:04:19 +05:30
Nabin Hait
08222150f2 Pricing Rule fixes and reference field in all item table 2014-02-28 13:02:00 +05:30
Nabin Hait
7e8e8ba714 pricing rule 2014-02-28 13:02:00 +05:30
Nabin Hait
c65a0c7197 Allowed stock entry import 2014-02-28 13:02:00 +05:30
Nabin Hait
bc34f3edae shortage qty column added in stock projected qty report 2014-02-28 13:02:00 +05:30
Nabin Hait
615d342056 Pricing Rule: first commit 2014-02-28 13:02:00 +05:30
Anand Doshi
8462a7691b Fixed login 2014-02-28 11:53:59 +05:30
Rushabh Mehta
063141d152 added patch for address 2014-02-28 11:37:36 +05:30
Anand Doshi
fb21ce3893 3to4 fixes 2014-02-27 13:18:20 +05:30
Damian Dimmich
1ee5675750 Update README.md
remove old doc line
2014-02-26 10:29:42 +01:00
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd Fixed Purchase Invoice test cases 2014-02-25 17:25:28 +05:30
Anand Doshi
0936ae6dca Fixed company web page creation 2014-02-25 16:21:50 +05:30
Anand Doshi
4362443b6e Propagate ignore_permissions during mapping from quotation to sales order 2014-02-25 15:42:32 +05:30
Anand Doshi
201dbbd977 Quotation Item Table can be empty 2014-02-25 15:42:32 +05:30
Rushabh Mehta
a6628eee56 rename sitemap to route 2014-02-25 11:08:37 +05:30
Nabin Hait
a1c96de9fc party related cleanup 2014-02-21 14:45:10 +05:30
Rushabh Mehta
6fbda08583 fixed sitemap patch 2014-02-20 19:03:03 +05:30
Nabin Hait
cda83bba59 Row no fix in stock reconciliation 2014-02-20 15:01:51 +05:30
Nabin Hait
2f8d4451f5 calculate outstanding amount in server side, only if docstatus is 0 2014-02-20 14:59:37 +05:30
Nabin Hait
0f2310690e fix in fetch item details and supplier non-mandatory to fetch 2014-02-20 11:27:47 +05:30
Pratik Vyas
33f36c3462 Add CI badge to readme 2014-02-20 00:17:43 +05:30
Pratik Vyas
a08855a0de add site arg to travis build script, booboo 2014-02-20 00:06:35 +05:30
Pratik Vyas
3197767650 run setup wizard before running tests on travis 2014-02-19 23:22:02 +05:30
Pratik Vyas
28da7523be set single defaults after install 2014-02-19 20:53:45 +05:30
Nabin Hait
ce64afaa51 default value in single doctypes 2014-02-19 19:12:01 +05:30
Nabin Hait
f5bb9ae1b1 default value in single doctypes 2014-02-19 19:02:40 +05:30
Nabin Hait
22831563ff default value in selling settings 2014-02-19 18:35:54 +05:30
Nabin Hait
32f168617c default value in global defaults 2014-02-19 18:11:42 +05:30
Nabin Hait
74bbd24b1d Merge github.com:frappe/erpnext into develop 2014-02-19 17:43:51 +05:30
Nabin Hait
9d1f077922 get lead details in quotation 2014-02-19 17:43:24 +05:30
Rushabh Mehta
e0e3f92019 fixed sales / accounts tree 2014-02-19 12:43:16 +05:30
Nabin Hait
05b28eb161 minor fixes 2014-02-19 11:04:32 +05:30
Nabin Hait
36a4db69b8 price list on_trash function 2014-02-18 15:14:46 +05:30
1584 changed files with 236608 additions and 230107 deletions

View File

@@ -7,16 +7,32 @@ services:
- mysql
install:
- CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop &&
- pip install --editable .
- sudo service mysql stop
- sudo apt-get install python-software-properties
- sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
- sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main'
- sudo apt-get update
- sudo apt-get purge -y mysql-common
- sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev
- ./ci/fix-mariadb.sh
script:
cd ./test_sites/ &&
frappe --reinstall -v test_site &&
frappe --install_app erpnext -v test_site &&
frappe --run_tests -v test_site --app erpnext
- sudo apt-get install xfonts-75dpi xfonts-base -y
- wget http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.2.1/wkhtmltox-0.12.2.1_linux-precise-amd64.deb
- sudo dpkg -i wkhtmltox-0.12.2.1_linux-precise-amd64.deb
- CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop
- CFLAGS=-O0 pip install --editable .
before_script:
- mysql -e 'create database travis' &&
- echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis') WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root
- mysql -e 'create database test_frappe'
- echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root
- echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root
script:
- cd ./test_sites/
- frappe --use test_site
- frappe --reinstall
- frappe --install_app erpnext --verbose
- frappe -b
- frappe --build_website
- frappe --serve_test &
- frappe --verbose --run_tests --app erpnext

View File

@@ -1,16 +1,23 @@
# Contributing to ERPNext
# Contributing to Frappe / ERPNext
### Update 16-Sep-14
Please send pull requests to branch v5.0
## Reporting issues
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems. Please read the following guidelines before opening any issue.
1. **Search for existing issues.** We want to avoid duplication, and you'd help us out a lot by first checking if someone else has reported the same issue. The issue may have already been resolved with a fix available.
1. **Search for existing issues:** We want to avoid duplication, and you'd help us out a lot by first checking if someone else has reported the same issue. The issue may have already been resolved with a fix available.
1. **Report each issue separately:** Don't club multiple, unreleated issues in one note.
1. **Mention the version number:** Please mention the application, browser and platform version numbers.
### Issues
1. **Share as much information as possible.** Include operating system and version, browser and version, when did you last update ERPNext, how is it customized, etc. where appropriate. Also include steps to reproduce the bug.
1. Consider adding screenshots annotated with what goes wrong.
1. If you are reporting an issue from the browser, Open the Javascript Console and paste us any error messages you see.
1. **Share as much information as possible:** Include operating system and version, browser and version, when did you last update ERPNext, how is it customized, etc. where appropriate. Also include steps to reproduce the bug.
1. **Include Screenshots if possible:** Consider adding screenshots annotated with what goes wrong.
1. **Find and post the trace for bugs:** If you are reporting an issue from the browser, Open the Javascript Console and paste us any error messages you see.
### Feature Requests
@@ -37,14 +44,10 @@ that function to accommodate your use case.
DocTypes are easy to create but hard to maintain. If you find that there is a another DocType with a similar functionality, then please try and extend that functionality. For example, by adding a "type" field to classify the new type of record.
#### Don't Send Trivial Requests
Don't send pull requests for fixing a simple typo in a code comment.
#### Tabs or spaces?
Tabs!
### Copyright
Please see README.md
Please see README.md

View File

@@ -4,6 +4,8 @@ include *.json
include *.md
include *.py
include *.txt
include .travis.yml
recursive-include erpnext *.txt
recursive-include erpnext *.css
recursive-include erpnext *.csv
recursive-include erpnext *.html
@@ -14,5 +16,5 @@ recursive-include erpnext *.md
recursive-include erpnext *.png
recursive-include erpnext *.py
recursive-include erpnext *.svg
recursive-include erpnext *.txt
recursive-exclude * *.pyc
recursive-include erpnext/public *
recursive-exclude * *.pyc

View File

@@ -1,85 +1,30 @@
# ERPNext - Open Source ERP for small, medium sized businesses
# ERPNext - Open source ERP for small and medium-size business [![Build Status](https://travis-ci.org/frappe/erpnext.png)](https://travis-ci.org/frappe/erpnext)
[https://erpnext.com](https://erpnext.com)
Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Built on Python / MySQL.
Includes: Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Requires MariaDB.
ERPNext is built on [frappe](https://github.com/frappe/frappe)
ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & Javascript.
- [User Guide](http://erpnext.org/user-guide.html)
- [User Guide](https://erpnext.com/user-guide)
- [Getting Help](http://erpnext.org/getting-help.html)
- [Developer Forum](http://groups.google.com/group/erpnext-developer-forum)
- [User Forum](http://groups.google.com/group/erpnext-user-forum)
- [Discussion Forum](https://discuss.frappe.io/)
---
### Development install
### Full Install
#### Pre-requisites
The Easy Way install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench
1. MySQL
1. Python-2.7
1. Python Setuptools (Python Package Manager)
1. Memcache
1. libxslt
New passwords will be created for the ERPNext "Administrator" user, the MariaDB root user, and the frappe user (the script displays the passwords and saves them to ~/frappe_passwords.txt).
#### Steps
### Virtual Image
1. Start MySQL and memcache
1. Setup Python Virtualenv (optional - only if you are running multiple python projects requiring different versions of libraries)
1. Install pip: `sudo easy_install pip`
1. Create a `bench` directory
1. Clone `frappe` in the `bench` : `git clone https://github.com/frappe/frappe`
1. Install python libraries `sudo pip install webnotes/requirements.txt`
1. Clone `erpnext` in the `bench`: `git clone https://github.com/frappe/erpnext.git`
1. Clone `shopping-cart` in the `bench`: `git clone https://github.com/frappe/shopping-cart.git`
1. Install the packages: `pip install -e frappe/ erpnext/ shopping-cart/`
1. Create `sites` directory
1. Create `apps.txt`: `echo erpnext\nshopping_cart >> sites/apps.txt`
1. Change to `sites` directory
1. Setup a site: `frappe erpnext.local --install erpnext`
1. Install erpnext app: `frappe erpnext.local --install_app erpnext`
1. Start serving: `frappe erpnext.local --serve`
1. Start a browser and go to `http://localhost:8000`
You can download a virtual image to run ERPNext in a virtual machine on your local system.
Putting it all together:
- [ERPNext Download](http://erpnext.com/download)
```
sudo easy_install pip
mkdir bench
cd bench
git clone https://github.com/frappe/frappe.git
git clone https://github.com/frappe/erpnext.git
git clone https://github.com/frappe/shopping-cart.git
sudo pip install -e frappe/ erpnext/ shopping-cart/
mkdir sites
echo erpnext\nshopping_cart >> sites/apps.txt
cd sites
frappe erpnext.local --install erpnext
frappe erpnext.local --install_app erpnext
frappe erpnext.local --install_app shopping-cart
frappe erpnext.local --serve
```
#### Pulling Latest Updates
1. Update your git repositories
1. Go to `bench/sites` directory
1. Run `frappe erpnext.local --latest`
1. Run `frappe erpnext.local --build`
1. Run `frappe erpnext.local --flush`
#### Admin Login
1. go to "/login"
1. Administrator user name: "Administrator"
1. Administrator passowrd "admin"
### Download and Install
##### Virtual Image:
- [ERPNext Download](http://erpnext.com/erpnext-download)
System and user credentials are listed on the download page.
---
@@ -87,7 +32,7 @@ frappe erpnext.local --serve
GNU/General Public License (see LICENSE.txt)
The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Web Notes Technologies Pvt Ltd (Web Notes) and Contributors.
The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Web Notes Technologies Pvt Ltd (Web Notes) and Contributors.
---
@@ -112,7 +57,7 @@ We will grant permission to use the ERPNext name and logo for projects that meet
- The primary purpose of your project is to promote the spread and improvement of the ERPNext software.
- Your project is non-commercial in nature (it can make money to cover its costs or contribute to non-profit entities, but it cannot be run as a for-profit project or business).
Your project neither promotes nor is associated with entities that currently fail to comply with the GPL license under which ERPNext is distributed.
- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
- If your project meets these criteria, you will be permitted to use the ERPNext name and logo to promote your project in any way you see fit with one exception: Please do not use ERPNext as part of a domain name.
Use of the ERPNext name and logo is additionally allowed in the following situations:

11
ci/fix-mariadb.sh Executable file
View File

@@ -0,0 +1,11 @@
#!/bin/bash
# stolen from http://cgit.drupalcode.org/octopus/commit/?id=db4f837
includedir=`mysql_config --variable=pkgincludedir`
thiscwd=`pwd`
_THIS_DB_VERSION=`mysql -V 2>&1 | tr -d "\n" | cut -d" " -f6 | awk '{ print $1}' | cut -d"-" -f1 | awk '{ print $1}' | sed "s/[\,']//g"`
if [ "$_THIS_DB_VERSION" = "5.5.40" ] && [ ! -e "$includedir-$_THIS_DB_VERSION-fixed.log" ] ; then
cd $includedir
sudo patch -p1 < $thiscwd/ci/my_config.h.patch &> /dev/null
sudo touch $includedir-$_THIS_DB_VERSION-fixed.log
fi

22
ci/my_config.h.patch Normal file
View File

@@ -0,0 +1,22 @@
diff -burp a/my_config.h b/my_config.h
--- a/my_config.h 2014-10-09 19:32:46.000000000 -0400
+++ b/my_config.h 2014-10-09 19:35:12.000000000 -0400
@@ -641,17 +641,4 @@
#define SIZEOF_TIME_T 8
/* #undef TIME_T_UNSIGNED */
-/*
- stat structure (from <sys/stat.h>) is conditionally defined
- to have different layout and size depending on the defined macros.
- The correct macro is defined in my_config.h, which means it MUST be
- included first (or at least before <features.h> - so, practically,
- before including any system headers).
-
- __GLIBC__ is defined in <features.h>
-*/
-#ifdef __GLIBC__
-#error <my_config.h> MUST be included first!
-#endif
-
#endif

View File

@@ -0,0 +1 @@
from erpnext.__version__ import __version__

1
erpnext/__version__.py Normal file
View File

@@ -0,0 +1 @@
__version__ = '4.20.0'

View File

@@ -1,21 +0,0 @@
[
{
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-04-11 13:16:56",
"modified_by": "Administrator",
"modified": "2012-04-13 12:24:20"
},
{
"doc_type": "Journal Voucher",
"name": "__common__",
"module": "Accounts",
"doctype": "Print Format",
"html": "<!-- p.big {line-height: 200%} .noborder td { border: 0px solid #fff; } -->\n<div style=\"position: relative;\">\n<h3><script>doc.company</script><br /> <br /> \n<hr />\nPAYMENT ADVICE</h3>\n<table class=\"noborder\" style=\"width: 100%;\">\n<tbody>\n<tr>\n<td style=\"vertical-align: top;\" width=\"50%\">To :<br />\n<script type=\"text/javascript\">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</td>\n<td width=\"50%\">\n<table class=\"noborder\" width=\"100%\">\n<tbody>\n<tr>\n<td width=\"30%\">Voucher No :</td>\n<td width=\"70%\">\n<script type=\"text/javascript\">// <![CDATA[\ndoc.name\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width=\"30%\">Voucher Date :</td>\n<td width=\"70%\">\n<script type=\"text/javascript\">// <![CDATA[\ndate.str_to_user(doc.voucher_date)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width=\"30%\">Cheque No :</td>\n<td width=\"70%\">\n<script type=\"text/javascript\">// <![CDATA[\ndate.str_to_user(doc.cheque_no)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width=\"30%\">Cheque Date :</td>\n<td width=\"70%\">\n<script type=\"text/javascript\">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</td>\n</tr>\n</tbody>\n</table>\n</td>\n</tr>\n</tbody>\n</table>\n<br /> <strong>We are pleased to enclose our cheque in full/part Settlement of your under noted bills</strong> <br /> \n<hr />\n<table class=\"noborder\" width=\"100%\">\n<tbody>\n<tr>\n<td width=\"70%\">&nbsp;</td>\n<td width=\"15%\">Total :</td>\n<td class=\"pos_left\" width=\"15%\">\n<script type=\"text/javascript\">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td colspan=\"3\">Narration :\n<script type=\"text/javascript\">// <![CDATA[\nreplace_newlines(doc.remark)\n// ]]></script>\n<br /><br /><br /></td>\n</tr>\n</tbody>\n</table>\n<div style=\"position: absolute; top: 14cm; left: 0cm;\">Prepared By</div>\n<div style=\"position: absolute; top: 14cm; left: 5.5cm;\">Authorised Signatory</div>\n<div style=\"position: absolute; top: 14cm; left: 11cm;\">Received Payment as Above</div>\n<div style=\"position: absolute; top: 16.4cm; left: 5.9cm;\"><strong>_____________</strong></div>\n<div style=\"position: absolute; top: 16.7cm; left: 6cm;\"><strong>A/c Payee</strong></div>\n<div style=\"position: absolute; top: 16.7cm; left: 5.9cm;\"><strong>_____________</strong></div>\n<div style=\"position: absolute; top: 16.9cm; left: 12cm;\">\n<script type=\"text/javascript\">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</div>\n<div style=\"position: absolute; top: 17.9cm; left: 1cm;\">\n<script type=\"text/javascript\">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</div>\n<div style=\"position: absolute; top: 18.6cm; left: 1cm; width: 7cm;\">\n<script type=\"text/javascript\">// <![CDATA[\ndoc.total_amount_in_words\n// ]]></script>\n</div>\n<div style=\"position: absolute; top: 19.7cm; left: 12cm;\">\n<script type=\"text/javascript\">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</div>\n</div>",
"standard": "Yes"
},
{
"name": "Cheque Printing Format",
"doctype": "Print Format"
}
]

File diff suppressed because one or more lines are too long

View File

@@ -1,21 +0,0 @@
[
{
"creation": "2012-05-01 12:46:31",
"docstatus": 0,
"modified": "2013-01-21 18:40:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doc_type": "Journal Voucher",
"doctype": "Print Format",
"html": "<h3 align=\"center\"><script>doc.select_print_heading || \"Payment Receipt Note\"</script></h3>\n\n<table class='simpletable'>\n<tr>\n<td><b> Receipt No.: </b></td>\n<td><script>doc.name</script></td>\n</tr>\n<tr>\n<td><b> Date : </b></td>\n<td><script>date.str_to_user(doc.voucher_date)</script></td>\n</tr> \n<tr>\n<td><b> Remark: </b></td>\n<td><script> doc.remark </script></td>\n</tr>\n<tr>\n<td><b> Received From: </b></td>\n<td><b><script> doc.pay_to_recd_from </script></b></td>\n</tr>\n</table>\n<br>\n\n<div><b><script>doc.total_amount</script></b> </td></div><br>\n<div style=\"text-align:left\"><b><script>doc.total_amount_in_words</script></b></div><br>\n<br>\n<table class=\"noborder\">\n<tr>\n<td style = \"text-align = right;\"><h3>For <script>doc.company</script>,</h3><br><div>(Authorised Signatory)</div></td>\n</tr>\n</table>",
"module": "Accounts",
"name": "__common__",
"standard": "Yes"
},
{
"doctype": "Print Format",
"name": "Payment Receipt Voucher"
}
]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,135 +0,0 @@
{%- if doc.letter_head -%}
{{ frappe.conn.get_value("Letter Head", doc.letter_head, "content") }}
{%- endif -%}
<!-- Page Layout Settings -->
<div class='common page-header'>
<table class='header-table' cellspacing=0 style="width: 100%">
<thead>
<tr><td colspan="2"><h1>{{ doc.select_print_heading or 'Invoice' }}</h1></td></tr>
<tr><td colspan="2"><h3>{{ doc.name }}</h3></td></tr>
</thead>
<tbody>
<tr>
<td width=60%><table width=100% cellspacing=0><tbody>
<tr>
<td width=39%><b>Name</b></td>
<td>{{ doc.customer_name }}</td>
</tr>
<tr>
<td><b>Address</b></td>
<td>{{ doc.address_display.replace("\n", "<br>") }}</td>
</tr>
<tr>
<td><b>Contact</b></td>
<td>{{ doc.contact_display }}</td>
</tr>
</tbody></table></td>
<td><table width=100% cellspacing=0><tbody>
<tr>
<td width=40%><b>Invoice Date</b></td>
<td>{{ utils.formatdate(doc.posting_date) }}</td>
</tr>
{%- if doc.convert_into_recurring_invoice and doc.recurring_id -%}
<tr>
<td width=40%><b>Invoice Period</b></td>
<td>{{ (utils.formatdate(doc.invoice_period_from_date)) +
' to ' + utils.formatdate(doc.invoice_period_to_date) }}</td>
</tr>
{%- endif -%}
<tr>
<td><b>Due Date</b></td>
<td>{{ utils.formatdate(doc.due_date) }}</td>
</tr>
</tbody></table></td>
</tr>
</tbody>
<tfoot>
</tfoot>
</table>
</div>
<div class='common page-body'>
<!--
Page Body will contain
+ table 2
- Sales Invoice Data
-->
<table class="table table-bordered">
<tbody>
<tr>
<th>Sr</th>
<th>Item Name</th>
<th>Description</th>
<th>Qty</th>
<th>UoM</th>
<th>Basic Rate</th>
<th>Amount</th>
</tr>
{%- for row in doclist.get({"doctype":"Sales Invoice Item"}) %}
<tr>
<td style="width: 3%;">{{ row.idx }}</td>
<td style="width: 20%;">{{ row.item_name }}</td>
<td style="width: 37%;">{{ row.description }}</td>
<td style="width: 5%; text-align: right;">{{ row.qty }}</td>
<td style="width: 5%;">{{ row.stock_uom }}</td>
<td style="width: 15%; text-align: right;">{{ utils.fmt_money(row.rate, currency=doc.currency) }}</td>
<td style="width: 15%; text-align: right;">{{ utils.fmt_money(row.amount, currency=doc.currency) }}</td>
</tr>
{% endfor -%}
</tbody>
</table>
</div>
<div class='common page-footer'>
<!--
Page Footer will contain
+ table 3
- Terms and Conditions
- Total Rounded Amount Calculation
- Total Rounded Amount in Words
-->
<table class='footer-table' width=100% cellspacing=0>
<thead>
</thead>
<tbody>
<tr>
<td width=60% style='padding-right: 10px;'>
<b>Terms, Conditions &amp; Other Information:</b><br />
{{ doc.terms }}
</td>
<td>
<table cellspacing=0 width=100%>
<tbody>
<tr>
<td>Net Total</td>
<td width=40% style="text-align: right;">{{
utils.fmt_money(doc.net_total_export, currency=doc.currency)
}}</td>
</tr>
{%- for charge in doclist.get({"doctype":"Sales Taxes and Charges"}) -%}
{%- if not charge.included_in_print_rate -%}
<tr>
<td>{{ charge.description }}</td>
<td style="text-align: right;">{{ utils.fmt_money(charge.tax_amount / doc.conversion_rate, currency=doc.currency) }}</td>
</tr>
{%- endif -%}
{%- endfor -%}
<tr>
<td>Grand Total</td>
<td style="text-align: right;">{{ utils.fmt_money(doc.grand_total_export, currency=doc.currency) }}</td>
</tr>
<tr style='font-weight: bold'>
<td>Rounded Total</td>
<td style="text-align: right;">{{ utils.fmt_money(doc.rounded_total_export, currency=doc.currency) }}</td>
</tr>
</tbody>
</table>
<br /><b>In Words</b><br />
<i>{{ doc.in_words_export }}</i>
</td>
</tr>
</tbody>
<tfoot>
</tfoot>
</table>
</div>

View File

@@ -1,20 +0,0 @@
[
{
"creation": "2013-03-21 15:24:28",
"docstatus": 0,
"modified": "2013-03-21 15:26:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doc_type": "Sales Invoice",
"doctype": "Print Format",
"module": "Accounts",
"name": "__common__",
"standard": "Yes"
},
{
"doctype": "Print Format",
"name": "SalesInvoice"
}
]

View File

@@ -1,50 +1,37 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
cur_frm.list_route = "Accounts Browser/Account";
// Onload
// -----------------------------------------
cur_frm.cscript.onload = function(doc, cdt, cdn) {
}
// Refresh
// -----------------------------------------
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
if(doc.__islocal) {
msgprint(frappe._("Please create new account from Chart of Accounts."));
msgprint(__("Please create new account from Chart of Accounts."));
throw "cannot create";
}
cur_frm.toggle_display('account_name', doc.__islocal);
// hide fields if group
cur_frm.toggle_display(['account_type', 'master_type', 'master_name',
'credit_days', 'credit_limit', 'tax_rate'], doc.group_or_ledger=='Ledger')
cur_frm.toggle_display(['account_type', 'master_type', 'master_name',
'credit_days', 'credit_limit', 'tax_rate'], doc.group_or_ledger=='Ledger')
// disable fields
cur_frm.toggle_enable(['account_name', 'debit_or_credit', 'group_or_ledger',
'is_pl_account', 'company'], false);
cur_frm.toggle_enable(['account_name', 'group_or_ledger', 'company'], false);
if(doc.group_or_ledger=='Ledger') {
frappe.model.with_doc("Accounts Settings", "Accounts Settings", function (name) {
var accounts_settings = frappe.model.get_doc("Accounts Settings", name);
var display = accounts_settings["frozen_accounts_modifier"]
&& in_list(user_roles, accounts_settings["frozen_accounts_modifier"]);
cur_frm.toggle_display('freeze_account', display);
});
cur_frm.toggle_display('freeze_account', doc.__onload && doc.__onload.can_freeze_account);
}
// read-only for root accounts
if(!doc.parent_account) {
cur_frm.set_read_only();
cur_frm.set_intro(frappe._("This is a root account and cannot be edited."));
cur_frm.set_intro(__("This is a root account and cannot be edited."));
} else {
// credit days and type if customer or supplier
cur_frm.set_intro(null);
cur_frm.toggle_display(['credit_days', 'credit_limit'], in_list(['Customer', 'Supplier'],
cur_frm.toggle_display(['credit_days', 'credit_limit'], in_list(['Customer', 'Supplier'],
doc.master_type));
cur_frm.cscript.master_type(doc, cdt, cdn);
cur_frm.cscript.account_type(doc, cdt, cdn);
@@ -54,44 +41,33 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
}
cur_frm.cscript.master_type = function(doc, cdt, cdn) {
cur_frm.toggle_display(['credit_days', 'credit_limit'], in_list(['Customer', 'Supplier'],
cur_frm.toggle_display(['credit_days', 'credit_limit'], in_list(['Customer', 'Supplier'],
doc.master_type));
cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' ||
cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' ||
in_list(['Customer', 'Supplier'], doc.master_type));
}
cur_frm.add_fetch('parent_account', 'report_type', 'report_type');
cur_frm.add_fetch('parent_account', 'root_type', 'root_type');
// Fetch parent details
// -----------------------------------------
cur_frm.add_fetch('parent_account', 'debit_or_credit', 'debit_or_credit');
cur_frm.add_fetch('parent_account', 'is_pl_account', 'is_pl_account');
// Hide tax rate based on account type
// -----------------------------------------
cur_frm.cscript.account_type = function(doc, cdt, cdn) {
if(doc.group_or_ledger=='Ledger') {
cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax');
cur_frm.toggle_display('master_type', cstr(doc.account_type)=='');
cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' ||
cur_frm.toggle_display('master_name', doc.account_type=='Warehouse' ||
in_list(['Customer', 'Supplier'], doc.master_type));
}
}
// Hide/unhide group or ledger
// -----------------------------------------
cur_frm.cscript.add_toolbar_buttons = function(doc) {
cur_frm.appframe.add_button(frappe._('Chart of Accounts'),
cur_frm.add_custom_button(__('Chart of Accounts'),
function() { frappe.set_route("Accounts Browser", "Account"); }, 'icon-sitemap')
if (cstr(doc.group_or_ledger) == 'Group') {
cur_frm.add_custom_button(frappe._('Convert to Ledger'),
function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet')
cur_frm.add_custom_button(__('Convert to Ledger'),
function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
} else if (cstr(doc.group_or_ledger) == 'Ledger') {
cur_frm.add_custom_button(frappe._('Convert to Group'),
function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet')
cur_frm.appframe.add_button(frappe._('View Ledger'), function() {
cur_frm.add_custom_button(__('View Ledger'), function() {
frappe.route_options = {
"account": doc.name,
"from_date": sys_defaults.year_start_date,
@@ -100,22 +76,22 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) {
};
frappe.set_route("query-report", "General Ledger");
}, "icon-table");
cur_frm.add_custom_button(__('Convert to Group'),
function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
}
}
// Convert group to ledger
// -----------------------------------------
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
return $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) {
if(r.message == 1) {
return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
if(r.message == 1) {
cur_frm.refresh();
}
});
}
// Convert ledger to group
// -----------------------------------------
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
return $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) {
return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
if(r.message == 1) {
cur_frm.refresh();
}
@@ -127,7 +103,7 @@ cur_frm.fields_dict['master_name'].get_query = function(doc) {
var dt = doc.master_type || "Warehouse";
return {
doctype: dt,
query: "accounts.doctype.account.account.get_master_name",
query: "erpnext.accounts.doctype.account.account.get_master_name",
filters: {
"master_type": dt,
"company": doc.company
@@ -139,8 +115,8 @@ cur_frm.fields_dict['master_name'].get_query = function(doc) {
cur_frm.fields_dict['parent_account'].get_query = function(doc) {
return {
filters: {
"group_or_ledger": "Group",
"group_or_ledger": "Group",
"company": doc.company
}
}
}
}

View File

@@ -0,0 +1,332 @@
{
"allow_copy": 1,
"allow_import": 1,
"allow_rename": 1,
"creation": "2013-01-30 12:49:46",
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"fields": [
{
"fieldname": "properties",
"fieldtype": "Section Break",
"in_list_view": 0,
"label": "Account Details",
"oldfieldtype": "Section Break",
"permlevel": 0
},
{
"fieldname": "column_break0",
"fieldtype": "Column Break",
"in_list_view": 0,
"permlevel": 0,
"width": "50%"
},
{
"fieldname": "account_name",
"fieldtype": "Data",
"in_filter": 1,
"in_list_view": 1,
"label": "Account Name",
"no_copy": 1,
"oldfieldname": "account_name",
"oldfieldtype": "Data",
"permlevel": 0,
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"default": "Ledger",
"fieldname": "group_or_ledger",
"fieldtype": "Select",
"in_filter": 1,
"in_list_view": 1,
"label": "Group or Ledger",
"oldfieldname": "group_or_ledger",
"oldfieldtype": "Select",
"options": "\nLedger\nGroup",
"permlevel": 0,
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
"label": "Company",
"oldfieldname": "company",
"oldfieldtype": "Link",
"options": "Company",
"permlevel": 0,
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"width": "50%"
},
{
"fieldname": "parent_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Parent Account",
"oldfieldname": "parent_account",
"oldfieldtype": "Link",
"options": "Account",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
{
"description": "Setting Account Type helps in selecting this Account in transactions.",
"fieldname": "account_type",
"fieldtype": "Select",
"in_filter": 1,
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
"options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock",
"permlevel": 0,
"search_index": 0
},
{
"description": "Rate at which this tax is applied",
"fieldname": "tax_rate",
"fieldtype": "Float",
"hidden": 0,
"label": "Rate",
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency",
"permlevel": 0,
"reqd": 0
},
{
"description": "If the account is frozen, entries are allowed to restricted users.",
"fieldname": "freeze_account",
"fieldtype": "Select",
"label": "Frozen",
"oldfieldname": "freeze_account",
"oldfieldtype": "Select",
"options": "No\nYes",
"permlevel": 0
},
{
"fieldname": "credit_days",
"fieldtype": "Int",
"hidden": 1,
"label": "Credit Days",
"oldfieldname": "credit_days",
"oldfieldtype": "Int",
"permlevel": 0,
"print_hide": 1
},
{
"fieldname": "credit_limit",
"fieldtype": "Currency",
"hidden": 1,
"label": "Credit Limit",
"oldfieldname": "credit_limit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1
},
{
"description": "If this Account represents a Customer, Supplier or Employee, set it here.",
"fieldname": "master_type",
"fieldtype": "Select",
"label": "Master Type",
"oldfieldname": "master_type",
"oldfieldtype": "Select",
"options": "\nSupplier\nCustomer\nEmployee",
"permlevel": 0
},
{
"fieldname": "master_name",
"fieldtype": "Link",
"label": "Master Name",
"oldfieldname": "master_name",
"oldfieldtype": "Link",
"options": "[Select]",
"permlevel": 0
},
{
"fieldname": "balance_must_be",
"fieldtype": "Select",
"label": "Balance must be",
"options": "\nDebit\nCredit",
"permlevel": 0
},
{
"fieldname": "root_type",
"fieldtype": "Select",
"label": "Root Type",
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
"permlevel": 0,
"read_only": 1
},
{
"fieldname": "report_type",
"fieldtype": "Select",
"label": "Report Type",
"options": "\nBalance Sheet\nProfit and Loss",
"permlevel": 0,
"read_only": 1
},
{
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
"label": "Lft",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "rgt",
"fieldtype": "Int",
"hidden": 1,
"label": "Rgt",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "old_parent",
"fieldtype": "Data",
"hidden": 1,
"label": "Old Parent",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
}
],
"icon": "icon-money",
"idx": 1,
"in_create": 1,
"modified": "2014-06-19 18:27:58.109303",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"submit": 0,
"write": 1
},
{
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Auditor",
"submit": 0,
"write": 0
},
{
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales User",
"submit": 0,
"write": 0
},
{
"amend": 0,
"apply_user_permissions": 1,
"create": 0,
"delete": 0,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Purchase User",
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 2,
"read": 1,
"report": 1,
"role": "Auditor",
"submit": 0,
"write": 0
},
{
"amend": 0,
"apply_user_permissions": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"set_user_permissions": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 2,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"permlevel": 2,
"read": 1,
"report": 1,
"role": "Accounts User",
"submit": 0,
"write": 0
}
],
"search_fields": "group_or_ledger"
}

View File

@@ -3,254 +3,232 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import flt, fmt_money, cstr, cint
from frappe.utils import flt, cstr, cint, getdate
from frappe import msgprint, throw, _
from frappe.model.document import Document
get_value = frappe.conn.get_value
class Account(Document):
nsm_parent_field = 'parent_account'
class DocType:
def __init__(self,d,dl):
self.doc, self.doclist = d,dl
self.nsm_parent_field = 'parent_account'
def onload(self):
frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",
"frozen_accounts_modifier")
if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.user.get_roles():
self.get("__onload").can_freeze_account = True
def autoname(self):
self.doc.name = self.doc.account_name.strip() + ' - ' + \
frappe.conn.get_value("Company", self.doc.company, "abbr")
self.name = self.account_name.strip() + ' - ' + \
frappe.db.get_value("Company", self.company, "abbr")
def get_address(self):
return {
'address': frappe.conn.get_value(self.doc.master_type,
self.doc.master_name, "address")
}
def validate(self):
return {'address': frappe.db.get_value(self.master_type, self.master_name, "address")}
def validate(self):
self.validate_master_name()
self.validate_parent()
self.validate_duplicate_account()
self.validate_root_details()
self.validate_mandatory()
self.validate_warehouse_account()
self.validate_frozen_accounts_modifier()
if not self.doc.parent_account:
self.doc.parent_account = ''
def validate_master_name(self):
"""Remind to add master name"""
if self.doc.master_type in ('Customer', 'Supplier') or self.doc.account_type == "Warehouse":
if not self.doc.master_name:
msgprint(_("Please enter Master Name once the account is created."))
elif not frappe.conn.exists(self.doc.master_type or self.doc.account_type,
self.doc.master_name):
throw(_("Invalid Master Name"))
def validate_parent(self):
"""Fetch Parent Details and validation for account not to be created under ledger"""
if self.doc.parent_account:
par = frappe.conn.sql("""select name, group_or_ledger, is_pl_account, debit_or_credit
from tabAccount where name =%s""", self.doc.parent_account)
if not par:
throw(_("Parent account does not exists"))
elif par[0][0] == self.doc.name:
throw(_("You can not assign itself as parent account"))
elif par[0][1] != 'Group':
throw(_("Parent account can not be a ledger"))
elif self.doc.debit_or_credit and par[0][3] != self.doc.debit_or_credit:
throw("{msg} {debit_or_credit} {under} {account} {acc}".format(**{
"msg": _("You cannot move a"),
"debit_or_credit": self.doc.debit_or_credit,
"under": _("account under"),
"account": par[0][3],
"acc": _("account")
}))
if not self.doc.is_pl_account:
self.doc.is_pl_account = par[0][2]
if not self.doc.debit_or_credit:
self.doc.debit_or_credit = par[0][3]
self.validate_balance_must_be_debit_or_credit()
def validate_master_name(self):
if self.master_type in ('Customer', 'Supplier') or self.account_type == "Warehouse":
if not self.master_name:
msgprint(_("Please enter Master Name once the account is created."))
elif not frappe.db.exists(self.master_type or self.account_type, self.master_name):
throw(_("Invalid Master Name"))
def validate_parent(self):
"""Fetch Parent Details and validate parent account"""
if self.parent_account:
par = frappe.db.get_value("Account", self.parent_account,
["name", "group_or_ledger", "report_type", "root_type", "company"], as_dict=1)
if not par:
throw(_("Account {0}: Parent account {1} does not exist").format(self.name, self.parent_account))
elif par.name == self.name:
throw(_("Account {0}: You can not assign itself as parent account").format(self.name))
elif par.group_or_ledger != 'Group':
throw(_("Account {0}: Parent account {1} can not be a ledger").format(self.name, self.parent_account))
elif par.company != self.company:
throw(_("Account {0}: Parent account {1} does not belong to company: {2}")
.format(self.name, self.parent_account, self.company))
if par.report_type:
self.report_type = par.report_type
if par.root_type:
self.root_type = par.root_type
def validate_max_root_accounts(self):
"""Raise exception if there are more than 4 root accounts"""
if frappe.conn.sql("""select count(*) from tabAccount where
company=%s and ifnull(parent_account,'')='' and docstatus != 2""",
self.doc.company)[0][0] > 4:
throw(_("One company cannot have more than 4 root Accounts"))
def validate_duplicate_account(self):
if self.doc.fields.get('__islocal') or not self.doc.name:
company_abbr = frappe.conn.get_value("Company", self.doc.company, "abbr")
if frappe.conn.sql("""select name from tabAccount where name=%s""",
(self.doc.account_name + " - " + company_abbr)):
throw("{name}: {acc_name} {exist}, {rename}".format(**{
"name": _("Account Name"),
"acc_name": self.doc.account_name,
"exist": _("already exists"),
"rename": _("please rename")
}))
def validate_root_details(self):
#does not exists parent
if frappe.conn.exists("Account", self.doc.name):
if not frappe.conn.get_value("Account", self.doc.name, "parent_account"):
if frappe.db.exists("Account", self.name):
if not frappe.db.get_value("Account", self.name, "parent_account"):
throw(_("Root cannot be edited."))
def validate_frozen_accounts_modifier(self):
old_value = frappe.conn.get_value("Account", self.doc.name, "freeze_account")
if old_value and old_value != self.doc.freeze_account:
frozen_accounts_modifier = frappe.conn.get_value( 'Accounts Settings', None,
'frozen_accounts_modifier')
old_value = frappe.db.get_value("Account", self.name, "freeze_account")
if old_value and old_value != self.freeze_account:
frozen_accounts_modifier = frappe.db.get_value('Accounts Settings', None, 'frozen_accounts_modifier')
if not frozen_accounts_modifier or \
frozen_accounts_modifier not in frappe.user.get_roles():
throw(_("You are not authorized to set Frozen value"))
def validate_balance_must_be_debit_or_credit(self):
from erpnext.accounts.utils import get_balance_on
if not self.get("__islocal") and self.balance_must_be:
account_balance = get_balance_on(self.name)
if account_balance > 0 and self.balance_must_be == "Credit":
frappe.throw(_("Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"))
elif account_balance < 0 and self.balance_must_be == "Debit":
frappe.throw(_("Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"))
def convert_group_to_ledger(self):
if self.check_if_child_exists():
throw("{acc}: {account_name} {child}. {msg}".format(**{
"acc": _("Account"),
"account_name": self.doc.name,
"child": _("has existing child"),
"msg": _("You can not convert this account to ledger")
}))
throw(_("Account with child nodes cannot be converted to ledger"))
elif self.check_gle_exists():
throw(_("Account with existing transaction can not be converted to ledger."))
throw(_("Account with existing transaction cannot be converted to ledger"))
else:
self.doc.group_or_ledger = 'Ledger'
self.doc.save()
self.group_or_ledger = 'Ledger'
self.save()
return 1
def convert_ledger_to_group(self):
if self.check_gle_exists():
throw(_("Account with existing transaction can not be converted to group."))
elif self.doc.master_type or self.doc.account_type:
elif self.master_type or self.account_type:
throw(_("Cannot covert to Group because Master Type or Account Type is selected."))
else:
self.doc.group_or_ledger = 'Group'
self.doc.save()
self.group_or_ledger = 'Group'
self.save()
return 1
# Check if any previous balance exists
def check_gle_exists(self):
return frappe.conn.get_value("GL Entry", {"account": self.doc.name})
return frappe.db.get_value("GL Entry", {"account": self.name})
def check_if_child_exists(self):
return frappe.conn.sql("""select name from `tabAccount` where parent_account = %s
and docstatus != 2""", self.doc.name)
return frappe.db.sql("""select name from `tabAccount` where parent_account = %s
and docstatus != 2""", self.name)
def validate_mandatory(self):
if not self.doc.debit_or_credit:
throw(_("Debit or Credit field is mandatory"))
if not self.doc.is_pl_account:
throw(_("Is PL Account field is mandatory"))
if not self.report_type:
throw(_("Report Type is mandatory"))
if not self.root_type:
throw(_("Root Type is mandatory"))
def validate_warehouse_account(self):
if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
return
if self.doc.account_type == "Warehouse":
old_warehouse = cstr(frappe.conn.get_value("Account", self.doc.name, "master_name"))
if old_warehouse != cstr(self.doc.master_name):
if self.account_type == "Warehouse":
old_warehouse = cstr(frappe.db.get_value("Account", self.name, "master_name"))
if old_warehouse != cstr(self.master_name):
if old_warehouse:
self.validate_warehouse(old_warehouse)
if self.doc.master_name:
self.validate_warehouse(self.doc.master_name)
if self.master_name:
self.validate_warehouse(self.master_name)
else:
throw(_("Master Name is mandatory if account type is Warehouse"))
def validate_warehouse(self, warehouse):
if frappe.conn.get_value("Stock Ledger Entry", {"warehouse": warehouse}):
throw(_("Stock transactions exist against warehouse ") + warehouse +
_(" .You can not assign / modify / remove Master Name"))
if frappe.db.get_value("Stock Ledger Entry", {"warehouse": warehouse}):
throw(_("Stock entries exist against warehouse {0} cannot re-assign or modify 'Master Name'").format(warehouse))
def update_nsm_model(self):
"""update lft, rgt indices for nested set model"""
import frappe
import frappe.utils.nestedset
frappe.utils.nestedset.update_nsm(self)
def on_update(self):
self.validate_max_root_accounts()
self.update_nsm_model()
self.update_nsm_model()
def get_authorized_user(self):
# Check logged-in user is authorized
if frappe.conn.get_value('Accounts Settings', None, 'credit_controller') \
if frappe.db.get_value('Accounts Settings', None, 'credit_controller') \
in frappe.user.get_roles():
return 1
def check_credit_limit(self, total_outstanding):
# Get credit limit
credit_limit_from = 'Customer'
cr_limit = frappe.conn.sql("""select t1.credit_limit from tabCustomer t1, `tabAccount` t2
where t2.name=%s and t1.name = t2.master_name""", self.doc.name)
cr_limit = frappe.db.sql("""select t1.credit_limit from tabCustomer t1, `tabAccount` t2
where t2.name=%s and t1.name = t2.master_name""", self.name)
credit_limit = cr_limit and flt(cr_limit[0][0]) or 0
if not credit_limit:
credit_limit = frappe.conn.get_value('Company', self.doc.company, 'credit_limit')
credit_limit = frappe.db.get_value('Company', self.company, 'credit_limit')
credit_limit_from = 'Company'
# If outstanding greater than credit limit and not authorized person raise exception
if credit_limit > 0 and flt(total_outstanding) > credit_limit \
and not self.get_authorized_user():
throw("""Total Outstanding amount (%s) for <b>%s</b> can not be \
greater than credit limit (%s). To change your credit limit settings, \
please update in the <b>%s</b> master""" % (fmt_money(total_outstanding),
self.doc.name, fmt_money(credit_limit), credit_limit_from))
throw(_("{0} Credit limit {1} crossed").format(_(credit_limit_from), credit_limit))
def validate_due_date(self, posting_date, due_date):
credit_days = (self.credit_days or frappe.db.get_value("Company", self.company, "credit_days"))
posting_date, due_date = getdate(posting_date), getdate(due_date)
diff = (due_date - posting_date).days
if diff < 0:
frappe.throw(_("Due Date cannot be before Posting Date"))
elif credit_days is not None and diff > credit_days:
msgprint(_("Note: Due Date exceeds the allowed credit days by {0} day(s)").format(diff - credit_days))
def validate_trash(self):
"""checks gl entries and if child exists"""
if not self.doc.parent_account:
if not self.parent_account:
throw(_("Root account can not be deleted"))
if self.check_gle_exists():
throw("""Account with existing transaction (Sales Invoice / Purchase Invoice / \
Journal Voucher) can not be deleted""")
throw(_("Account with existing transaction can not be deleted"))
if self.check_if_child_exists():
throw(_("Child account exists for this account. You can not delete this account."))
def on_trash(self):
def on_trash(self):
self.validate_trash()
self.update_nsm_model()
def before_rename(self, old, new, merge=False):
# Add company abbr if not provided
from erpnext.setup.doctype.company.company import get_name_with_abbr
new_account = get_name_with_abbr(new, self.doc.company)
new_account = get_name_with_abbr(new, self.company)
# Validate properties before merging
if merge:
if not frappe.conn.exists("Account", new):
throw(_("Account ") + new +_(" does not exists"))
val = list(frappe.conn.get_value("Account", new_account,
["group_or_ledger", "debit_or_credit", "is_pl_account", "company"]))
if val != [self.doc.group_or_ledger, self.doc.debit_or_credit, self.doc.is_pl_account, self.doc.company]:
throw(_("""Merging is only possible if following \
properties are same in both records.
Group or Ledger, Debit or Credit, Is PL Account"""))
if not frappe.db.exists("Account", new):
throw(_("Account {0} does not exist").format(new))
val = list(frappe.db.get_value("Account", new_account,
["group_or_ledger", "root_type", "company"]))
if val != [self.group_or_ledger, self.root_type, self.company]:
throw(_("""Merging is only possible if following properties are same in both records. Group or Ledger, Root Type, Company"""))
return new_account
def after_rename(self, old, new, merge=False):
if not merge:
frappe.conn.set_value("Account", new, "account_name",
frappe.db.set_value("Account", new, "account_name",
" - ".join(new.split(" - ")[:-1]))
else:
from frappe.utils.nestedset import rebuild_tree
rebuild_tree("Account", "parent_account")
def get_master_name(doctype, txt, searchfield, start, page_len, filters):
conditions = (" and company='%s'"% filters["company"]) if doctype == "Warehouse" else ""
return frappe.conn.sql("""select name from `tab%s` where %s like %s %s
conditions = (" and company='%s'"% filters["company"].replace("'", "\'")) if doctype == "Warehouse" else ""
return frappe.db.sql("""select name from `tab%s` where %s like %s %s
order by name limit %s, %s""" %
(filters["master_type"], searchfield, "%s", conditions, "%s", "%s"),
(filters["master_type"], searchfield, "%s", conditions, "%s", "%s"),
("%%%s%%" % txt, start, page_len), as_list=1)
def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
return frappe.conn.sql("""select name from tabAccount
return frappe.db.sql("""select name from tabAccount
where group_or_ledger = 'Group' and docstatus != 2 and company = %s
and %s like %s order by name limit %s, %s""" %
("%s", searchfield, "%s", "%s", "%s"),
(filters["company"], "%%%s%%" % txt, start, page_len), as_list=1)
and %s like %s order by name limit %s, %s""" %
("%s", searchfield, "%s", "%s", "%s"),
(filters["company"], "%%%s%%" % txt, start, page_len), as_list=1)

View File

@@ -1,334 +0,0 @@
[
{
"creation": "2013-01-30 12:49:46",
"docstatus": 0,
"modified": "2014-01-20 17:48:20",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_copy": 1,
"allow_rename": 1,
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"doctype": "DocType",
"document_type": "Master",
"icon": "icon-money",
"in_create": 1,
"module": "Accounts",
"name": "__common__",
"search_fields": "debit_or_credit, group_or_ledger"
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "Account",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"amend": 0,
"cancel": 0,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Account",
"parentfield": "permissions",
"parenttype": "DocType",
"read": 1,
"report": 1,
"submit": 0
},
{
"doctype": "DocType",
"name": "Account"
},
{
"doctype": "DocField",
"fieldname": "properties",
"fieldtype": "Section Break",
"label": "Account Details",
"oldfieldtype": "Section Break"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "account_name",
"fieldtype": "Data",
"in_filter": 1,
"label": "Account Name",
"no_copy": 1,
"oldfieldname": "account_name",
"oldfieldtype": "Data",
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "level",
"fieldtype": "Int",
"hidden": 1,
"label": "Level",
"oldfieldname": "level",
"oldfieldtype": "Int",
"print_hide": 1,
"read_only": 1
},
{
"default": "Ledger",
"doctype": "DocField",
"fieldname": "group_or_ledger",
"fieldtype": "Select",
"in_filter": 1,
"label": "Group or Ledger",
"oldfieldname": "group_or_ledger",
"oldfieldtype": "Select",
"options": "\nLedger\nGroup",
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "debit_or_credit",
"fieldtype": "Data",
"in_filter": 1,
"label": "Debit or Credit",
"oldfieldname": "debit_or_credit",
"oldfieldtype": "Data",
"read_only": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "is_pl_account",
"fieldtype": "Select",
"in_filter": 1,
"label": "Is PL Account",
"oldfieldname": "is_pl_account",
"oldfieldtype": "Select",
"options": "Yes\nNo",
"read_only": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "company",
"fieldtype": "Link",
"in_filter": 1,
"label": "Company",
"oldfieldname": "company",
"oldfieldtype": "Link",
"options": "Company",
"read_only": 1,
"reqd": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "parent_account",
"fieldtype": "Link",
"ignore_restrictions": 1,
"label": "Parent Account",
"oldfieldname": "parent_account",
"oldfieldtype": "Link",
"options": "Account",
"search_index": 1
},
{
"description": "Setting Account Type helps in selecting this Account in transactions.",
"doctype": "DocField",
"fieldname": "account_type",
"fieldtype": "Select",
"in_filter": 1,
"label": "Account Type",
"oldfieldname": "account_type",
"oldfieldtype": "Select",
"options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable\nWarehouse",
"search_index": 0
},
{
"description": "Rate at which this tax is applied",
"doctype": "DocField",
"fieldname": "tax_rate",
"fieldtype": "Float",
"hidden": 0,
"label": "Rate",
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency",
"reqd": 0
},
{
"description": "If the account is frozen, entries are allowed to restricted users.",
"doctype": "DocField",
"fieldname": "freeze_account",
"fieldtype": "Select",
"label": "Frozen",
"oldfieldname": "freeze_account",
"oldfieldtype": "Select",
"options": "No\nYes"
},
{
"doctype": "DocField",
"fieldname": "credit_days",
"fieldtype": "Int",
"hidden": 1,
"label": "Credit Days",
"oldfieldname": "credit_days",
"oldfieldtype": "Int",
"print_hide": 1
},
{
"doctype": "DocField",
"fieldname": "credit_limit",
"fieldtype": "Currency",
"hidden": 1,
"label": "Credit Limit",
"oldfieldname": "credit_limit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"print_hide": 1
},
{
"description": "If this Account represents a Customer, Supplier or Employee, set it here.",
"doctype": "DocField",
"fieldname": "master_type",
"fieldtype": "Select",
"label": "Master Type",
"oldfieldname": "master_type",
"oldfieldtype": "Select",
"options": "\nSupplier\nCustomer\nEmployee"
},
{
"doctype": "DocField",
"fieldname": "master_name",
"fieldtype": "Link",
"label": "Master Name",
"oldfieldname": "master_name",
"oldfieldtype": "Link",
"options": "[Select]"
},
{
"default": "1",
"depends_on": "eval:doc.group_or_ledger==\"Ledger\"",
"doctype": "DocField",
"fieldname": "allow_negative_balance",
"fieldtype": "Check",
"label": "Allow Negative Balance"
},
{
"doctype": "DocField",
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
"label": "Lft",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "rgt",
"fieldtype": "Int",
"hidden": 1,
"label": "Rgt",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Data",
"hidden": 1,
"label": "Old Parent",
"print_hide": 1,
"read_only": 1
},
{
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Accounts User",
"write": 1
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Auditor",
"write": 0
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Sales User",
"write": 0
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Purchase User",
"write": 0
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 2,
"role": "Auditor",
"write": 0
},
{
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"export": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"restrict": 1,
"role": "Accounts Manager",
"write": 1
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 2,
"role": "Accounts Manager",
"write": 1
},
{
"create": 0,
"delete": 0,
"doctype": "DocPerm",
"permlevel": 2,
"role": "Accounts User",
"write": 0
}
]

View File

@@ -9,38 +9,40 @@ def _make_test_records(verbose):
accounts = [
# [account_name, parent_account, group_or_ledger]
["_Test Account Bank Account", "Bank Accounts", "Ledger"],
["_Test Account Bank Account", "Bank Accounts", "Ledger", "Bank"],
["_Test Account Stock Expenses", "Direct Expenses", "Group"],
["_Test Account Shipping Charges", "_Test Account Stock Expenses", "Ledger"],
["_Test Account Customs Duty", "_Test Account Stock Expenses", "Ledger"],
["_Test Account Stock Expenses", "Direct Expenses", "Group", None],
["_Test Account Shipping Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"],
["_Test Account Customs Duty", "_Test Account Stock Expenses", "Ledger", "Tax"],
["_Test Account Insurance Charges", "_Test Account Stock Expenses", "Ledger", "Chargeable"],
["_Test Account Tax Assets", "Current Assets", "Group"],
["_Test Account VAT", "_Test Account Tax Assets", "Ledger"],
["_Test Account Service Tax", "_Test Account Tax Assets", "Ledger"],
["_Test Account Tax Assets", "Current Assets", "Group", None],
["_Test Account VAT", "_Test Account Tax Assets", "Ledger", "Tax"],
["_Test Account Service Tax", "_Test Account Tax Assets", "Ledger", "Tax"],
["_Test Account Reserves and Surplus", "Current Liabilities", "Ledger"],
["_Test Account Reserves and Surplus", "Current Liabilities", "Ledger", None],
["_Test Account Cost for Goods Sold", "Expenses", "Ledger"],
["_Test Account Excise Duty", "_Test Account Tax Assets", "Ledger"],
["_Test Account Education Cess", "_Test Account Tax Assets", "Ledger"],
["_Test Account S&H Education Cess", "_Test Account Tax Assets", "Ledger"],
["_Test Account CST", "Direct Expenses", "Ledger"],
["_Test Account Discount", "Direct Expenses", "Ledger"],
["_Test Account Cost for Goods Sold", "Expenses", "Ledger", None],
["_Test Account Excise Duty", "_Test Account Tax Assets", "Ledger", "Tax"],
["_Test Account Education Cess", "_Test Account Tax Assets", "Ledger", "Tax"],
["_Test Account S&H Education Cess", "_Test Account Tax Assets", "Ledger", "Tax"],
["_Test Account CST", "Direct Expenses", "Ledger", "Tax"],
["_Test Account Discount", "Direct Expenses", "Ledger", None],
# related to Account Inventory Integration
["_Test Account Stock In Hand", "Current Assets", "Ledger"],
["_Test Account Fixed Assets", "Current Assets", "Ledger"],
["_Test Account Stock In Hand", "Current Assets", "Ledger", None],
["_Test Account Fixed Assets", "Current Assets", "Ledger", None],
]
for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"]]:
test_objects = make_test_objects("Account", [[{
test_objects = make_test_objects("Account", [{
"doctype": "Account",
"account_name": account_name,
"parent_account": parent_account + " - " + abbr,
"company": company,
"group_or_ledger": group_or_ledger
}] for account_name, parent_account, group_or_ledger in accounts])
"group_or_ledger": group_or_ledger,
"account_type": account_type
} for account_name, parent_account, group_or_ledger, account_type in accounts])
return test_objects

View File

@@ -0,0 +1,66 @@
{
"creation": "2013-06-24 15:49:57.000000",
"description": "Settings for Accounts",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"default": "1",
"description": "If enabled, the system will post accounting entries for inventory automatically.",
"fieldname": "auto_accounting_for_stock",
"fieldtype": "Check",
"label": "Make Accounting Entry For Every Stock Movement",
"permlevel": 0
},
{
"description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
"fieldname": "acc_frozen_upto",
"fieldtype": "Date",
"label": "Accounts Frozen Upto",
"permlevel": 0
},
{
"description": "Users with this role are allowed to create / modify accounting entry before frozen date",
"fieldname": "bde_auth_role",
"fieldtype": "Link",
"label": "Allowed Role to Edit Entries Before Frozen Date",
"options": "Role",
"permlevel": 0
},
{
"description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
"fieldname": "frozen_accounts_modifier",
"fieldtype": "Link",
"label": "Frozen Accounts Modifier",
"options": "Role",
"permlevel": 0
},
{
"description": "Role that is allowed to submit transactions that exceed credit limits set.",
"fieldname": "credit_controller",
"fieldtype": "Link",
"label": "Credit Controller",
"options": "Role",
"permlevel": 0
}
],
"icon": "icon-cog",
"idx": 1,
"issingle": 1,
"modified": "2013-12-20 19:22:52.000000",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"role": "Accounts Manager",
"write": 1
}
]
}

View File

@@ -6,26 +6,23 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cint
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
from frappe.utils import cint, comma_and
from frappe.model.document import Document
class AccountsSettings(Document):
def on_update(self):
frappe.conn.set_default("auto_accounting_for_stock", self.doc.auto_accounting_for_stock)
if cint(self.doc.auto_accounting_for_stock):
frappe.db.set_default("auto_accounting_for_stock", self.auto_accounting_for_stock)
if cint(self.auto_accounting_for_stock):
# set default perpetual account in company
for company in frappe.conn.sql("select name from tabCompany"):
frappe.bean("Company", company[0]).save()
for company in frappe.db.sql("select name from tabCompany"):
frappe.get_doc("Company", company[0]).save()
# Create account head for warehouses
warehouse_list = frappe.conn.sql("select name, company from tabWarehouse", as_dict=1)
warehouse_list = frappe.db.sql("select name, company from tabWarehouse", as_dict=1)
warehouse_with_no_company = [d.name for d in warehouse_list if not d.company]
if warehouse_with_no_company:
frappe.throw(_("Company is missing in following warehouses") + ": \n" +
"\n".join(warehouse_with_no_company))
frappe.throw(_("Company is missing in warehouses {0}").format(comma_and(warehouse_with_no_company)))
for wh in warehouse_list:
wh_bean = frappe.bean("Warehouse", wh.name)
wh_bean.save()
wh_doc = frappe.get_doc("Warehouse", wh.name)
wh_doc.save()

View File

@@ -1,85 +0,0 @@
[
{
"creation": "2013-06-24 15:49:57",
"docstatus": 0,
"modified": "2013-12-20 19:22:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"description": "Settings for Accounts",
"doctype": "DocType",
"icon": "icon-cog",
"issingle": 1,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "Accounts Settings",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"create": 1,
"doctype": "DocPerm",
"email": 1,
"name": "__common__",
"parent": "Accounts Settings",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 1,
"read": 1,
"role": "Accounts Manager",
"write": 1
},
{
"doctype": "DocType",
"name": "Accounts Settings"
},
{
"default": "1",
"description": "If enabled, the system will post accounting entries for inventory automatically.",
"doctype": "DocField",
"fieldname": "auto_accounting_for_stock",
"fieldtype": "Check",
"label": "Make Accounting Entry For Every Stock Movement"
},
{
"description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
"doctype": "DocField",
"fieldname": "acc_frozen_upto",
"fieldtype": "Date",
"label": "Accounts Frozen Upto"
},
{
"description": "Users with this role are allowed to create / modify accounting entry before frozen date",
"doctype": "DocField",
"fieldname": "bde_auth_role",
"fieldtype": "Link",
"label": "Allowed Role to Edit Entries Before Frozen Date",
"options": "Role"
},
{
"description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
"doctype": "DocField",
"fieldname": "frozen_accounts_modifier",
"fieldtype": "Link",
"label": "Frozen Accounts Modifier",
"options": "Role"
},
{
"description": "Role that is allowed to submit transactions that exceed credit limits set.",
"doctype": "DocField",
"fieldname": "credit_controller",
"fieldtype": "Link",
"label": "Credit Controller",
"options": "Role"
},
{
"doctype": "DocPerm"
}
]

View File

@@ -1,8 +1,18 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
cur_frm.add_fetch("bank_account", "company", "company");
cur_frm.cscript.onload = function(doc, cdt, cdn){
cur_frm.set_intro('<i class="icon-question" /> ' +
frappe._("Update clearance date of Journal Entries marked as 'Bank Vouchers'"))
}
cur_frm.set_intro('<i class="icon-question" /> ' +
__("Update clearance date of Journal Entries marked as 'Bank Vouchers'"));
cur_frm.add_fetch("bank_account", "company", "company");
cur_frm.set_query("bank_account", function() {
return {
"filters": {
"account_type": "Bank",
"group_or_ledger": "Ledger"
}
};
});
}

View File

@@ -0,0 +1,108 @@
{
"allow_copy": 1,
"allow_email": 1,
"allow_print": 1,
"creation": "2013-01-10 16:34:05",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"description": "Select account head of the bank where cheque was deposited.",
"fieldname": "bank_account",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Bank Account",
"options": "Account",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "company",
"fieldtype": "Link",
"hidden": 1,
"in_list_view": 1,
"label": "Company",
"options": "Company",
"permlevel": 0,
"print_hide": 1,
"reqd": 0
},
{
"fieldname": "from_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "From Date",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "to_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "To Date",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "include_reconciled_entries",
"fieldtype": "Check",
"in_list_view": 1,
"label": "Include Reconciled Entries",
"permlevel": 0
},
{
"fieldname": "get_relevant_entries",
"fieldtype": "Button",
"label": "Get Relevant Entries",
"options": "get_details",
"permlevel": 0
},
{
"fieldname": "entries",
"fieldtype": "Table",
"label": "Entries",
"options": "Bank Reconciliation Detail",
"permlevel": 0
},
{
"fieldname": "update_clearance_date",
"fieldtype": "Button",
"label": "Update Clearance Date",
"options": "update_details",
"permlevel": 0
},
{
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 1
}
],
"hide_heading": 1,
"hide_toolbar": 1,
"icon": "icon-check",
"idx": 1,
"issingle": 1,
"modified": "2014-05-27 03:37:21.783216",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bank Reconciliation",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"permlevel": 0,
"read": 1,
"report": 0,
"role": "Accounts User",
"submit": 0,
"write": 1
}
],
"read_only": 1
}

View File

@@ -3,55 +3,59 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import flt, getdate, nowdate
from frappe import msgprint, _
from frappe.model.document import Document
from frappe.utils import cstr, flt, getdate, now, nowdate
from frappe.model import db_exists
from frappe.model.doc import addchild
from frappe.model.bean import getlist, copy_doclist
from frappe import msgprint
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
class BankReconciliation(Document):
def get_details(self):
if not (self.doc.bank_account and self.doc.from_date and self.doc.to_date):
if not (self.bank_account and self.from_date and self.to_date):
msgprint("Bank Account, From Date and To Date are Mandatory")
return
dl = frappe.conn.sql("select t1.name, t1.cheque_no, t1.cheque_date, t2.debit, t2.credit, t1.posting_date, t2.against_account from `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2 where t2.parent = t1.name and t2.account = %s and (clearance_date is null or clearance_date = '0000-00-00' or clearance_date = '') and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1", (self.doc.bank_account, self.doc.from_date, self.doc.to_date))
self.doclist = self.doc.clear_table(self.doclist, 'entries')
self.doc.total_amount = 0.0
condition = ""
if not self.include_reconciled_entries:
condition = "and ifnull(clearance_date, '') in ('', '0000-00-00')"
dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit,
t2.credit, t1.posting_date, t2.against_account, t1.clearance_date
from
`tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
where
t2.parent = t1.name and t2.account = %s
and t1.posting_date >= %s and t1.posting_date <= %s and t1.docstatus=1
and ifnull(t1.is_opening, 'No') = 'No' %s""" %
('%s', '%s', '%s', condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
self.set('entries', [])
self.total_amount = 0.0
for d in dl:
nl = addchild(self.doc, 'entries', 'Bank Reconciliation Detail', self.doclist)
nl.posting_date = cstr(d[5])
nl.voucher_id = cstr(d[0])
nl.cheque_number = cstr(d[1])
nl.cheque_date = cstr(d[2])
nl.debit = flt(d[3])
nl.credit = flt(d[4])
nl.against_account = cstr(d[6])
self.doc.total_amount += flt(flt(d[4]) - flt(d[3]))
nl = self.append('entries', {})
nl.posting_date = d.posting_date
nl.voucher_id = d.name
nl.cheque_number = d.cheque_no
nl.cheque_date = d.cheque_date
nl.debit = d.debit
nl.credit = d.credit
nl.against_account = d.against_account
nl.clearance_date = d.clearance_date
self.total_amount += flt(d.debit) - flt(d.credit)
def update_details(self):
vouchers = []
for d in getlist(self.doclist, 'entries'):
for d in self.get('entries'):
if d.clearance_date:
if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
msgprint("Clearance Date can not be before Cheque Date (Row #%s)" %
d.idx, raise_exception=1)
frappe.conn.sql("""update `tabJournal Voucher`
set clearance_date = %s, modified = %s where name=%s""",
(d.clearance_date, nowdate(), d.voucher_id))
frappe.throw(_("Clearance date cannot be before check date in row {0}").format(d.idx))
frappe.db.set_value("Journal Voucher", d.voucher_id, "clearance_date", d.clearance_date)
frappe.db.sql("""update `tabJournal Voucher` set clearance_date = %s, modified = %s
where name=%s""", (d.clearance_date, nowdate(), d.voucher_id))
vouchers.append(d.voucher_id)
if vouchers:
msgprint("Clearance Date updated in %s" % ", ".join(vouchers))
msgprint("Clearance Date updated in: {0}".format(", ".join(vouchers)))
else:
msgprint("Clearance Date not mentioned")
msgprint(_("Clearance Date not mentioned"))

View File

@@ -1,115 +0,0 @@
[
{
"creation": "2013-01-10 16:34:05",
"docstatus": 0,
"modified": "2013-07-05 14:26:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_copy": 1,
"allow_email": 1,
"allow_print": 1,
"doctype": "DocType",
"hide_heading": 1,
"hide_toolbar": 1,
"icon": "icon-check",
"issingle": 1,
"module": "Accounts",
"name": "__common__",
"read_only": 1
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "Bank Reconciliation",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Bank Reconciliation",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 0,
"role": "Accounts User",
"submit": 0,
"write": 1
},
{
"doctype": "DocType",
"name": "Bank Reconciliation"
},
{
"description": "Select account head of the bank where cheque was deposited.",
"doctype": "DocField",
"fieldname": "bank_account",
"fieldtype": "Link",
"label": "Bank Account",
"options": "Account",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "company",
"fieldtype": "Link",
"hidden": 1,
"label": "Company",
"options": "Company",
"print_hide": 1,
"reqd": 0
},
{
"doctype": "DocField",
"fieldname": "from_date",
"fieldtype": "Date",
"label": "From Date",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "to_date",
"fieldtype": "Date",
"label": "To Date",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "get_non_reconciled_entries",
"fieldtype": "Button",
"label": "Get Non Reconciled Entries",
"options": "get_details"
},
{
"doctype": "DocField",
"fieldname": "entries",
"fieldtype": "Table",
"label": "Entries",
"options": "Bank Reconciliation Detail"
},
{
"doctype": "DocField",
"fieldname": "update_clearance_date",
"fieldtype": "Button",
"label": "Update Clearance Date",
"options": "update_details"
},
{
"doctype": "DocField",
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"doctype": "DocPerm"
}
]

View File

@@ -0,0 +1,109 @@
{
"creation": "2013-02-22 01:27:37.000000",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "voucher_id",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Voucher ID",
"no_copy": 0,
"oldfieldname": "voucher_id",
"oldfieldtype": "Link",
"options": "Journal Voucher",
"permlevel": 0,
"search_index": 0
},
{
"fieldname": "against_account",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Against Account",
"no_copy": 0,
"oldfieldname": "against_account",
"oldfieldtype": "Data",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
{
"fieldname": "posting_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Posting Date",
"no_copy": 0,
"oldfieldname": "posting_date",
"oldfieldtype": "Date",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
{
"fieldname": "clearance_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Clearance Date",
"no_copy": 0,
"oldfieldname": "clearance_date",
"oldfieldtype": "Date",
"permlevel": 0,
"search_index": 0
},
{
"fieldname": "cheque_number",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Cheque Number",
"no_copy": 0,
"oldfieldname": "cheque_number",
"oldfieldtype": "Data",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
{
"fieldname": "cheque_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Cheque Date",
"no_copy": 0,
"oldfieldname": "cheque_date",
"oldfieldtype": "Date",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
{
"fieldname": "debit",
"fieldtype": "Currency",
"label": "Debit",
"no_copy": 0,
"oldfieldname": "debit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 1,
"search_index": 0
},
{
"fieldname": "credit",
"fieldtype": "Currency",
"label": "Credit",
"no_copy": 0,
"oldfieldname": "credit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 1,
"search_index": 0
}
],
"idx": 1,
"istable": 1,
"modified": "2013-12-20 19:22:55.000000",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bank Reconciliation Detail",
"owner": "Administrator"
}

View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
class BankReconciliationDetail(Document):
pass

View File

@@ -1,108 +0,0 @@
[
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
"modified": "2013-12-20 19:22:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "DocType",
"istable": 1,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"name": "__common__",
"no_copy": 0,
"parent": "Bank Reconciliation Detail",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0,
"search_index": 0
},
{
"doctype": "DocType",
"name": "Bank Reconciliation Detail"
},
{
"doctype": "DocField",
"fieldname": "voucher_id",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Voucher ID",
"oldfieldname": "voucher_id",
"oldfieldtype": "Link",
"options": "Journal Voucher"
},
{
"doctype": "DocField",
"fieldname": "against_account",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Against Account",
"oldfieldname": "against_account",
"oldfieldtype": "Data",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Posting Date",
"oldfieldname": "posting_date",
"oldfieldtype": "Date",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "clearance_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Clearance Date",
"oldfieldname": "clearance_date",
"oldfieldtype": "Date"
},
{
"doctype": "DocField",
"fieldname": "cheque_number",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Cheque Number",
"oldfieldname": "cheque_number",
"oldfieldtype": "Data",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "cheque_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Cheque Date",
"oldfieldname": "cheque_date",
"oldfieldtype": "Date",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "debit",
"fieldtype": "Currency",
"label": "Debit",
"oldfieldname": "debit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "credit",
"fieldtype": "Currency",
"label": "Credit",
"oldfieldname": "credit",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"read_only": 1
}
]

View File

@@ -0,0 +1,55 @@
{
"autoname": "CBD/.######",
"creation": "2013-03-07 11:55:04",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "account",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "Account",
"oldfieldname": "account",
"oldfieldtype": "Link",
"options": "Account",
"permlevel": 0,
"reqd": 1,
"search_index": 1
},
{
"fieldname": "budget_allocated",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Budget Allocated",
"oldfieldname": "budget_allocated",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "fiscal_year",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "Fiscal Year",
"oldfieldname": "fiscal_year",
"oldfieldtype": "Select",
"options": "Fiscal Year",
"permlevel": 0,
"reqd": 1,
"search_index": 1
}
],
"idx": 1,
"istable": 1,
"modified": "2014-05-09 02:12:39.595788",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget Detail",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
}

View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
class BudgetDetail(Document):
pass

View File

@@ -1,61 +0,0 @@
[
{
"creation": "2013-03-07 11:55:04",
"docstatus": 0,
"modified": "2013-12-20 19:22:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "CBD/.######",
"doctype": "DocType",
"istable": 1,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Budget Detail",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0,
"reqd": 1
},
{
"doctype": "DocType",
"name": "Budget Detail"
},
{
"doctype": "DocField",
"fieldname": "account",
"fieldtype": "Link",
"in_filter": 1,
"label": "Account",
"oldfieldname": "account",
"oldfieldtype": "Link",
"options": "Account",
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "budget_allocated",
"fieldtype": "Currency",
"label": "Budget Allocated",
"oldfieldname": "budget_allocated",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency"
},
{
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
"label": "Fiscal Year",
"oldfieldname": "fiscal_year",
"oldfieldtype": "Select",
"options": "link:Fiscal Year",
"search_index": 1
}
]

View File

@@ -7,8 +7,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
refresh_field('budget_distribution_details');
}
return $c('runserverobj',args={'method' : 'get_months', 'docs' :
frappe.model.compress(make_doclist(doc.doctype, doc.name))},callback1);
return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);
}
}

View File

@@ -0,0 +1,76 @@
{
"autoname": "field:distribution_id",
"creation": "2013-01-10 16:34:05",
"description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"description": "Name of the Budget Distribution",
"fieldname": "distribution_id",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Distribution Name",
"oldfieldname": "distribution_id",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "fiscal_year",
"fieldtype": "Link",
"in_filter": 1,
"in_list_view": 1,
"label": "Fiscal Year",
"oldfieldname": "fiscal_year",
"oldfieldtype": "Select",
"options": "Fiscal Year",
"permlevel": 0,
"search_index": 1
},
{
"fieldname": "budget_distribution_details",
"fieldtype": "Table",
"label": "Budget Distribution Details",
"oldfieldname": "budget_distribution_details",
"oldfieldtype": "Table",
"options": "Budget Distribution Detail",
"permlevel": 0
}
],
"icon": "icon-bar-chart",
"idx": 1,
"modified": "2014-05-09 02:16:47.567367",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget Distribution",
"name_case": "Title Case",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0,
"write": 1
},
{
"cancel": 0,
"delete": 0,
"permlevel": 2,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0
}
],
"sort_field": "modified",
"sort_order": "DESC"
}

View File

@@ -3,30 +3,23 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import flt
from frappe.model.doc import addchild
from frappe.model.bean import getlist
from frappe import msgprint, _
from frappe import _
from frappe.model.document import Document
class DocType:
def __init__(self,doc,doclist=[]):
self.doc,self.doclist = doc,doclist
class BudgetDistribution(Document):
def get_months(self):
month_list = ['January','February','March','April','May','June','July','August','September',
'October','November','December']
idx =1
for m in month_list:
mnth = addchild(self.doc, 'budget_distribution_details',
'Budget Distribution Detail', self.doclist)
mnth.month = m or ''
mnth = self.append('budget_distribution_details')
mnth.month = m
mnth.idx = idx
idx += 1
def validate(self):
total = sum([flt(d.percentage_allocation, 2) for d in self.doclist.get(
{"parentfield": "budget_distribution_details"})])
total = sum([flt(d.percentage_allocation) for d in self.get("budget_distribution_details")])
if total != 100.0:
msgprint(_("Percentage Allocation should be equal to ") + "100%", raise_exception=1)
frappe.throw(_("Percentage Allocation should be equal to 100%"))

View File

@@ -1,96 +0,0 @@
[
{
"creation": "2013-01-10 16:34:05",
"docstatus": 0,
"modified": "2014-01-20 17:48:27",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "field:distribution_id",
"description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**",
"doctype": "DocType",
"icon": "icon-bar-chart",
"module": "Accounts",
"name": "__common__",
"name_case": "Title Case"
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "Budget Distribution",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"cancel": 0,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Budget Distribution",
"parentfield": "permissions",
"parenttype": "DocType",
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0
},
{
"doctype": "DocType",
"name": "Budget Distribution"
},
{
"description": "Name of the Budget Distribution",
"doctype": "DocField",
"fieldname": "distribution_id",
"fieldtype": "Data",
"label": "Distribution Name",
"oldfieldname": "distribution_id",
"oldfieldtype": "Data",
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"in_filter": 1,
"label": "Fiscal Year",
"oldfieldname": "fiscal_year",
"oldfieldtype": "Select",
"options": "link:Fiscal Year",
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "budget_distribution_details",
"fieldtype": "Table",
"label": "Budget Distribution Details",
"oldfieldname": "budget_distribution_details",
"oldfieldtype": "Table",
"options": "Budget Distribution Detail"
},
{
"doctype": "DocField",
"fieldname": "trash_reason",
"fieldtype": "Small Text",
"label": "Trash Reason",
"oldfieldname": "trash_reason",
"oldfieldtype": "Small Text",
"read_only": 1
},
{
"amend": 0,
"create": 1,
"delete": 1,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"write": 1
},
{
"delete": 0,
"doctype": "DocPerm",
"permlevel": 2
}
]

View File

@@ -1,70 +1,6 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
test_records = [
[{
"doctype": "Budget Distribution",
"distribution_id": "_Test Distribution",
"fiscal_year": "_Test Fiscal Year 2013",
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "January",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "February",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "March",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "April",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "May",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "June",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "July",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "August",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "September",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "October",
"percentage_allocation": "8"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "November",
"percentage_allocation": "10"
}, {
"doctype": "Budget Distribution Detail",
"parentfield": "budget_distribution_details",
"month": "December",
"percentage_allocation": "10"
}]
]
import frappe
test_records = frappe.get_test_records('Budget Distribution')

View File

@@ -0,0 +1,44 @@
[{
"doctype": "Budget Distribution",
"distribution_id": "_Test Distribution",
"fiscal_year": "_Test Fiscal Year 2013",
"budget_distribution_details": [
{
"month": "January",
"percentage_allocation": "8"
}, {
"month": "February",
"percentage_allocation": "8"
}, {
"month": "March",
"percentage_allocation": "8"
}, {
"month": "April",
"percentage_allocation": "8"
}, {
"month": "May",
"percentage_allocation": "8"
}, {
"month": "June",
"percentage_allocation": "8"
}, {
"month": "July",
"percentage_allocation": "8"
}, {
"month": "August",
"percentage_allocation": "8"
}, {
"month": "September",
"percentage_allocation": "8"
}, {
"month": "October",
"percentage_allocation": "8"
}, {
"month": "November",
"percentage_allocation": "10"
}, {
"month": "December",
"percentage_allocation": "10"
}
]
}]

View File

@@ -0,0 +1,35 @@
{
"autoname": "BDD/.#####",
"creation": "2013-02-22 01:27:38.000000",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "month",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Month",
"oldfieldname": "month",
"oldfieldtype": "Data",
"permlevel": 0,
"read_only": 1,
"reqd": 1
},
{
"fieldname": "percentage_allocation",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Percentage Allocation",
"oldfieldname": "percentage_allocation",
"oldfieldtype": "Currency",
"permlevel": 0
}
],
"idx": 1,
"istable": 1,
"modified": "2013-12-20 19:22:59.000000",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget Distribution Detail",
"owner": "Administrator"
}

View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
class BudgetDistributionDetail(Document):
pass

View File

@@ -1,47 +0,0 @@
[
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
"modified": "2013-12-20 19:22:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"autoname": "BDD/.#####",
"doctype": "DocType",
"istable": 1,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "Budget Distribution Detail",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"doctype": "DocType",
"name": "Budget Distribution Detail"
},
{
"doctype": "DocField",
"fieldname": "month",
"fieldtype": "Data",
"label": "Month",
"oldfieldname": "month",
"oldfieldtype": "Data",
"read_only": 1,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "percentage_allocation",
"fieldtype": "Float",
"label": "Percentage Allocation",
"oldfieldname": "percentage_allocation",
"oldfieldtype": "Currency"
}
]

View File

@@ -0,0 +1,182 @@
{
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "column_break0",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
"options": "C-FORM-",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "c_form_no",
"fieldtype": "Data",
"in_list_view": 1,
"label": "C-Form No",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "received_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Received Date",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "customer",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Customer",
"options": "Customer",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"permlevel": 0,
"read_only": 0
},
{
"fieldname": "fiscal_year",
"fieldtype": "Link",
"label": "Fiscal Year",
"options": "Fiscal Year",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "quarter",
"fieldtype": "Select",
"label": "Quarter",
"options": "\nI\nII\nIII\nIV",
"permlevel": 0,
"read_only": 0
},
{
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "state",
"fieldtype": "Data",
"label": "State",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
{
"fieldname": "section_break0",
"fieldtype": "Section Break",
"permlevel": 0,
"read_only": 0
},
{
"fieldname": "invoice_details",
"fieldtype": "Table",
"label": "Invoice Details",
"options": "C-Form Invoice Detail",
"permlevel": 0,
"read_only": 0
},
{
"fieldname": "total_invoiced_amount",
"fieldtype": "Currency",
"label": "Total Invoiced Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"read_only": 1
},
{
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "C-Form",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
}
],
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2014-09-05 12:58:43.333698",
"modified_by": "Administrator",
"module": "Accounts",
"name": "C-Form",
"owner": "Administrator",
"permissions": [
{
"apply_user_permissions": 1,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"submit": 0,
"write": 1
},
{
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "All",
"submit": 0
}
]
}

View File

@@ -3,84 +3,68 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import flt, getdate
from frappe.model.bean import getlist
class DocType:
def __init__(self,d,dl):
self.doc, self.doclist = d,dl
from frappe.utils import flt
from frappe import _
from frappe.model.document import Document
class CForm(Document):
def validate(self):
"""Validate invoice that c-form is applicable
"""Validate invoice that c-form is applicable
and no other c-form is received for that"""
for d in getlist(self.doclist, 'invoice_details'):
for d in self.get('invoice_details'):
if d.invoice_no:
inv = frappe.conn.sql("""select c_form_applicable, c_form_no from
inv = frappe.db.sql("""select c_form_applicable, c_form_no from
`tabSales Invoice` where name = %s and docstatus = 1""", d.invoice_no)
if not inv:
frappe.msgprint("""Invoice: %s is not exists in the system or
is not submitted, please check.""" % d.invoice_no, raise_exception=1)
elif inv[0][0] != 'Yes':
frappe.msgprint("C-form is not applicable for Invoice: %s" %
d.invoice_no, raise_exception=1)
elif inv[0][1] and inv[0][1] != self.doc.name:
frappe.msgprint("""Invoice %s is tagged in another C-form: %s.
if inv and inv[0][0] != 'Yes':
frappe.throw("C-form is not applicable for Invoice: %s" % d.invoice_no)
elif inv and inv[0][1] and inv[0][1] != self.name:
frappe.throw("""Invoice %s is tagged in another C-form: %s.
If you want to change C-form no for this invoice,
please remove invoice no from the previous c-form and then try again""" %
(d.invoice_no, inv[0][1]), raise_exception=1)
please remove invoice no from the previous c-form and then try again""" %
(d.invoice_no, inv[0][1]))
elif not inv:
frappe.throw("Row %s: Invoice %s is invalid, it might be cancelled / does not exist. \
Please enter a valid Invoice" % d.idx, d.invoice_no)
def on_update(self):
""" Update C-Form No on invoices"""
self.set_total_invoiced_amount()
def on_submit(self):
self.set_cform_in_sales_invoices()
def before_cancel(self):
# remove cform reference
frappe.conn.sql("""update `tabSales Invoice` set c_form_no=null
where c_form_no=%s""", self.doc.name)
frappe.db.sql("""update `tabSales Invoice` set c_form_no=null where c_form_no=%s""", self.name)
def set_cform_in_sales_invoices(self):
inv = [d.invoice_no for d in getlist(self.doclist, 'invoice_details')]
inv = [d.invoice_no for d in self.get('invoice_details')]
if inv:
frappe.conn.sql("""update `tabSales Invoice` set c_form_no=%s, modified=%s
where name in (%s)""" % ('%s', '%s', ', '.join(['%s'] * len(inv))),
tuple([self.doc.name, self.doc.modified] + inv))
frappe.conn.sql("""update `tabSales Invoice` set c_form_no = null, modified = %s
where name not in (%s) and ifnull(c_form_no, '') = %s""" %
('%s', ', '.join(['%s']*len(inv)), '%s'),
tuple([self.doc.modified] + inv + [self.doc.name]))
frappe.db.sql("""update `tabSales Invoice` set c_form_no=%s, modified=%s where name in (%s)""" %
('%s', '%s', ', '.join(['%s'] * len(inv))), tuple([self.name, self.modified] + inv))
frappe.db.sql("""update `tabSales Invoice` set c_form_no = null, modified = %s
where name not in (%s) and ifnull(c_form_no, '') = %s""" %
('%s', ', '.join(['%s']*len(inv)), '%s'), tuple([self.modified] + inv + [self.name]))
else:
frappe.msgprint("Please enter atleast 1 invoice in the table", raise_exception=1)
frappe.throw(_("Please enter atleast 1 invoice in the table"))
def set_total_invoiced_amount(self):
total = sum([flt(d.grand_total) for d in getlist(self.doclist, 'invoice_details')])
frappe.conn.set(self.doc, 'total_invoiced_amount', total)
total = sum([flt(d.grand_total) for d in self.get('invoice_details')])
frappe.db.set(self, 'total_invoiced_amount', total)
def get_invoice_details(self, invoice_no):
""" Pull details from invoices for referrence """
inv = frappe.conn.sql("""select posting_date, territory, net_total, grand_total
from `tabSales Invoice` where name = %s""", invoice_no)
return {
'invoice_date' : inv and getdate(inv[0][0]).strftime('%Y-%m-%d') or '',
'territory' : inv and inv[0][1] or '',
'net_total' : inv and flt(inv[0][2]) or '',
'grand_total' : inv and flt(inv[0][3]) or ''
}
def get_invoice_nos(doctype, txt, searchfield, start, page_len, filters):
from erpnext.utilities import build_filter_conditions
conditions, filter_values = build_filter_conditions(filters)
return frappe.conn.sql("""select name from `tabSales Invoice` where docstatus = 1
and c_form_applicable = 'Yes' and ifnull(c_form_no, '') = '' %s
and %s like %s order by name limit %s, %s""" %
(conditions, searchfield, "%s", "%s", "%s"),
tuple(filter_values + ["%%%s%%" % txt, start, page_len]))
if invoice_no:
inv = frappe.db.get_value("Sales Invoice", invoice_no,
["posting_date", "territory", "net_total", "grand_total"], as_dict=True)
return {
'invoice_date' : inv.posting_date,
'territory' : inv.territory,
'net_total' : inv.net_total,
'grand_total' : inv.grand_total
}

View File

@@ -1,193 +0,0 @@
[
{
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
"modified": "2013-12-20 19:23:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"allow_attach": 1,
"autoname": "naming_series:",
"doctype": "DocType",
"icon": "icon-file-text",
"is_submittable": 1,
"max_attachments": 3,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"name": "__common__",
"parent": "C-Form",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"doctype": "DocPerm",
"name": "__common__",
"parent": "C-Form",
"parentfield": "permissions",
"parenttype": "DocType",
"read": 1,
"report": 1,
"submit": 0
},
{
"doctype": "DocType",
"name": "C-Form"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
"options": "\nC-FORM/",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "c_form_no",
"fieldtype": "Data",
"label": "C-Form No",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "received_date",
"fieldtype": "Date",
"label": "Received Date",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "customer",
"fieldtype": "Link",
"label": "Customer",
"options": "Customer",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
{
"doctype": "DocField",
"fieldname": "company",
"fieldtype": "Select",
"label": "Company",
"options": "link:Company",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "fiscal_year",
"fieldtype": "Select",
"label": "Fiscal Year",
"options": "link:Fiscal Year",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "quarter",
"fieldtype": "Select",
"label": "Quarter",
"options": "\nI\nII\nIII\nIV",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "state",
"fieldtype": "Data",
"label": "State",
"read_only": 0,
"reqd": 1
},
{
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "invoice_details",
"fieldtype": "Table",
"label": "Invoice Details",
"options": "C-Form Invoice Detail",
"read_only": 0
},
{
"doctype": "DocField",
"fieldname": "total_invoiced_amount",
"fieldtype": "Currency",
"label": "Total Invoiced Amount",
"options": "Company:company:default_currency",
"print_hide": 0,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_restrictions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "C-Form",
"print_hide": 1,
"read_only": 1
},
{
"create": 1,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Accounts User",
"write": 1
},
{
"create": 1,
"doctype": "DocPerm",
"email": 1,
"permlevel": 0,
"print": 1,
"role": "Accounts Manager",
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"permlevel": 1,
"role": "All"
}
]

View File

@@ -0,0 +1,68 @@
{
"creation": "2013-02-22 01:27:38.000000",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "invoice_no",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Invoice No",
"options": "Sales Invoice",
"permlevel": 0,
"print_width": "160px",
"width": "160px"
},
{
"fieldname": "invoice_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Invoice Date",
"permlevel": 0,
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"fieldname": "territory",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Territory",
"options": "Territory",
"permlevel": 0,
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"fieldname": "net_total",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Net Total",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"fieldname": "grand_total",
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Grand Total",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_width": "120px",
"read_only": 1,
"width": "120px"
}
],
"idx": 1,
"istable": 1,
"modified": "2013-12-20 19:23:00.000000",
"modified_by": "Administrator",
"module": "Accounts",
"name": "C-Form Invoice Detail",
"owner": "Administrator"
}

View File

@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
class CFormInvoiceDetail(Document):
pass

View File

@@ -1,77 +0,0 @@
[
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
"modified": "2013-12-20 19:23:00",
"modified_by": "Administrator",
"owner": "Administrator"
},
{
"doctype": "DocType",
"istable": 1,
"module": "Accounts",
"name": "__common__"
},
{
"doctype": "DocField",
"in_list_view": 1,
"name": "__common__",
"parent": "C-Form Invoice Detail",
"parentfield": "fields",
"parenttype": "DocType",
"permlevel": 0
},
{
"doctype": "DocType",
"name": "C-Form Invoice Detail"
},
{
"doctype": "DocField",
"fieldname": "invoice_no",
"fieldtype": "Link",
"label": "Invoice No",
"options": "Sales Invoice",
"print_width": "160px",
"width": "160px"
},
{
"doctype": "DocField",
"fieldname": "invoice_date",
"fieldtype": "Date",
"label": "Invoice Date",
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
"label": "Territory",
"options": "Territory",
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"doctype": "DocField",
"fieldname": "net_total",
"fieldtype": "Currency",
"label": "Net Total",
"options": "Company:company:default_currency",
"print_width": "120px",
"read_only": 1,
"width": "120px"
},
{
"doctype": "DocField",
"fieldname": "grand_total",
"fieldtype": "Currency",
"label": "Grand Total",
"options": "Company:company:default_currency",
"print_width": "120px",
"read_only": 1,
"width": "120px"
}
]

View File

@@ -0,0 +1,59 @@
{
"autoname": "field:chart_name",
"creation": "2014-03-05 14:11:31.000000",
"description": "Financial Chart of Accounts. Imported from file.",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Master",
"fields": [
{
"fieldname": "chart_name",
"fieldtype": "Data",
"in_list_view": 0,
"label": "Chart Name",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "country",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Country",
"options": "Country",
"permlevel": 0,
"reqd": 1
},
{
"fieldname": "preview",
"fieldtype": "HTML",
"label": "Preview",
"permlevel": 0
},
{
"fieldname": "source_file",
"fieldtype": "Data",
"hidden": 1,
"label": "Source File",
"permlevel": 0,
"read_only": 1,
"reqd": 0
}
],
"idx": 1,
"in_create": 1,
"modified": "2014-03-05 14:51:05.000000",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Chart of Accounts",
"owner": "Administrator",
"permissions": [
{
"export": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager"
}
]
}

View File

@@ -0,0 +1,62 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe, os, json
from frappe.utils import cstr
from unidecode import unidecode
from frappe.model.document import Document
class ChartofAccounts(Document):
no_report_type = False
def create_accounts(self, company):
chart = {}
with open(os.path.join(os.path.dirname(__file__), "charts", self.source_file), "r") as f:
chart = json.loads(f.read())
from erpnext.accounts.doctype.chart_of_accounts.charts.account_properties import account_properties
if chart:
accounts = []
def _import_accounts(children, parent):
for child in children:
account_name = child.get("name")
account_name_in_db = unidecode(account_name.strip().lower())
if account_name_in_db in accounts:
count = accounts.count(account_name_in_db)
account_name = account_name + " " + cstr(count)
child.update(account_properties.get(chart.get("name"), {}).get(account_name, {}))
account = frappe.get_doc({
"doctype": "Account",
"account_name": account_name,
"company": company,
"parent_account": parent,
"group_or_ledger": "Group" if child.get("children") else "Ledger",
"report_type": child.get("report_type"),
"account_type": child.get("account_type")
}).insert()
accounts.append(account_name_in_db)
# set report_type for all parents where blank
if not account.report_type or account.report_type == 'None':
self.no_report_type = True
elif self.no_report_type:
frappe.db.sql("""update tabAccount set report_type=%s
where lft<=%s and rgt>=%s and ifnull(report_type, '')=''""",
(account.report_type, account.lft, account.rgt))
if child.get("children"):
_import_accounts(child.get("children"), account.name)
_import_accounts(chart.get("root").get("children"), None)
@frappe.whitelist()
def get_charts_for_country(country):
return frappe.db.sql_list("""select chart_name from `tabChart of Accounts`
where country=%s""", country)

View File

@@ -0,0 +1,13 @@
account_properties = {
"Deutscher Kontenplan SKR03": {
"Bilanzkonten": {
"report_type": "Balance Sheet",
},
"Gewinn u. Verlust": {
"report_type": "Profit and Loss",
},
"Vortrags- Kapital- und Statistische Konten": {
"report_type": "Balance Sheet"
}
}
}

View File

@@ -0,0 +1,669 @@
{
"name": "Argentina - Plan de Cuentas",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Acreedor por Garant\u00edas Otorgadas"
},
{
"name": "Acreedor por Documentos Descontados"
},
{
"name": "Comitente por Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN ACREEDORAS"
},
{
"children": [
{
"name": "Documentos Endosados"
},
{
"name": "Documentos Descontados"
},
{
"name": "Garantias Otorgadas"
},
{
"name": "Dep\u00f3sito de Valores Recibos en Garant\u00eda"
},
{
"name": "Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN DEUDORAS"
}
],
"name": "Cuentas de Orden"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Recupero de Rezagos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Bienes de Uso",
"report_type": "Profit and Loss"
},
{
"name": "Recupero de Deudores Incobrables",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta Inversiones Permanentes",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones obtenidas, ganandas, percibidas",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Positivos Extraordinarios"
},
{
"children": [
{
"name": "Comisiones gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Descuentos gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Renta de T\u00edtulos P\u00fablicos",
"report_type": "Profit and Loss"
},
{
"name": "Honorarios gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Ventas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Positivos Ordinarios"
},
{
"name": "Intereses gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Alquileres gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Acciones",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Positivos Ordinarios"
}
],
"name": "RESULTADOS POSITIVOS"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Publicidad y Propaganda",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Servicios P\u00fablicos"
},
{
"children": [
{
"name": "Costo de Mercader\u00edas Vendidas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Costo de Mercader\u00edas Vendidas"
},
{
"name": "Gastos en Amortizaci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Cargas Sociales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Sueldos y Jormales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos Bancarios"
},
{
"name": "Gastos en Impuestos"
},
{
"name": "Gastos en Depreciaci\u00f3n de Bienes de Uso",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Negativos Ordinarios"
},
{
"children": [
{
"name": "Gastos en Siniestros",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones Cedidas, Otorgadas",
"report_type": "Profit and Loss"
},
{
"name": "P\u00e9rdida Venta Bienes de Uso",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Negativos Extraordinarios"
}
],
"name": "RESULTADOS NEGATIVOS"
}
],
"name": "Cuentas de Resultado"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Bienes de Uso",
"report_type": "Balance Sheet"
}
],
"name": "Ajustes al Patrimonio"
},
{
"children": [
{
"name": "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Aportes No Capitalizados / Primas de Emsi\u00f3n",
"report_type": "Balance Sheet"
}
],
"name": "Aportes No Capitalizados"
},
{
"children": [
{
"name": "Capital social / Dividendos a Distribuir en Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / Acciones en Circulaci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / Capital Suscripto",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / (-) Descuento de Emisi\u00f3n de Acciones",
"report_type": "Balance Sheet"
}
],
"name": "Capital Social"
},
{
"children": [
{
"name": "Resultados Acumulados",
"report_type": "Balance Sheet"
},
{
"name": "Resultado del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Ganancias y P\u00e9rdidas del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Resultados Acumulados del Ejercicio Anterior",
"report_type": "Balance Sheet"
}
],
"name": "Resultados No Asignados"
},
{
"children": [
{
"name": "Reserva para Renovaci\u00f3n de Bienes de Uso",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Estatutaria",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Facultativa",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Legal",
"report_type": "Balance Sheet"
}
],
"name": "Ganancias Reservadas"
}
],
"name": "PATRIMONIO NETO"
},
{
"children": [
{
"children": [
{
"name": "Deudas Sociales / Retenciones a Depositar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Sueldos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Provisi\u00f3n para Sueldo Anual Complementario",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Cargas Sociales a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Sociales"
},
{
"children": [
{
"name": "Otras Deudas / Acreedores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Honorarios Directores y S\u00edndicos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Dividendos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Cobros por Adelantado",
"report_type": "Balance Sheet"
}
],
"name": "Otras Deudas"
},
{
"children": [
{
"name": "Previsiones / Previsi\u00f3n para Garant\u00edas por Service",
"report_type": "Balance Sheet"
},
{
"name": "Previsiones / Previsi\u00f3n para juicios Pendientes",
"report_type": "Balance Sheet"
},
{
"name": "Previsiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos",
"report_type": "Balance Sheet"
}
],
"name": "Previsiones"
},
{
"children": [
{
"name": "Deudas Comerciales / Anticipos de Clientes",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Comerciales / (-) Intereses a Devengar por Compras al Cr\u00e9dito",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Comerciales / Proveedores",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Comerciales"
},
{
"children": [
{
"name": "Deudas Bancarias y Financieras / Debentures Emitidos",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Intereses a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Obligaciones a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Prestamos",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Bancarias y Financieras"
},
{
"children": [
{
"name": "Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Impuesto a la Ganancia M\u00ednima Presunta a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Monotributo a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / IVA a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Impuesto a los D\u00e9bitos y Cr\u00e9ditos Bancarios a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Impuesto a las Ganancias a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Fiscales"
}
],
"name": "PASIVO"
},
{
"children": [
{
"name": "Otros Cr\u00e9ditos / Anticipo de Impuestos",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Anticipos a Proveedores",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Pr\u00e9stamos otorgados",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Accionistas",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Intereses Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Alquileres Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Anticipo al Personal",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / (-) Intereses (+) a Devengar",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / (-) Previsi\u00f3n para Descuentos",
"report_type": "Balance Sheet"
}
],
"name": "Otros Cr\u00e9ditos"
},
{
"children": [
{
"name": "Cr\u00e9ditos por Ventas / Deudores por Ventas",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos por Ventas / Deudores Morosos",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos por Ventas / Deudores en Gesti\u00f3n Judicial",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos por Ventas / Deudores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos por Ventas / (-) Previsi\u00f3n para Ds. Incobrables",
"report_type": "Balance Sheet"
}
],
"name": "Cr\u00e9ditos por Ventas"
},
{
"children": [
{
"children": [
{
"name": "Caja y bancos - Valores a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Caja y Bancos.../ BCO. CTA CTE ARS",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Cuentas Corrientes"
},
{
"name": "Caja y bancos - Recaudaciones a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Caja y bancos - Caja / efectivo ARS",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Caja"
},
{
"children": [
{
"name": "Caja y ...- Fondos fijos / caja chica 01 ARS",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Fondos fijos"
},
{
"children": [
{
"name": "Caja y bancos - Caja / efectivo USD",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Moneda Extranjera"
}
],
"name": "Caja y Bancos"
},
{
"children": [
{
"children": [
{
"name": "Bienes de Cambio - Mercader\u00edas / Categoria de productos 01",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Cambio - Mercader\u00edas"
},
{
"name": "Materias primas",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Cambio - Mercader\u00edas en Tr\u00e1nsito",
"report_type": "Balance Sheet"
},
{
"name": "Productos Elaborados",
"report_type": "Balance Sheet"
},
{
"name": "Productos en Curso de Elaboraci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Bienes de Cambio",
"report_type": "Balance Sheet"
},
{
"name": "Materiales Varios ",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Cambio"
},
{
"children": [
{
"name": "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Permanentes",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / T\u00edtulos P\u00fablicos",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Transitorias",
"report_type": "Balance Sheet"
}
],
"name": "Inversiones"
},
{
"children": [
{
"name": "Bienes Inmateriales / (-) Amortizaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Inmateriales / Patentes de Invenci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Inmateriales / Concesiones y Franquicias",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Inmateriales / Marcas de F\u00e1brica",
"report_type": "Balance Sheet"
}
],
"name": "Bienes Inmateriales"
},
{
"children": [
{
"name": "Bienes de Uso / Inmuebles",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Maquinaria",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Rodados",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / (-) Depreciaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Equipos",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Uso"
}
],
"name": "ACTIVO"
}
],
"name": "Cuentas Patrimoniales"
},
{
"children": [
{
"children": [
{
"name": "Compras - Categoria de productos 01"
}
],
"name": "Compras"
},
{
"name": "Costos de Producci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Comercializaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Cuentas de Movimiento"
}
],
"name": "Argentina"
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,657 @@
{
"name": "Bolivia - Plan de Cuentas",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Acreedor por Garant\u00edas Otorgadas"
},
{
"name": "Acreedor por Documentos Descontados"
},
{
"name": "Comitente por Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN ACREEDORAS"
},
{
"children": [
{
"name": "Documentos Endosados"
},
{
"name": "Documentos Descontados"
},
{
"name": "Garantias Otorgadas"
},
{
"name": "Dep\u00f3sito de Valores Recibos en Garant\u00eda"
},
{
"name": "Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN DEUDORAS"
}
],
"name": "Cuentas de Orden"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Recupero de Rezagos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Bienes de Uso",
"report_type": "Profit and Loss"
},
{
"name": "Recupero de Deudores Incobrables",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta Inversiones Permanentes",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones obtenidas, ganandas, percibidas",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Positivos Extraordinarios"
},
{
"children": [
{
"name": "Comisiones gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Descuentos gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Renta de T\u00edtulos P\u00fablicos",
"report_type": "Profit and Loss"
},
{
"name": "Honorarios gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Ventas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Ventas"
},
{
"name": "Intereses gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Alquileres gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Acciones",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Positivos Ordinarios"
}
],
"name": "RESULTADOS POSITIVOS"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Publicidad y Propaganda",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Servicios P\u00fablicos"
},
{
"children": [
{
"name": "Costo de Mercader\u00edas Vendidas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Costo de Mercader\u00edas Vendidas"
},
{
"name": "Gastos en Amortizaci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Cargas Sociales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Sueldos y Jormales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos Bancarios"
},
{
"name": "Gastos en Impuestos"
},
{
"name": "Gastos en Depreciaci\u00f3n de Bienes de Uso",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Negativos Ordinarios"
},
{
"children": [
{
"name": "Gastos en Siniestros",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones Cedidas, Otorgadas",
"report_type": "Profit and Loss"
},
{
"name": "P\u00e9rdida Venta Bienes de Uso",
"report_type": "Profit and Loss"
}
],
"name": "Resultados Negativos Extraordinarios"
}
],
"name": "RESULTADOS NEGATIVOS"
}
],
"name": "Cuentas de Resultado"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Bienes de Uso",
"report_type": "Balance Sheet"
}
],
"name": "Ajustes al Patrimonio"
},
{
"children": [
{
"name": "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Aportes No Capitalizados / Primas de Emsi\u00f3n",
"report_type": "Balance Sheet"
}
],
"name": "Aportes No Capitalizados"
},
{
"children": [
{
"name": "Capital social / Dividendos a Distribuir en Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / Acciones en Circulaci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / Capital Suscripto",
"report_type": "Balance Sheet"
},
{
"name": "Capital social / (-) Descuento de Emisi\u00f3n de Acciones",
"report_type": "Balance Sheet"
}
],
"name": "Capital Social"
},
{
"children": [
{
"name": "Resultados Acumulados",
"report_type": "Balance Sheet"
},
{
"name": "Resultado del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Ganancias y P\u00e9rdidas del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Resultados Acumulados del Ejercicio Anterior",
"report_type": "Balance Sheet"
}
],
"name": "Resultados No Asignados"
},
{
"children": [
{
"name": "Reserva para Renovaci\u00f3n de Bienes de Uso",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Estatutaria",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Facultativa",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Legal",
"report_type": "Balance Sheet"
}
],
"name": "Ganancias Reservadas"
}
],
"name": "PATRIMONIO NETO"
},
{
"children": [
{
"children": [
{
"name": "Deudas Sociales / Retenciones a Depositar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Sueldos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Provisi\u00f3n para Sueldo Anual Complementario",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Sociales / Cargas Sociales a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Sociales"
},
{
"children": [
{
"name": "Otras Deudas / Acreedores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Honorarios Directores y S\u00edndicos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Dividendos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Deudas / Cobros por Adelantado",
"report_type": "Balance Sheet"
}
],
"name": "Otras Deudas"
},
{
"children": [
{
"name": "Previsiones / Previsi\u00f3n para Garant\u00edas por Service",
"report_type": "Balance Sheet"
},
{
"name": "Previsiones / Previsi\u00f3n para juicios Pendientes",
"report_type": "Balance Sheet"
},
{
"name": "Previsiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos",
"report_type": "Balance Sheet"
}
],
"name": "Previsiones"
},
{
"children": [
{
"name": "Deudas Comerciales / Anticipos de Clientes",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Comerciales / (-) Intereses a Devengar por Compras al Cr\u00e9dito",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Comerciales / Proveedores",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Comerciales"
},
{
"children": [
{
"name": "Deudas Bancarias y Financieras / Letras de Cambio Emitidos",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Intereses a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Obligaciones a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Prestamos",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Bancarias y Financieras"
},
{
"children": [
{
"name": "Deudas Fiscales / IVA a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Impuesto a las Transacciones IT a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Deudas Fiscales / Impuesto a las Utilidades de Empresas IUE a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Deudas Fiscales"
}
],
"name": "PASIVO"
},
{
"children": [
{
"children": [
{
"name": "Caja y bancos - Valores a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Caja y Bancos.../ BCO. CTA CTE BOB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Cuentas Corrientes"
},
{
"name": "Caja y bancos - Recaudaciones a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Caja y bancos - Caja / efectivo en BOB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Caja"
},
{
"children": [
{
"name": "Caja y ...- Fondos fijos / caja chica 01 BOB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Fondos fijos"
},
{
"children": [
{
"name": "Caja y bancos - Caja / efectivo USD",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Moneda Extranjera"
}
],
"name": "Caja y Bancos"
},
{
"children": [
{
"name": "Otros Cr\u00e9ditos / Anticipo de Impuestos",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Anticipos a Proveedores",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Pr\u00e9stamos otorgados",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Accionistas",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Intereses Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Alquileres Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / Anticipo al Personal",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / (-) Intereses (+) a Devengar",
"report_type": "Balance Sheet"
},
{
"name": "Otros Cr\u00e9ditos / (-) Previsi\u00f3n para Descuentos",
"report_type": "Balance Sheet"
}
],
"name": "Otros Cr\u00e9ditos"
},
{
"children": [
{
"name": "Cr\u00e9ditos fiscal IVA / Deudores por Ventas",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos fiscal IVA / Deudores Morosos",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos fiscal IVA / Deudores en Gesti\u00f3n Judicial",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos fiscal IVA / Deudores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Cr\u00e9ditos fiscal IVA / (-) Previsi\u00f3n para Ds. Incobrables",
"report_type": "Balance Sheet"
}
],
"name": "Cr\u00e9ditos fiscal IVA"
},
{
"children": [
{
"children": [
{
"name": "Bienes de Cambio - Existencia de Mercader\u00edas / Categoria de productos 01",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Cambio - Mercader\u00edas"
},
{
"name": "Materias primas",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Cambio - Mercader\u00edas en Tr\u00e1nsito",
"report_type": "Balance Sheet"
},
{
"name": "Productos Elaborados",
"report_type": "Balance Sheet"
},
{
"name": "Productos en Curso de Elaboraci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "(-) Desvalorizaci\u00f3n de Existencias",
"report_type": "Balance Sheet"
},
{
"name": "Materiales Varios ",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Cambio o Realizables"
},
{
"children": [
{
"name": "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Permanentes",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / T\u00edtulos P\u00fablicos",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Transitorias",
"report_type": "Balance Sheet"
}
],
"name": "Inversiones"
},
{
"children": [
{
"name": "Bienes Intangibles / (-) Amortizaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Intangibles / Patentes de Invenci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Intangibles / Concesiones y Franquicias",
"report_type": "Balance Sheet"
},
{
"name": "Bienes Intangibles / Marcas de F\u00e1brica",
"report_type": "Balance Sheet"
}
],
"name": "Bienes Intangibles"
},
{
"children": [
{
"name": "Bienes de Uso / Inmuebles",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Maquinaria",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Veh\u00edculos",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / (-) Depreciaci\u00f3n Acumulada Bienes de Uso",
"report_type": "Balance Sheet"
},
{
"name": "Bienes de Uso / Equipos",
"report_type": "Balance Sheet"
}
],
"name": "Bienes de Uso"
}
],
"name": "ACTIVO"
}
],
"name": "Cuentas Patrimoniales"
},
{
"children": [
{
"children": [
{
"name": "Compras - Categoria de productos 01"
}
],
"name": "Compras"
},
{
"name": "Costos de Producci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Comercializaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Cuentas de Movimiento"
}
],
"name": "Bolivia"
}
}

View File

@@ -4,6 +4,30 @@
"children": [
{
"children": [
{
"children": [
{
"name": "International Sales",
"report_type": "Profit and Loss"
},
{
"name": "Inside Sales",
"report_type": "Profit and Loss"
},
{
"name": "Non-Harmonized Provinces Sales",
"report_type": "Profit and Loss"
},
{
"name": "OTHER OPERATING INCOMES"
},
{
"name": "Harmonized Provinces Sales",
"report_type": "Profit and Loss"
}
],
"name": "OPERATING INCOMES"
},
{
"children": [
{
@@ -14,30 +38,6 @@
}
],
"name": "NON-OPERATING INCOMES"
},
{
"children": [
{
"name": "Inside Sales",
"root_type": "Income"
},
{
"name": "International Sales",
"root_type": "Income"
},
{
"name": "Non-Harmonized Provinces Sales",
"root_type": "Income"
},
{
"name": "Harmonized Provinces Sales",
"root_type": "Income"
},
{
"name": "OTHER OPERATING INCOMES"
}
],
"name": "OPERATING INCOMES"
}
],
"name": "INCOMES"
@@ -46,41 +46,46 @@
"children": [
{
"children": [
{
"name": "PREPAID EXPENSES"
},
{
"name": "INVESTMENTS HELD FOR TRADING"
},
{
"children": [
{
"name": "ALLOWANCE FOR DOUBTFUL ACCOUNTS"
},
{
"name": "Customers Account"
}
],
"name": "ACCOUNTS RECEIVABLES"
},
{
"children": [
{
"name": "Stock In Hand",
"root_type": "Asset"
},
{
"name": "Stock Delivered But Not Billed",
"root_type": "Asset"
}
],
"name": "STOCKS"
},
{
"name": "TREASURY OR TREASURY EQUIVALENTS"
},
{
"name": "CASH"
"children": [
{
"children": [
{
"account_type": "Receivable",
"name": "HST receivable - 13%",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "HST receivable - 15%",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "HST receivable - 14%",
"report_type": "Balance Sheet"
}
],
"name": "HST receivable"
},
{
"account_type": "Receivable",
"name": "PST/QST receivable",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "GST receivable",
"report_type": "Balance Sheet"
}
],
"name": "TAXES RECEIVABLES"
},
{
"name": "INVESTMENTS HELD FOR TRADING"
},
{
"name": "CERTIFICATES OF DEPOSITS"
@@ -88,25 +93,40 @@
{
"children": [
{
"name": "GST receivable"
"name": "Stock In Hand",
"report_type": "Balance Sheet"
},
{
"name": "PST/QST receivable"
},
{
"name": "HST receivable"
"name": "Stock Delivered But Not Billed",
"report_type": "Balance Sheet"
}
],
"name": "TAXES RECEIVABLES"
"name": "STOCKS"
},
{
"name": "CASH"
},
{
"name": "PREPAID EXPENSES"
},
{
"children": [
{
"account_type": "Receivable",
"name": "Customers Account",
"report_type": "Balance Sheet"
},
{
"name": "ALLOWANCE FOR DOUBTFUL ACCOUNTS"
}
],
"name": "ACCOUNTS RECEIVABLES"
}
],
"name": "CURRENT ASSETS"
},
{
"children": [
{
"name": "INVESTMENTS AVAILABLE FOR SALE"
},
{
"children": [
{
@@ -115,6 +135,9 @@
],
"name": "TANGIBLE ASSETS"
},
{
"name": "INVESTMENTS AVAILABLE FOR SALE"
},
{
"children": [
{
@@ -132,112 +155,151 @@
{
"children": [
{
"name": "TRANSLATION ADJUSTMENTS"
"children": [
{
"name": "OTHER OPERATING EXPENSES"
},
{
"name": "RESEARCH AND DEVELOPMENT EXPENSES"
},
{
"children": [
{
"name": "International Purchases",
"report_type": "Profit and Loss"
},
{
"name": "Purchases in non-harmonized provinces",
"report_type": "Profit and Loss"
},
{
"name": "Purchases in harmonized provinces",
"report_type": "Profit and Loss"
},
{
"name": "Inside Purchases",
"report_type": "Profit and Loss"
}
],
"name": "COST OF GOODS SOLD"
},
{
"name": "SALES EXPENSES"
},
{
"name": "GENERAL EXPENSES"
},
{
"children": [
{
"name": "Parental Insurance",
"report_type": "Profit and Loss"
},
{
"name": "Holidays",
"report_type": "Profit and Loss"
},
{
"name": "Labour Health and Safety",
"report_type": "Profit and Loss"
},
{
"name": "Employment Insurance",
"report_type": "Profit and Loss"
},
{
"name": "Federal Income Tax",
"report_type": "Profit and Loss"
},
{
"name": "Salaries, wages and commissions",
"report_type": "Profit and Loss"
},
{
"name": "Annuities",
"report_type": "Profit and Loss"
},
{
"name": "Provincial Income Tax",
"report_type": "Profit and Loss"
},
{
"name": "Labour Standards",
"report_type": "Profit and Loss"
},
{
"name": "Health Services Fund",
"report_type": "Profit and Loss"
}
],
"name": "LABOUR EXPENSES"
}
],
"name": "OPERATING EXPENSES"
},
{
"name": "CONTRIBUTED SURPLUS"
},
{
"name": "RETAINED EARNINGS"
},
{
"name": "PREMIUMS"
},
{
"name": "SHARE CAPITAL"
},
{
"name": "DIVIDENDS"
"children": [
{
"name": "INTERESTS EXPENSES"
},
{
"name": "OTHER NON-OPERATING EXPENSES"
}
],
"name": "NON-OPERATING EXPENSES"
}
],
"name": "EQUITY"
"name": "EXPENSES"
},
{
"children": [
{
"children": [
{
"name": "DEFERRED TAXES"
},
{
"name": "NON-CURRENT FINANCIAL DEBTS"
},
{
"name": "OTHER NON-CURRENT LIABILITIES"
},
{
"name": "PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES"
}
],
"name": "NON-CURRENT LIABILITIES"
},
{
"children": [
{
"children": [
{
"name": "Stock Received But Not Billed",
"root_type": "Liability"
}
],
"name": "LIABILITIES ASSETS HELD FOR TRANSFER"
},
{
"name": "CURRENT FINANCIAL DEBTS"
},
{
"children": [
{
"name": "Suppliers Account"
}
],
"name": "ACCOUNTS PAYABLES"
},
{
"children": [
{
"children": [
{
"name": "Health Services Fund to pay",
"root_type": "Liability"
},
{
"name": "Labour Health and Safety to pay",
"root_type": "Liability"
},
{
"children": [
{
"name": "Annuities - Employees Contribution",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Annuities - Employer Contribution",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "ANNUITIES TO PAY"
},
{
"children": [
{
"name": "PAP - Employer Contribution",
"root_type": "Liability"
},
{
"name": "PAP - Employee Contribution",
"root_type": "Liability"
}
],
"name": "PARENTAL INSURANCE PLAN TO PAY"
"name": "Health Services Fund to pay",
"report_type": "Balance Sheet"
},
{
"name": "Labour Health and Safety to pay",
"report_type": "Balance Sheet"
},
{
"name": "Provincial Income Tax",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Labour Standards to pay",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "PAP - Employer Contribution",
"report_type": "Balance Sheet"
},
{
"name": "PAP - Employee Contribution",
"report_type": "Balance Sheet"
}
],
"name": "PARENTAL INSURANCE PLAN TO PAY"
}
],
"name": "PROVINCIAL REVENU AGENCY"
@@ -248,18 +310,18 @@
"children": [
{
"name": "EI - Employees Contribution",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "EI - Employer Contribution",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "EMPLOYMENT INSURANCE TO PAY"
},
{
"name": "Federal Income Tax",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "CANADIAN REVENU AGENCY"
@@ -267,28 +329,88 @@
],
"name": "LABOUR TAXES TO PAY"
},
{
"name": "STOCK LIABILITIES"
},
{
"name": "OTHER ACCOUNTS PAYABLES"
},
{
"children": [
{
"account_type": "Payable",
"name": "Suppliers Account",
"report_type": "Balance Sheet"
}
],
"name": "ACCOUNTS PAYABLES"
},
{
"children": [
{
"account_type": "Payable",
"name": "GST to pay",
"report_type": "Balance Sheet"
},
{
"children": [
{
"account_type": "Payable",
"name": "HST to pay - 14%",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "HST to pay - 13%",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "HST to pay - 15%",
"report_type": "Balance Sheet"
}
],
"name": "HST to pay"
},
{
"name": "GST to pay"
},
{
"name": "PST/QST to pay"
"account_type": "Payable",
"name": "PST/QST to pay",
"report_type": "Balance Sheet"
}
],
"name": "TAXES PAYABLES"
},
{
"name": "STOCK LIABILITIES"
"name": "CURRENT FINANCIAL DEBTS"
},
{
"name": "OTHER ACCOUNTS PAYABLES"
"children": [
{
"name": "Stock Received But Not Billed",
"report_type": "Balance Sheet"
}
],
"name": "LIABILITIES ASSETS HELD FOR TRANSFER"
}
],
"name": "CURRENT LIABILITIES"
},
{
"children": [
{
"name": "NON-CURRENT FINANCIAL DEBTS"
},
{
"name": "OTHER NON-CURRENT LIABILITIES"
},
{
"name": "PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES"
},
{
"name": "DEFERRED TAXES"
}
],
"name": "NON-CURRENT LIABILITIES"
}
],
"name": "LIABILITIES"
@@ -296,104 +418,27 @@
{
"children": [
{
"children": [
{
"name": "OTHER NON-OPERATING EXPENSES"
},
{
"name": "INTERESTS EXPENSES"
}
],
"name": "NON-OPERATING EXPENSES"
"name": "DIVIDENDS"
},
{
"children": [
{
"name": "RESEARCH AND DEVELOPMENT EXPENSES"
},
{
"children": [
{
"name": "Salaries, wages and commissions",
"root_type": "Expense"
},
{
"name": "Labour Health and Safety",
"root_type": "Expense"
},
{
"name": "Annuities",
"root_type": "Expense"
},
{
"name": "Labour Standards",
"root_type": "Expense"
},
{
"name": "Provincial Income Tax",
"root_type": "Expense"
},
{
"name": "Parental Insurance",
"root_type": "Expense"
},
{
"name": "Holidays",
"root_type": "Expense"
},
{
"name": "Federal Income Tax",
"root_type": "Expense"
},
{
"name": "Employment Insurance",
"root_type": "Expense"
},
{
"name": "Health Services Fund",
"root_type": "Expense"
}
],
"name": "LABOUR EXPENSES"
},
{
"name": "SALES EXPENSES"
},
{
"children": [
{
"name": "Purchases in non-harmonized provinces",
"root_type": "Expense"
},
{
"name": "International Purchases",
"root_type": "Expense"
},
{
"name": "Inside Purchases",
"root_type": "Expense"
},
{
"name": "Purchases in harmonized provinces",
"root_type": "Expense"
}
],
"name": "COST OF GOODS SOLD"
},
{
"name": "OTHER OPERATING EXPENSES"
},
{
"name": "GENERAL EXPENSES"
}
],
"name": "OPERATING EXPENSES"
"name": "TRANSLATION ADJUSTMENTS"
},
{
"name": "RETAINED EARNINGS"
},
{
"name": "SHARE CAPITAL"
},
{
"name": "PREMIUMS"
},
{
"name": "CONTRIBUTED SURPLUS"
}
],
"name": "EXPENSES"
"name": "EQUITY"
}
],
"name": "Account Chart CA EN",
"parent_id": null
"name": "Account Chart CA EN"
}
}

View File

@@ -7,10 +7,10 @@
{
"children": [
{
"name": "INT\u00c9R\u00caTS"
"name": "AUTRES PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION"
},
{
"name": "AUTRES PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION"
"name": "INT\u00c9R\u00caTS"
}
],
"name": "PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION"
@@ -18,23 +18,23 @@
{
"children": [
{
"name": "AUTRES PRODUITS D'EXPLOITATION"
"name": "Ventes avec des provinces harmonis\u00e9es",
"report_type": "Profit and Loss"
},
{
"name": "Ventes avec des provinces non-harmonis\u00e9es",
"root_type": "Income"
"report_type": "Profit and Loss"
},
{
"name": "AUTRES PRODUITS D'EXPLOITATION"
},
{
"name": "Ventes",
"root_type": "Income"
},
{
"name": "Ventes avec des provinces harmonis\u00e9es",
"root_type": "Income"
"report_type": "Profit and Loss"
},
{
"name": "Ventes \u00e0 l'\u00e9tranger",
"root_type": "Income"
"report_type": "Profit and Loss"
}
],
"name": "PRODUITS D'EXPLOITATION"
@@ -42,39 +42,248 @@
],
"name": "PRODUITS"
},
{
"children": [
{
"name": "AUTRES \u00c9L\u00c9MENTS DU R\u00c9SULTAT GLOBAL"
},
{
"name": "\u00c9CARTS DE CONVERSION"
},
{
"name": "SURPLUS D'APPORT"
},
{
"name": "PRIMES"
},
{
"name": "CAPITAL-ACTIONS"
},
{
"name": "B\u00c9N\u00c9FICES NON R\u00c9PARTIS"
},
{
"name": "DIVIDENDES"
}
],
"name": "CAPITAUX PROPRES"
},
{
"children": [
{
"children": [
{
"name": "FRAIS SUR VENTE"
"name": "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI"
},
{
"name": "IMP\u00d4TS DIFF\u00c9R\u00c9S"
},
{
"name": "AUTRES PASSIFS NON-COURANTS"
},
{
"name": "DETTES FINANCI\u00c8RES NON-COURANTES"
}
],
"name": "PASSIFS NON-COURANTS"
},
{
"children": [
{
"name": "AUTRES COMPTES CR\u00c9DITEURS"
},
{
"children": [
{
"name": "Achats dans des provinces harmonis\u00e9es",
"root_type": "Income"
},
{
"name": "Achats dans des provinces non-harmonis\u00e9es",
"root_type": "Income"
},
{
"name": "Achats \u00e0 l'\u00e9tranger",
"root_type": "Income"
},
{
"name": "Achats",
"root_type": "Expense"
"account_type": "Payable",
"name": "Comptes fournisseurs",
"report_type": "Balance Sheet"
}
],
"name": "CO\u00dbT DES PRODUITS VENDUS"
"name": "FOURNISSEURS ET COMPTES RATTACH\u00c9S"
},
{
"children": [
{
"children": [
{
"name": "TVH \u00e0 payer - 14%",
"report_type": "Balance Sheet"
},
{
"name": "TVH \u00e0 payer - 15%",
"report_type": "Balance Sheet"
},
{
"name": "TVH \u00e0 payer - 13%",
"report_type": "Balance Sheet"
}
],
"name": "TVH \u00e0 payer"
},
{
"name": "TVP/TVQ \u00e0 payer",
"report_type": "Balance Sheet"
},
{
"name": "TPS \u00e0 payer",
"report_type": "Balance Sheet"
}
],
"name": "IMP\u00d4TS \u00c0 PAYER"
},
{
"name": "DETTES FINANCI\u00c8RES COURANTES"
},
{
"children": [
{
"children": [
{
"name": "Fond des Services de Sant\u00e9 \u00e0 payer",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "AP - Contribution de l'employeur",
"report_type": "Balance Sheet"
},
{
"name": "AP - Contribution des employ\u00e9s",
"report_type": "Balance Sheet"
}
],
"name": "ASSURANCE PARENTALE \u00c0 PAYER"
},
{
"name": "Imp\u00f4t provincial sur les revenus",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Rentes - Contribution des employ\u00e9s",
"report_type": "Balance Sheet"
},
{
"name": "Rentes - Contribution de l'employeur",
"report_type": "Balance Sheet"
}
],
"name": "RENTES \u00c0 PAYER"
},
{
"name": "Sant\u00e9 et S\u00e9curit\u00e9 au Travail \u00e0 payer",
"report_type": "Balance Sheet"
},
{
"name": "Normes du Travail \u00e0 payer",
"report_type": "Balance Sheet"
}
],
"name": "AGENCE DU REVENU PROVINCIAL"
},
{
"children": [
{
"children": [
{
"name": "AE - Contribution des employ\u00e9s",
"report_type": "Balance Sheet"
},
{
"name": "AE - Contribution de l'employeur",
"report_type": "Balance Sheet"
}
],
"name": "ASSURANCE EMPLOI \u00c0 PAYER"
},
{
"name": "Imp\u00f4t f\u00e9d\u00e9ral sur les revenus",
"report_type": "Balance Sheet"
}
],
"name": "AGENCE DU REVENU DU CANADA"
}
],
"name": "IMP\u00d4TS LI\u00c9S AUX SALAIRES \u00c0 PAYER"
},
{
"children": [
{
"name": "Stock re\u00e7u non factur\u00e9",
"report_type": "Balance Sheet"
}
],
"name": "PASSIFS DE STOCK"
},
{
"name": "PASSIFS LI\u00c9S AUX ACTIFS D\u00c9TENUS EN VUE DE LEUR CESSION"
}
],
"name": "PASSIFS COURANTS"
}
],
"name": "PASSIF"
},
{
"children": [
{
"children": [
{
"name": "FRAIS G\u00c9N\u00c9RAUX"
},
{
"children": [
{
"name": "Imp\u00f4t f\u00e9d\u00e9ral",
"report_type": "Profit and Loss"
},
{
"name": "Assurance parentale",
"report_type": "Profit and Loss"
},
{
"name": "Imp\u00f4t provincial",
"report_type": "Profit and Loss"
},
{
"name": "Rentes",
"report_type": "Profit and Loss"
},
{
"name": "Sant\u00e9 et s\u00e9curit\u00e9 au travail",
"report_type": "Profit and Loss"
},
{
"name": "Fonds des services de sant\u00e9",
"report_type": "Profit and Loss"
},
{
"name": "Normes du travail",
"report_type": "Profit and Loss"
},
{
"name": "Assurance Emploi",
"report_type": "Profit and Loss"
},
{
"name": "Salaires",
"report_type": "Profit and Loss"
},
{
"name": "Vacances",
"report_type": "Profit and Loss"
}
],
"name": "SALAIRES ET CHARGES SOCIALES"
},
{
"name": "AUTRES FRAIS D'EXPLOITATION"
},
{
"name": "FRAIS G\u00c9N\u00c9RAUX"
"name": "FRAIS SUR VENTE"
},
{
"name": "FRAIS DE RECHERCHE ET D\u00c9VELOPPEMENT"
@@ -82,47 +291,23 @@
{
"children": [
{
"name": "Vacances",
"root_type": "Expense"
"name": "Achats",
"report_type": "Profit and Loss"
},
{
"name": "Imp\u00f4t f\u00e9d\u00e9ral",
"root_type": "Expense"
"name": "Achats dans des provinces harmonis\u00e9es",
"report_type": "Profit and Loss"
},
{
"name": "Assurance Emploi",
"root_type": "Expense"
"name": "Achats dans des provinces non-harmonis\u00e9es",
"report_type": "Profit and Loss"
},
{
"name": "Fonds des services de sant\u00e9",
"root_type": "Expense"
},
{
"name": "Assurance parentale",
"root_type": "Expense"
},
{
"name": "Sant\u00e9 et s\u00e9curit\u00e9 au travail",
"root_type": "Expense"
},
{
"name": "Salaires",
"root_type": "Expense"
},
{
"name": "Rentes",
"root_type": "Expense"
},
{
"name": "Imp\u00f4t provincial",
"root_type": "Expense"
},
{
"name": "Normes du travail",
"root_type": "Expense"
"name": "Achats \u00e0 l'\u00e9tranger",
"report_type": "Profit and Loss"
}
],
"name": "SALAIRES ET CHARGES SOCIALES"
"name": "CO\u00dbT DES PRODUITS VENDUS"
}
],
"name": "CHARGES D'EXPLOITATION"
@@ -145,14 +330,6 @@
"children": [
{
"children": [
{
"children": [
{
"name": "BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS"
}
],
"name": "IMMOBILISATIONS INCORPORELLES"
},
{
"name": "PLACEMENTS DISPONIBLES \u00c0 LA VENTE"
},
@@ -163,56 +340,52 @@
}
],
"name": "IMMOBILISATIONS CORPORELLES"
},
{
"children": [
{
"name": "BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS"
}
],
"name": "IMMOBILISATIONS INCORPORELLES"
}
],
"name": "ACTIFS NON-COURANTS"
},
{
"children": [
{
"children": [
{
"name": "Stock",
"root_type": "Asset"
},
{
"name": "Stock exp\u00e9di\u00e9 non-factur\u00e9",
"root_type": "Asset"
}
],
"name": "STOCKS"
},
{
"name": "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE"
},
{
"name": "ENCAISSE"
},
{
"name": "CERTIFICATS DE D\u00c9P\u00d4TS"
},
{
"children": [
{
"name": "TVP/TVQ \u00e0 recevoir",
"root_type": "Asset"
},
{
"name": "TVH \u00e0 recevoir",
"root_type": "Asset"
},
{
"name": "TPS \u00e0 recevoir",
"root_type": "Asset"
}
],
"name": "IMP\u00d4TS \u00c0 RECEVOIR"
},
{
"name": "FRAIS PAY\u00c9S D'AVANCE"
},
{
"name": "PLACEMENTS D\u00c9TENUS \u00c0 DES FINS DE TRANSACTION"
"children": [
{
"name": "TPS \u00e0 recevoir",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "TVH \u00e0 recevoir - 13%",
"report_type": "Balance Sheet"
},
{
"name": "TVH \u00e0 recevoir - 14%",
"report_type": "Balance Sheet"
},
{
"name": "TVH \u00e0 recevoir - 15%",
"report_type": "Balance Sheet"
}
],
"name": "TVH \u00e0 recevoir"
},
{
"name": "TVP/TVQ \u00e0 recevoir",
"report_type": "Balance Sheet"
}
],
"name": "IMP\u00d4TS \u00c0 RECEVOIR"
},
{
"children": [
@@ -220,186 +393,43 @@
"name": "PROVISION POUR CR\u00c9ANCES DOUTEUSES"
},
{
"name": "Comptes clients"
"account_type": "Receivable",
"name": "Comptes clients",
"report_type": "Balance Sheet"
}
],
"name": "COMPTES CLIENTS"
},
{
"children": [
{
"name": "Stock exp\u00e9di\u00e9 non-factur\u00e9",
"report_type": "Balance Sheet"
},
{
"name": "Stock",
"report_type": "Balance Sheet"
}
],
"name": "STOCKS"
},
{
"name": "ENCAISSE"
},
{
"name": "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE"
},
{
"name": "CERTIFICATS DE D\u00c9P\u00d4TS"
},
{
"name": "PLACEMENTS D\u00c9TENUS \u00c0 DES FINS DE TRANSACTION"
}
],
"name": "ACTIFS COURANTS"
}
],
"name": "ACTIF"
},
{
"children": [
{
"name": "AUTRES \u00c9L\u00c9MENTS DU R\u00c9SULTAT GLOBAL"
},
{
"name": "B\u00c9N\u00c9FICES NON R\u00c9PARTIS"
},
{
"name": "PRIMES"
},
{
"name": "CAPITAL-ACTIONS"
},
{
"name": "\u00c9CARTS DE CONVERSION"
},
{
"name": "SURPLUS D'APPORT"
},
{
"name": "DIVIDENDES"
}
],
"name": "CAPITAUX PROPRES"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "TPS \u00e0 payer",
"root_type": "Liability"
},
{
"name": "TVH \u00e0 payer",
"root_type": "Liability"
},
{
"name": "TVP/TVQ \u00e0 payer",
"root_type": "Liability"
}
],
"name": "IMP\u00d4TS \u00c0 PAYER"
},
{
"children": [
{
"name": "Stock re\u00e7u non factur\u00e9",
"root_type": "Liability"
}
],
"name": "PASSIFS DE STOCK"
},
{
"name": "AUTRES COMPTES CR\u00c9DITEURS"
},
{
"name": "PASSIFS LI\u00c9S AUX ACTIFS D\u00c9TENUS EN VUE DE LEUR CESSION"
},
{
"name": "DETTES FINANCI\u00c8RES COURANTES"
},
{
"children": [
{
"name": "Comptes fournisseurs"
}
],
"name": "FOURNISSEURS ET COMPTES RATTACH\u00c9S"
},
{
"children": [
{
"children": [
{
"name": "Imp\u00f4t f\u00e9d\u00e9ral sur les revenus",
"root_type": "Liability"
},
{
"children": [
{
"name": "AE - Contribution de l'employeur",
"root_type": "Liability"
},
{
"name": "AE - Contribution des employ\u00e9s",
"root_type": "Liability"
}
],
"name": "ASSURANCE EMPLOI \u00c0 PAYER"
}
],
"name": "AGENCE DU REVENU DU CANADA"
},
{
"children": [
{
"children": [
{
"name": "Rentes - Contribution de l'employeur",
"root_type": "Liability"
},
{
"name": "Rentes - Contribution des employ\u00e9s",
"root_type": "Liability"
}
],
"name": "RENTES \u00c0 PAYER"
},
{
"name": "Normes du Travail \u00e0 payer",
"root_type": "Liability"
},
{
"name": "Imp\u00f4t provincial sur les revenus",
"root_type": "Liability"
},
{
"children": [
{
"name": "AP - Contribution des employ\u00e9s",
"root_type": "Liability"
},
{
"name": "AP - Contribution de l'employeur",
"root_type": "Liability"
}
],
"name": "ASSURANCE PARENTALE \u00c0 PAYER"
},
{
"name": "Fond des Services de Sant\u00e9 \u00e0 payer",
"root_type": "Liability"
},
{
"name": "Sant\u00e9 et S\u00e9curit\u00e9 au Travail \u00e0 payer",
"root_type": "Liability"
}
],
"name": "AGENCE DU REVENU PROVINCIAL"
}
],
"name": "IMP\u00d4TS LI\u00c9S AUX SALAIRES \u00c0 PAYER"
}
],
"name": "PASSIFS COURANTS"
},
{
"children": [
{
"name": "IMP\u00d4TS DIFF\u00c9R\u00c9S"
},
{
"name": "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI"
},
{
"name": "DETTES FINANCI\u00c8RES NON-COURANTES"
},
{
"name": "AUTRES PASSIFS NON-COURANTS"
}
],
"name": "PASSIFS NON-COURANTS"
}
],
"name": "PASSIF"
}
],
"name": "Account Chart CA FR"

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,653 @@
{
"name": "Chile - Plan de Cuentas",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Acreedor por Garant\u00edas Otorgadas"
},
{
"name": "Acreedor por Documentos Descontados"
},
{
"name": "Comitente por Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN ACREEDORAS"
},
{
"children": [
{
"name": "Documentos Endosados"
},
{
"name": "Documentos Descontados"
},
{
"name": "Garantias Otorgadas"
},
{
"name": "Dep\u00f3sito de Valores Recibos en Garant\u00eda"
},
{
"name": "Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN DEUDORAS"
}
],
"name": "Cuentas de Orden"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Recupero de Rezagos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Activo Fijo",
"report_type": "Profit and Loss"
},
{
"name": "Recupero de Deudores Incobrables",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta Inversiones Permanentes",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones obtenidas, ganandas, percibidas",
"report_type": "Profit and Loss"
}
],
"name": "Ingresos Fuera de Explotaci\u00f3n"
},
{
"children": [
{
"name": "Comisiones gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Descuentos gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Interese sobre Inversiones",
"report_type": "Profit and Loss"
},
{
"name": "Honorarios gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Ventas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Ventas"
},
{
"name": "Intereses gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Alquileres gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Acciones",
"report_type": "Profit and Loss"
}
],
"name": "Ingresos de Explotaci\u00f3n"
}
],
"name": "RESULTADO GANANCIA"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Publicidad y Propaganda",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Servicios P\u00fablicos"
},
{
"children": [
{
"name": "Costo de Mercader\u00edas Vendidas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Costo de Mercader\u00edas Vendidas"
},
{
"name": "Gastos en Amortizaci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Cargas Sociales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Sueldos y Jornales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos Bancarios"
},
{
"name": "Gastos en Impuestos"
},
{
"name": "Gastos en Depreciaci\u00f3n de Activo Fijo",
"report_type": "Profit and Loss"
}
],
"name": "Egresos de Explotaci\u00f3n"
},
{
"children": [
{
"name": "Gastos en Siniestros",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones Cedidas, Otorgadas",
"report_type": "Profit and Loss"
},
{
"name": "P\u00e9rdida Venta Activo Fijo",
"report_type": "Profit and Loss"
}
],
"name": "Egresos Fuera de Explotaci\u00f3n"
}
],
"name": "RESULTADO P\u00c9RDIDA"
}
],
"name": "Cuentas de Resultado"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Activo Fijo",
"report_type": "Balance Sheet"
}
],
"name": "Ajustes al Patrimonio"
},
{
"children": [
{
"name": "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Aportes No Capitalizados / Primas de Emsi\u00f3n",
"report_type": "Balance Sheet"
}
],
"name": "Aportes No Capitalizados"
},
{
"children": [
{
"name": "Capital / Dividendos a Distribuir en Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Capital / Acciones en Circulaci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Capital / Capital Propio",
"report_type": "Balance Sheet"
},
{
"name": "Capital / (-) Descuento de Emisi\u00f3n de Acciones",
"report_type": "Balance Sheet"
}
],
"name": "Capital"
},
{
"children": [
{
"name": "Resultados Acumulados",
"report_type": "Balance Sheet"
},
{
"name": "Resultado del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Utilidades y P\u00e9rdidas del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Resultados Acumulados del Ejercicio Anterior",
"report_type": "Balance Sheet"
}
],
"name": "Resultados No Asignados"
},
{
"children": [
{
"name": "Reserva para Renovaci\u00f3n de Activo Fijo",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Estatutaria",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Facultativa",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Legal",
"report_type": "Balance Sheet"
}
],
"name": "Futuras Eventualidades"
}
],
"name": "PATRIMONIO"
},
{
"children": [
{
"children": [
{
"name": "Remuneraciones por Pagar / Retenciones a Depositar",
"report_type": "Balance Sheet"
},
{
"name": "Remuneraciones por Pagar / Sueldos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Remuneraciones por Pagar / Provisi\u00f3n para Sueldo Anual Complementario",
"report_type": "Balance Sheet"
},
{
"name": "Remuneraciones por Pagar / Cargas Sociales a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Remuneraciones por Pagar"
},
{
"children": [
{
"name": "Otras Cuentas por Pagar / Acreedores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Honorarios Directores y S\u00edndicos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Dividendos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Cobros por Adelantado",
"report_type": "Balance Sheet"
}
],
"name": "Otras Cuentas por Pagar"
},
{
"children": [
{
"name": "Provisiones / Previsi\u00f3n para Garant\u00edas por Service",
"report_type": "Balance Sheet"
},
{
"name": "Provisiones / Previsi\u00f3n para juicios Pendientes",
"report_type": "Balance Sheet"
},
{
"name": "Provisiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos",
"report_type": "Balance Sheet"
}
],
"name": "Provisiones"
},
{
"children": [
{
"name": "Cuentas por Pagar / Anticipos de Clientes",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Pagar / (-) Intereses a Devengar por Compras al Cr\u00e9dito",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Pagar / Proveedores",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas por Pagar"
},
{
"children": [
{
"name": "Pasivo Circulante / Debentures Emitidos",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Intereses a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Obligaciones a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Prestamos",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Adelantos en Cuenta Corriente",
"report_type": "Balance Sheet"
}
],
"name": "Pasivo Circulante"
},
{
"children": [
{
"name": "Impuestos por Pagar / IVA a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Impuestos por Pagar / Impuesto a la Renta a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Impuestos por Pagar"
}
],
"name": "PASIVOS"
},
{
"children": [
{
"name": "Cuentas por Cobrar / Anticipo de Impuestos",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Anticipos a Proveedores",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Pr\u00e9stamos otorgados",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Accionistas",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Intereses Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Alquileres Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / Anticipo al Personal",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / (-) Intereses (+) a Devengar",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar / (-) Previsi\u00f3n para Descuentos",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas por Cobrar"
},
{
"children": [
{
"name": "Documentos por Cobrar / Deudores por Ventas",
"report_type": "Balance Sheet"
},
{
"name": "Documentos por Cobrar / Deudores Morosos",
"report_type": "Balance Sheet"
},
{
"name": "Documentos por Cobrar / Deudores en Gesti\u00f3n Judicial",
"report_type": "Balance Sheet"
},
{
"name": "Documentos por Cobrar / Deudores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Documentos por Cobrar / (-) Previsi\u00f3n para Incobrables",
"report_type": "Balance Sheet"
}
],
"name": "Documentos por Cobrar"
},
{
"children": [
{
"children": [
{
"name": "Activo Circulante - Valores a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Activo Circulante.../ BCO. CTA CTE CLP",
"report_type": "Balance Sheet"
}
],
"name": "Activo Circulante - Bancos"
},
{
"name": "Activo Circulante - Recaudaciones a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Activo Circulante - Caja / efectivo CLP",
"report_type": "Balance Sheet"
}
],
"name": "Activo Circulante - Caja"
},
{
"children": [
{
"name": "Activo Circulante - Fondos fijos / caja chica 01 CLP",
"report_type": "Balance Sheet"
}
],
"name": "Activo Circulante - Fondos fijos"
},
{
"children": [
{
"name": "Activo Circulante - Caja / efectivo USD",
"report_type": "Balance Sheet"
}
],
"name": "Activo Circulante - Moneda Extranjera"
}
],
"name": "Activo Circulante"
},
{
"children": [
{
"children": [
{
"name": "Existencias - Mercader\u00edas / Categoria de productos 01",
"report_type": "Balance Sheet"
}
],
"name": "Existencias - Mercader\u00edas"
},
{
"name": "Materias primas",
"report_type": "Balance Sheet"
},
{
"name": "Existencias - Mercader\u00edas en Tr\u00e1nsito",
"report_type": "Balance Sheet"
},
{
"name": "Productos Elaborados",
"report_type": "Balance Sheet"
},
{
"name": "Productos en Curso de Elaboraci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Existencias",
"report_type": "Balance Sheet"
},
{
"name": "Materiales Varios ",
"report_type": "Balance Sheet"
}
],
"name": "Existencias"
},
{
"children": [
{
"name": "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Permanentes",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / T\u00edtulos P\u00fablicos",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Transitorias",
"report_type": "Balance Sheet"
}
],
"name": "Inversiones Financieras"
},
{
"children": [
{
"name": "Activo Intangible / (-) Amortizaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Marcas y Patentes de Invenci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Concesiones y Franquicias",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Derecho de Llaves",
"report_type": "Balance Sheet"
}
],
"name": "Activo Intangible"
},
{
"children": [
{
"name": "Activo Fijo / Inmuebles",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Maquinaria",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Material Rodante Motorizado",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / (-) Depreciaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Equipos",
"report_type": "Balance Sheet"
}
],
"name": "Activo Fijo"
}
],
"name": "ACTIVOS"
}
],
"name": "inventario del Balance General"
},
{
"children": [
{
"children": [
{
"name": "Compras - Categoria de productos 01"
}
],
"name": "Compras"
},
{
"name": "Costos de Producci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Comercializaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Cuentas de Movimiento"
}
],
"name": "Chile"
}
}

View File

@@ -3,452 +3,452 @@
"root": {
"children": [
{
"name": "\u957f\u671f\u5e94\u6536\u6b3e",
"root_type": "Asset"
},
{
"name": "\u94f6\u884c\u5b58\u6b3e",
"root_type": "Asset"
},
{
"name": "\u73b0\u91d1",
"root_type": "Asset"
},
{
"name": "\u8425\u4e1a\u7a0e\u91d1\u53ca\u9644\u52a0",
"root_type": "Expense"
},
{
"name": "\u5176\u4ed6\u4e1a\u52a1\u652f\u51fa",
"root_type": "Expense"
},
{
"name": "\u4e3b\u8425\u4e1a\u52a1\u6210\u672c",
"root_type": "Expense"
},
{
"name": "\u8d44\u672c\u516c\u79ef",
"root_type": "Liability"
},
{
"name": "\u9012\u5ef6\u6240\u5f97\u7a0e\u8d1f\u503a",
"root_type": "Liability"
},
{
"name": "\u56fa\u5b9a\u8d44\u4ea7",
"root_type": "Asset"
},
{
"name": "\u7d2f\u8ba1\u6298\u65e7",
"root_type": "Asset"
},
{
"name": "\u5f85\u5904\u7406\u8d22\u4ea7\u635f\u6ea2",
"root_type": "Asset"
},
{
"name": "\u5176\u4ed6\u4e1a\u52a1\u6536\u5165",
"root_type": "Income"
},
{
"name": "\u77ed\u671f\u501f\u6b3e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ed8\u804c\u5de5\u85aa\u916c",
"root_type": "Liability"
},
{
"name": "\u574f\u8d26\u51c6\u5907",
"root_type": "Asset"
},
{
"name": "\u5e94\u4ed8\u80a1\u5229",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ed8\u5229\u606f",
"root_type": "Liability"
},
{
"name": "\u957f\u671f\u6295\u8d44\u51cf\u503c\u51c6\u5907",
"root_type": "Asset"
},
{
"name": "\u957f\u671f\u80a1\u6743\u6295\u8d44",
"root_type": "Asset"
},
{
"name": "\u65e0\u5f62\u8d44\u4ea7",
"root_type": "Asset"
},
{
"name": "\u65e0\u5f62\u8d44\u4ea7\u51cf\u503c\u51c6\u5907",
"root_type": "Asset"
},
{
"name": "\u7d2f\u8ba1\u644a\u9500",
"root_type": "Asset"
},
{
"name": "\u5229\u6da6\u5206\u914d",
"root_type": "Liability"
},
{
"name": "\u76c8\u4f59\u516c\u79ef",
"root_type": "Liability"
},
{
"name": "\u672c\u5e74\u5229\u6da6",
"root_type": "Liability"
},
{
"name": "\u9884\u8ba1\u8d1f\u503a",
"root_type": "Liability"
},
{
"name": "\u8425\u4e1a\u5916\u652f\u51fa",
"root_type": "Expense"
},
{
"name": "\u957f\u671f\u501f\u6b3e",
"root_type": "Liability"
},
{
"name": "\u957f\u671f\u503a\u5238",
"root_type": "Liability"
},
{
"name": "\u957f\u671f\u5f85\u644a\u8d39\u7528",
"root_type": "Asset"
},
{
"name": "\u5e94\u6536\u7968\u636e",
"root_type": "Asset"
},
{
"name": "\u9884\u4ed8\u8d26\u6b3e",
"root_type": "Asset"
},
{
"name": "\u5e94\u6536\u8d26\u6b3e",
"root_type": "Asset"
},
{
"name": "\u516c\u5141\u4ef7\u503c\u53d8\u52a8\u635f\u76ca",
"root_type": "Income"
"name": "\u4ee5\u524d\u5e74\u5ea6\u635f\u76ca\u8c03\u6574",
"report_type": "Profit and Loss"
},
{
"name": "\u5236\u9020\u8d39\u7528",
"root_type": "Expense"
"report_type": "Profit and Loss"
},
{
"name": "\u4ea4\u6613\u6027\u91d1\u878d\u8d1f\u503a",
"root_type": "Liability"
},
{
"name": "\u4ea4\u6613\u6027\u91d1\u878d\u8d44\u4ea7",
"root_type": "Asset"
},
{
"name": "\u4ee3\u7406\u4e1a\u52a1\u8d1f\u503a",
"root_type": "Liability"
},
{
"name": "\u56fa\u5b9a\u8d44\u4ea7\u6e05\u7406",
"root_type": "Asset"
},
{
"name": "\u6240\u5f97\u7a0e",
"root_type": "Expense"
},
{
"name": "\u88ab\u5957\u671f\u9879\u76ee",
"root_type": "Liability"
},
{
"name": "\u5b9e\u6536\u8d44\u672c",
"root_type": "Liability"
},
{
"name": "\u59d4\u6258\u52a0\u5de5\u7269\u8d44",
"root_type": "Asset"
},
{
"name": "\u5546\u54c1\u8fdb\u9500\u5dee\u4ef7",
"root_type": "Asset"
},
{
"name": "\u5305\u88c5\u7269\u53ca\u4f4e\u503c\u6613\u8017\u54c1",
"root_type": "Asset"
},
{
"name": "\u9012\u5ef6\u6536\u76ca",
"root_type": "Liability"
},
{
"name": "\u8425\u4e1a\u5916\u6536\u5165",
"root_type": "Income"
},
{
"name": "\u7814\u53d1\u652f\u51fa",
"root_type": "Expense"
"name": "\u9884\u63d0\u8d39\u7528",
"report_type": "Balance Sheet"
},
{
"name": "\u5728\u5efa\u5de5\u7a0b",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u5de5\u7a0b\u7269\u8d44",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u56fa\u5b9a\u8d44\u4ea7\u51cf\u503c\u51c6\u5907",
"root_type": "Asset"
"name": "\u56fa\u5b9a\u8d44\u4ea7\u6e05\u7406",
"report_type": "Balance Sheet"
},
{
"name": "\u5176\u4ed6\u8d27\u5e01\u8d44\u91d1",
"root_type": "Asset"
"name": "\u56fa\u5b9a\u8d44\u4ea7",
"report_type": "Balance Sheet"
},
{
"name": "\u5176\u4ed6\u5e94\u6536\u6b3e",
"root_type": "Asset"
"name": "\u7d2f\u8ba1\u6298\u65e7",
"report_type": "Balance Sheet"
},
{
"name": "\u9500\u552e\u8d39\u7528",
"root_type": "Expense"
"name": "\u4ee3\u7406\u4e1a\u52a1\u8d1f\u503a",
"report_type": "Balance Sheet"
},
{
"name": "\u8d22\u52a1\u8d39\u7528",
"root_type": "Expense"
"name": "\u65e0\u5f62\u8d44\u4ea7",
"report_type": "Balance Sheet"
},
{
"name": "\u7ba1\u7406\u8d39\u7528",
"root_type": "Expense"
"name": "\u65e0\u5f62\u8d44\u4ea7\u51cf\u503c\u51c6\u5907",
"report_type": "Balance Sheet"
},
{
"name": "\u751f\u4ea7\u6210\u672c",
"root_type": "Expense"
"name": "\u7d2f\u8ba1\u644a\u9500",
"report_type": "Balance Sheet"
},
{
"name": "\u8425\u4e1a\u7a0e\u91d1\u53ca\u9644\u52a0",
"report_type": "Profit and Loss"
},
{
"name": "\u5176\u4ed6\u4e1a\u52a1\u652f\u51fa",
"report_type": "Profit and Loss"
},
{
"name": "\u4e3b\u8425\u4e1a\u52a1\u6210\u672c",
"report_type": "Profit and Loss"
},
{
"name": "\u7814\u53d1\u652f\u51fa",
"report_type": "Profit and Loss"
},
{
"name": "\u9884\u8ba1\u8d1f\u503a",
"report_type": "Balance Sheet"
},
{
"name": "\u9884\u6536\u8d26\u6b3e",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u7968\u636e",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u8d26\u6b3e",
"root_type": "Liability"
"name": "\u5546\u8a89",
"report_type": "Balance Sheet"
},
{
"name": "\u4e3b\u8425\u4e1a\u52a1\u6536\u5165",
"root_type": "Income"
"name": "\u6240\u5f97\u7a0e",
"report_type": "Profit and Loss"
},
{
"name": "\u6301\u6709\u81f3\u5230\u671f\u6295\u8d44",
"root_type": "Asset"
"name": "\u5176\u4ed6\u8d27\u5e01\u8d44\u91d1",
"report_type": "Balance Sheet"
},
{
"name": "\u672a\u5b9e\u73b0\u878d\u8d44\u6536\u76ca",
"report_type": "Balance Sheet"
},
{
"name": "\u5b58\u8d27\u8dcc\u4ef7\u51c6\u5907",
"report_type": "Balance Sheet"
},
{
"name": "\u8425\u4e1a\u5916\u652f\u51fa",
"report_type": "Profit and Loss"
},
{
"name": "\u53ef\u4f9b\u51fa\u552e\u91d1\u878d\u8d44\u4ea7",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u8425\u4e1a\u5916\u6536\u5165",
"report_type": "Profit and Loss"
},
{
"name": "\u957f\u671f\u501f\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u957f\u671f\u503a\u5238",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u804c\u5de5\u85aa\u916c",
"report_type": "Balance Sheet"
},
{
"name": "\u94f6\u884c\u5b58\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u73b0\u91d1",
"report_type": "Balance Sheet"
},
{
"name": "\u884d\u751f\u5de5\u5177",
"report_type": "Balance Sheet"
},
{
"name": "\u6301\u6709\u81f3\u5230\u671f\u6295\u8d44\u51cf\u503c\u51c6\u5907",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u5957\u671f\u5de5\u5177",
"report_type": "Balance Sheet"
},
{
"name": "\u751f\u4ea7\u6210\u672c",
"report_type": "Profit and Loss"
},
{
"name": "\u5b9e\u6536\u8d44\u672c",
"report_type": "Balance Sheet"
},
{
"name": "\u59d4\u6258\u52a0\u5de5\u7269\u8d44",
"report_type": "Balance Sheet"
},
{
"name": "\u5546\u54c1\u8fdb\u9500\u5dee\u4ef7",
"report_type": "Balance Sheet"
},
{
"name": "\u5305\u88c5\u7269\u53ca\u4f4e\u503c\u6613\u8017\u54c1",
"report_type": "Balance Sheet"
},
{
"name": "\u5229\u6da6\u5206\u914d",
"report_type": "Balance Sheet"
},
{
"name": "\u76c8\u4f59\u516c\u79ef",
"report_type": "Balance Sheet"
},
{
"name": "\u672c\u5e74\u5229\u6da6",
"report_type": "Balance Sheet"
},
{
"name": "\u8d44\u672c\u516c\u79ef",
"report_type": "Balance Sheet"
},
{
"name": "\u4ee3\u7406\u4e1a\u52a1\u8d44\u4ea7",
"report_type": "Balance Sheet"
},
{
"name": "\u9012\u5ef6\u6536\u76ca",
"report_type": "Balance Sheet"
},
{
"name": "\u9012\u5ef6\u6240\u5f97\u7a0e\u8d44\u4ea7",
"report_type": "Balance Sheet"
},
{
"name": "\u52b3\u52a1\u6210\u672c",
"root_type": "Expense"
"report_type": "Profit and Loss"
},
{
"name": "\u6301\u6709\u81f3\u5230\u671f\u6295\u8d44",
"report_type": "Balance Sheet"
},
{
"name": "\u5e93\u5b58\u5546\u54c1",
"report_type": "Balance Sheet"
},
{
"name": "\u53d1\u51fa\u5546\u54c1",
"report_type": "Balance Sheet"
},
{
"name": "\u6750\u6599\u6210\u672c\u5dee\u5f02",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u8d26\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u5728\u9014\u7269\u8d44",
"report_type": "Balance Sheet"
},
{
"name": "\u539f\u6750\u6599",
"report_type": "Balance Sheet"
},
{
"name": "\u6750\u6599\u91c7\u8d2d",
"report_type": "Balance Sheet"
},
{
"name": "\u957f\u671f\u80a1\u6743\u6295\u8d44",
"report_type": "Balance Sheet"
},
{
"name": "\u6295\u8d44\u6027\u623f\u5730\u4ea7",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u957f\u671f\u6295\u8d44\u51cf\u503c\u51c6\u5907",
"report_type": "Balance Sheet"
},
{
"name": "\u5176\u4ed6\u5e94\u6536\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u957f\u671f\u5f85\u644a\u8d39\u7528",
"report_type": "Balance Sheet"
},
{
"name": "\u9012\u5ef6\u6240\u5f97\u7a0e\u8d1f\u503a",
"report_type": "Balance Sheet"
},
{
"name": "\u88ab\u5957\u671f\u9879\u76ee",
"report_type": "Balance Sheet"
},
{
"name": "\u4ea4\u6613\u6027\u91d1\u878d\u8d1f\u503a",
"report_type": "Balance Sheet"
},
{
"name": "\u9500\u552e\u8d39\u7528",
"report_type": "Profit and Loss"
},
{
"name": "\u574f\u8d26\u51c6\u5907",
"report_type": "Balance Sheet"
},
{
"name": "\u8d22\u52a1\u8d39\u7528",
"report_type": "Profit and Loss"
},
{
"name": "\u7ba1\u7406\u8d39\u7528",
"report_type": "Profit and Loss"
},
{
"children": [
{
"children": [
{
"name": "\u8fdb\u9879\u7a0e\u989d\u8f6c\u51fa",
"root_type": "Liability"
},
{
"name": "\u51fa\u53e3\u9000\u7a0e",
"root_type": "Liability"
},
{
"name": "\u9500\u9879\u7a0e\u989d",
"root_type": "Liability"
},
{
"name": "\u51cf\u514d\u7a0e\u6b3e",
"root_type": "Liability"
},
{
"name": "\u8f6c\u51fa\u672a\u4ea4\u589e\u503c\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5df2\u4ea4\u7a0e\u91d1",
"root_type": "Liability"
},
{
"name": "\u8fdb\u9879\u7a0e\u989d",
"root_type": "Liability"
},
{
"name": "\u8f6c\u51fa\u591a\u4ea4\u589e\u503c\u7a0e",
"root_type": "Liability"
},
{
"name": "\u51fa\u53e3\u62b5\u51cf\u5185\u9500\u4ea7\u54c1\u5e94\u7eb3\u7a0e\u989d",
"root_type": "Liability"
},
{
"name": "\u672a\u4ea4\u589e\u503c\u7a0e",
"root_type": "Liability"
}
],
"name": "\u5e94\u4ea4\u589e\u503c\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u8425\u4e1a\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u6d88\u8d39\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u8d44\u6e90\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u6240\u5f97\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u571f\u5730\u589e\u503c\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u57ce\u5e02\u7ef4\u62a4\u5efa\u8bbe\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u623f\u4ea7\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u571f\u5730\u4f7f\u7528\u7a0e",
"root_type": "Liability"
},
{
"name": "\u5e94\u4ea4\u4e2a\u4eba\u6240\u5f97\u7a0e",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u8f66\u8239\u4f7f\u7528\u7a0e",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "\u8fdb\u9879\u7a0e\u989d\u8f6c\u51fa",
"report_type": "Balance Sheet"
},
{
"name": "\u51fa\u53e3\u9000\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u9500\u9879\u7a0e\u989d",
"report_type": "Balance Sheet"
},
{
"name": "\u51cf\u514d\u7a0e\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u8f6c\u51fa\u672a\u4ea4\u589e\u503c\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u8fdb\u9879\u7a0e\u989d",
"report_type": "Balance Sheet"
},
{
"name": "\u8f6c\u51fa\u591a\u4ea4\u589e\u503c\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u51fa\u53e3\u62b5\u51cf\u5185\u9500\u4ea7\u54c1\u5e94\u7eb3\u7a0e\u989d",
"report_type": "Balance Sheet"
},
{
"name": "\u5df2\u4ea4\u7a0e\u91d1",
"report_type": "Balance Sheet"
},
{
"name": "\u672a\u4ea4\u589e\u503c\u7a0e",
"report_type": "Balance Sheet"
}
],
"name": "\u5e94\u4ea4\u589e\u503c\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u8425\u4e1a\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u6d88\u8d39\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u8d44\u6e90\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u6240\u5f97\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u571f\u5730\u589e\u503c\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u57ce\u5e02\u7ef4\u62a4\u5efa\u8bbe\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u623f\u4ea7\u7a0e",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ea4\u571f\u5730\u4f7f\u7528\u7a0e",
"report_type": "Balance Sheet"
}
],
"name": "\u5e94\u4ea4\u7a0e\u8d39",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "\u884d\u751f\u5de5\u5177",
"root_type": "Liability"
"name": "\u56fa\u5b9a\u8d44\u4ea7\u51cf\u503c\u51c6\u5907",
"report_type": "Balance Sheet"
},
{
"name": "\u5957\u671f\u5de5\u5177",
"root_type": "Liability"
"name": "\u5e94\u6536\u7968\u636e",
"report_type": "Balance Sheet"
},
{
"name": "\u5f85\u644a\u8d39\u7528",
"root_type": "Asset"
"name": "\u9884\u4ed8\u8d26\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u9884\u63d0\u8d39\u7528",
"root_type": "Liability"
},
{
"name": "\u5546\u8a89",
"root_type": "Asset"
},
{
"name": "\u672a\u5b9e\u73b0\u878d\u8d44\u6536\u76ca",
"root_type": "Asset"
},
{
"name": "\u9012\u5ef6\u6240\u5f97\u7a0e\u8d44\u4ea7",
"root_type": "Asset"
"name": "\u5e94\u6536\u8d26\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u8d44\u4ea7\u51cf\u503c\u635f\u5931",
"root_type": "Expense"
"report_type": "Profit and Loss"
},
{
"name": "\u957f\u671f\u5e94\u6536\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u5f85\u644a\u8d39\u7528",
"report_type": "Balance Sheet"
},
{
"name": "\u6295\u8d44\u6536\u76ca",
"root_type": "Income"
"report_type": "Profit and Loss"
},
{
"name": "\u5e94\u6536\u5229\u606f",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u80a1\u5229",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u4ed8\u5229\u606f",
"report_type": "Balance Sheet"
},
{
"name": "\u5e94\u6536\u80a1\u5229",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "\u672a\u786e\u8ba4\u878d\u8d44\u8d39\u7528",
"root_type": "Liability"
},
{
"name": "\u957f\u671f\u5e94\u4ed8\u6b3e",
"root_type": "Liability"
},
{
"name": "\u4ee5\u524d\u5e74\u5ea6\u635f\u76ca\u8c03\u6574",
"root_type": "Income"
},
{
"name": "\u5b58\u8d27\u8dcc\u4ef7\u51c6\u5907",
"root_type": "Asset"
},
{
"name": "\u4ee3\u7406\u4e1a\u52a1\u8d44\u4ea7",
"root_type": "Asset"
"name": "\u4e3b\u8425\u4e1a\u52a1\u6536\u5165",
"report_type": "Profit and Loss"
},
{
"name": "\u5e93\u5b58\u80a1",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "\u5e93\u5b58\u5546\u54c1",
"root_type": "Asset"
"name": "\u5f85\u5904\u7406\u8d22\u4ea7\u635f\u6ea2",
"report_type": "Balance Sheet"
},
{
"name": "\u53d1\u51fa\u5546\u54c1",
"root_type": "Asset"
"name": "\u672a\u786e\u8ba4\u878d\u8d44\u8d39\u7528",
"report_type": "Balance Sheet"
},
{
"name": "\u6750\u6599\u6210\u672c\u5dee\u5f02",
"root_type": "Asset"
"name": "\u957f\u671f\u5e94\u4ed8\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u5728\u9014\u7269\u8d44",
"root_type": "Asset"
"name": "\u5176\u4ed6\u4e1a\u52a1\u6536\u5165",
"report_type": "Profit and Loss"
},
{
"name": "\u539f\u6750\u6599",
"root_type": "Asset"
"name": "\u4ea4\u6613\u6027\u91d1\u878d\u8d44\u4ea7",
"report_type": "Balance Sheet"
},
{
"name": "\u6750\u6599\u91c7\u8d2d",
"root_type": "Asset"
"name": "\u77ed\u671f\u501f\u6b3e",
"report_type": "Balance Sheet"
},
{
"name": "\u516c\u5141\u4ef7\u503c\u53d8\u52a8\u635f\u76ca",
"report_type": "Profit and Loss"
}
],
"name": "\u4f1a\u8ba1\u79d1\u76ee"

View File

@@ -0,0 +1,726 @@
{
"name": "Costa Rica - Company 0",
"root": {
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "0-Veh\u00edculos"
},
{
"name": "0-Equipo de c\u00f3mputo"
},
{
"name": "0-Moibliario y equipo de oficina"
},
{
"name": "0-Herramientas mayores"
},
{
"name": "0-Maquinaria y equipo de edificios"
}
],
"name": "0-Activos depreciables m\u00f3viles"
},
{
"children": [
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Edificios \u2013 Revaluaciones"
},
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Edificios \u2013 Valores originales"
}
],
"name": "0-Edificios"
},
{
"children": [
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Mejoras a edificios \u2013 Revaluaciones"
},
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Mejoras a edificios \u2013 Valores originales"
}
],
"name": "0-Mejoras a edificios"
}
],
"name": "0-Activo fijo depreciable"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "0-Terreno 1"
}
],
"name": "0-Valores originales"
},
{
"children": [
{
"name": "0-Terreno 1"
}
],
"name": "0-Revaluaciones"
}
],
"name": "0-Terrenos"
}
],
"name": "0-Activo fijo no depreciable"
}
],
"name": "0-Activo fijo"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "0-Cuenta PayPal 1"
}
],
"name": "0-PayPal"
},
{
"children": [
{
"name": "0-Fondos en tr\u00e1nsito en bancos"
},
{
"name": "0-Fondos en tr\u00e1nsito de PayPal a Bancos"
},
{
"name": "0-Fondos en tr\u00e1nsito en tesorer\u00eda"
}
],
"name": "0-Fondos en tr\u00e1nsito"
},
{
"children": [
{
"children": [
{
"name": "0-Fondo de caja oficinas centrales USD"
}
],
"name": "0-Fondos de caja USD"
},
{
"children": [
{
"name": "0-Fondo de caja oficinas centrales CRC"
}
],
"name": "0-Fondos de caja CRC"
}
],
"name": "0-Fondos de caja"
},
{
"children": [
{
"name": "0-Inversi\u00f3n 1"
}
],
"name": "0-Inversiones a la vista"
},
{
"children": [
{
"children": [
{
"name": "0-Cuenta en USD 1"
}
],
"name": "0-Cuentas corrientes USD"
},
{
"children": [
{
"name": "0-Cuenta en CRC 1"
}
],
"name": "0-Cuentas corrientes CRC"
}
],
"name": "0-Bancos"
}
],
"name": "0-Activo circulante disponible"
},
{
"children": [
{
"children": [
{
"name": "0-Inventario de producto para la venta"
},
{
"name": "0-Inventario de consumibles"
}
],
"name": "0-Inventarios"
}
],
"name": "0-Activo circulante realizable"
},
{
"children": [
{
"name": "0-Cuentas por cobrar a empleados"
},
{
"name": "0-Cuentas por cobrar a compa\u00f1\u00edas relacionadas"
},
{
"name": "0-Cuentas por cobrar comerciales"
},
{
"name": "0-Inversiones de corto plazo"
},
{
"name": "0-Otras cuentas por cobrar"
}
],
"name": "0-Activo circulante exigible"
}
],
"name": "0-Activo circulante"
},
{
"children": [
{
"children": [
{
"name": "0-P\u00f3lizas de seguros prepagadas"
}
],
"name": "0-Gastos pagados por anticipado"
},
{
"children": [
{
"name": "0-Dep\u00f3sitos sobre conexiones de Internet"
},
{
"name": "0-Dep\u00f3sitos sobre locales en alquiler"
},
{
"name": "0-Dep\u00f3sitos sobre derechos telef\u00f3nicos"
}
],
"name": "0-Dep\u00f3sitos de garant\u00eda"
}
],
"name": "0-Otros activos"
},
{
"children": [
{
"children": [
{
"name": "0-Dep. ac. de herramientas mayores"
},
{
"name": "0-Dep. ac. de mobiliario y equipo de oficina"
},
{
"name": "0-Dep. ac. de maquinaria y equipo de edificios"
},
{
"name": "0-Dep. ac. de equipo de c\u00f3mputo"
},
{
"name": "0-Dep. ac. de veh\u00edculos"
}
],
"name": "0-Dep. ac. de activos depreciables m\u00f3viles"
},
{
"children": [
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Dep. ac. de edificios \u2013 Valores originales"
},
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Dep. ac. de edificios \u2013 Revaluaciones"
}
],
"name": "0-Dep. ac. de edificios"
},
{
"children": [
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Dep. ac. de mejoras a edificios \u2013 Revaluaciones"
},
{
"children": [
{
"name": "0-Edificio 1"
}
],
"name": "0-Dep. ac. de mejoras a edificios \u2013 Valores originales"
}
],
"name": "0-Dep. ac. de mejoras a edificios"
}
],
"name": "0-Depreciaciones acumuladas sobre activo fijo depreciable"
}
],
"name": "0-Activo"
},
{
"children": [
{
"children": [
{
"name": "0-Gastos Financieros"
},
{
"name": "0-Depreciaci\u00f3n de activo fijo"
},
{
"name": "0-Ajustes"
},
{
"name": "0-Perdida por robo"
},
{
"name": "0-Donaciones deducibles"
}
],
"name": "0-Otros gastos"
},
{
"children": [
{
"name": "0-Donaciones no deducibles"
},
{
"name": "0-Multas"
},
{
"name": "0-Gastos de presidencia"
},
{
"name": "0-Diferencial cambiario"
}
],
"name": "0-Gastos no deducibles"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "0-Cesant\u00eda"
},
{
"name": "0-Comisiones"
},
{
"name": "0-Cargas patronales"
},
{
"name": "0-Aguinaldo"
},
{
"name": "0-Preaviso"
},
{
"name": "0-Salarios"
},
{
"name": "0-Extras"
},
{
"name": "0-Bonificaciones"
}
],
"name": "0-Salarios y deducciones"
},
{
"children": [
{
"name": "0-Transporte"
},
{
"name": "0-Hospedaje"
},
{
"name": "0-Alimentaci\u00f3n"
}
],
"name": "0-Vi\u00e1ticos"
}
],
"name": "0-Gastos de personal"
},
{
"children": [
{
"name": "0-Categor\u00eda 1"
}
],
"name": "0-Servicios profesionales"
},
{
"children": [
{
"name": "0-Campa\u00f1as publicitarias"
},
{
"name": "0-Dise\u00f1o de imagen"
}
],
"name": "0-Gastos de mercadeo"
},
{
"children": [
{
"name": "0-Costo de producto"
},
{
"name": "0-Costo de producci\u00f3n"
},
{
"name": "0-Costo de materia prima"
},
{
"name": "0-Costo de distribuci\u00f3n"
},
{
"name": "0-Costo de almacenamiento"
}
],
"name": "0-Costo de venta de producto"
}
],
"name": "0-Gastos operativos"
},
{
"children": [
{
"children": [
{
"name": "0-Departamento 1"
}
],
"name": "0-Equipo de c\u00f3mputo y comunicaci\u00f3n"
},
{
"children": [
{
"name": "0-Departamento 1"
}
],
"name": "0-Suministros de oficina"
},
{
"children": [
{
"children": [
{
"name": "0-Medidor 1"
}
],
"name": "0-Luz"
},
{
"children": [
{
"name": "0-Medidor 1"
}
],
"name": "0-Agua"
},
{
"children": [
{
"name": "0-Contrato 1"
}
],
"name": "0-Internet"
},
{
"children": [
{
"name": "0-Tel\u00e9fono 1"
}
],
"name": "0-Tel\u00e9fono"
}
],
"name": "0-Servicios p\u00fablicos"
},
{
"children": [
{
"name": "0-Compa\u00f1\u00eda administradora 1"
}
],
"name": "0-Cuota por administraci\u00f3n"
},
{
"children": [
{
"name": "0-Oficina 1"
}
],
"name": "0-Alquiler"
}
],
"name": "0-Gastos administrativos"
}
],
"name": "0-Gastos principales"
}
],
"name": "0-Gastos"
},
{
"children": [
{
"children": [
{
"name": "0-Socio 1",
"report_type": "Balance Sheet"
}
],
"name": "0-Aportes de capital"
},
{
"children": [
{
"name": "0-Socio 1",
"report_type": "Balance Sheet"
}
],
"name": "0-Capital social"
},
{
"children": [
{
"name": "0-Balance inicial",
"report_type": "Balance Sheet"
}
],
"name": "0-Balance inicial"
},
{
"children": [
{
"name": "0-Superavit ganado",
"report_type": "Balance Sheet"
},
{
"name": "0-Superavit por revaluaci\u00f3n de activos",
"report_type": "Balance Sheet"
},
{
"name": "0-Super\u00e1vit de capital",
"report_type": "Balance Sheet"
}
],
"name": "0-Cuentas de super\u00e1vit"
},
{
"children": [
{
"name": "0-Reserva para mejoras",
"report_type": "Balance Sheet"
},
{
"name": "0-Reserva para proyectos",
"report_type": "Balance Sheet"
}
],
"name": "0-Otras reservas"
},
{
"children": [
{
"name": "0-Reserva legal",
"report_type": "Balance Sheet"
}
],
"name": "0-Reserva legal"
},
{
"children": [
{
"name": "0-Periodo 1",
"report_type": "Balance Sheet"
}
],
"name": "0-Utilidad o p\u00e9rdida acumulada de periodos anteriores"
},
{
"children": [
{
"name": "0-Utilidad o p\u00e9rdida del per\u00edodo actual",
"report_type": "Balance Sheet"
}
],
"name": "0-Utilidad o p\u00e9rdida del per\u00edodo actual"
}
],
"name": "0-Patrimonio"
},
{
"children": [
{
"children": [
{
"name": "0-Donaciones"
},
{
"name": "0-Ajustes"
}
],
"name": "0-Otros ingresos"
},
{
"children": [
{
"name": "0-Intereses ganados sobre cuentas corrientes"
}
],
"name": "0-Ingresos financieros"
},
{
"children": [
{
"name": "0-Diferencial cambiario"
}
],
"name": "0-Ingresos no gravables"
},
{
"name": "0-Ingresos por ventas"
},
{
"children": [
{
"name": "0-Cuota por administraci\u00f3n"
}
],
"name": "0-Ingresos por administraci\u00f3n"
}
],
"name": "0-Ingresos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "0-Cuentas por pagar de provisiones"
},
{
"name": "0-Cuentas por pagar a empleados"
},
{
"name": "0-Cuentas por pagar a proveedores"
},
{
"name": "0-Cuentas por pagar a compa\u00f1\u00edas relacionadas"
}
],
"name": "0-Cuentas por pagar"
},
{
"children": [
{
"children": [
{
"name": "0-Impuesto de ventas pagado"
},
{
"name": "0-Impuesto de ventas por pagar"
}
],
"name": "0-Impuesto de ventas"
},
{
"children": [
{
"name": "0-Adelantos de impuesto de renta"
},
{
"name": "0-Retenciones de impuesto de renta"
},
{
"name": "0-Impuesto de renta por pagar"
}
],
"name": "0-Impuesto de renta"
}
],
"name": "0-Impuestos"
}
],
"name": "0-Pasivo circulante"
}
],
"name": "0-Pasivo"
}
],
"name": "0-Plan Contable",
"parent_id": null
}
}

View File

@@ -0,0 +1,708 @@
{
"name": "Costa Rica - Company 1",
"root": {
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "xImpuesto de renta por pagar"
},
{
"name": "xAdelantos de impuesto de renta"
},
{
"name": "xRetenciones de impuesto de renta"
}
],
"name": "xImpuesto de renta"
},
{
"children": [
{
"name": "xImpuesto de ventas pagado"
},
{
"name": "xImpuesto de ventas por pagar"
}
],
"name": "xImpuesto de ventas"
}
],
"name": "xImpuestos"
},
{
"children": [
{
"name": "xCuentas por pagar a compa\u00f1\u00edas relacionadas"
},
{
"name": "xCuentas por pagar a empleados"
},
{
"name": "xCuentas por pagar a proveedores"
},
{
"name": "xCuentas por pagar de provisiones"
}
],
"name": "xCuentas por pagar"
}
],
"name": "xPasivo circulante"
}
],
"name": "xPasivo"
},
{
"children": [
{
"children": [
{
"name": "xReserva para mejoras",
"report_type": "Balance Sheet"
},
{
"name": "xReserva para proyectos",
"report_type": "Balance Sheet"
}
],
"name": "xOtras reservas"
},
{
"children": [
{
"name": "xSocio 1",
"report_type": "Balance Sheet"
}
],
"name": "xAportes de capital"
},
{
"children": [
{
"name": "xUtilidad o p\u00e9rdida del per\u00edodo actual",
"report_type": "Balance Sheet"
}
],
"name": "xUtilidad o p\u00e9rdida del per\u00edodo actual"
},
{
"children": [
{
"name": "xBalance inicial",
"report_type": "Balance Sheet"
}
],
"name": "xBalance inicial"
},
{
"children": [
{
"name": "xReserva legal",
"report_type": "Balance Sheet"
}
],
"name": "xReserva legal"
},
{
"children": [
{
"name": "xSuperavit ganado",
"report_type": "Balance Sheet"
},
{
"name": "xSuperavit por revaluaci\u00f3n de activos",
"report_type": "Balance Sheet"
},
{
"name": "xSuper\u00e1vit de capital",
"report_type": "Balance Sheet"
}
],
"name": "xCuentas de super\u00e1vit"
},
{
"children": [
{
"name": "xSocio 1",
"report_type": "Balance Sheet"
}
],
"name": "xCapital social"
},
{
"children": [
{
"name": "xPeriodo 1",
"report_type": "Balance Sheet"
}
],
"name": "xUtilidad o p\u00e9rdida acumulada de periodos anteriores"
}
],
"name": "xPatrimonio"
},
{
"children": [
{
"children": [
{
"name": "xDiferencial cambiario"
},
{
"name": "xMultas"
},
{
"name": "xGastos de presidencia"
},
{
"name": "xDonaciones no deducibles"
}
],
"name": "xGastos no deducibles"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "xTransporte"
},
{
"name": "xHospedaje"
},
{
"name": "xAlimentaci\u00f3n"
}
],
"name": "xVi\u00e1ticos"
},
{
"children": [
{
"name": "xCesant\u00eda"
},
{
"name": "xComisiones"
},
{
"name": "xCargas patronales"
},
{
"name": "xAguinaldo"
},
{
"name": "xPreaviso"
},
{
"name": "xSalarios"
},
{
"name": "xExtras"
},
{
"name": "xBonificaciones"
}
],
"name": "xSalarios y deducciones"
}
],
"name": "xGastos de personal"
},
{
"children": [
{
"name": "xCampa\u00f1as publicitarias"
},
{
"name": "xDise\u00f1o de imagen"
}
],
"name": "xGastos de mercadeo"
},
{
"children": [
{
"name": "xCosto de distribuci\u00f3n"
},
{
"name": "xCosto de almacenamiento"
},
{
"name": "xCosto de producto"
},
{
"name": "xCosto de producci\u00f3n"
},
{
"name": "xCosto de materia prima"
}
],
"name": "xCosto de venta de producto"
},
{
"children": [
{
"name": "xCategor\u00eda 1"
}
],
"name": "xServicios profesionales"
}
],
"name": "xGastos operativos"
},
{
"children": [
{
"children": [
{
"name": "xDepartamento 1"
}
],
"name": "xSuministros de oficina"
},
{
"children": [
{
"name": "xCompa\u00f1\u00eda administradora 1"
}
],
"name": "xCuota por administraci\u00f3n"
},
{
"children": [
{
"name": "xOficina 1"
}
],
"name": "xAlquiler"
},
{
"children": [
{
"children": [
{
"name": "xMedidor 1"
}
],
"name": "xAgua"
},
{
"children": [
{
"name": "xMedidor 1"
}
],
"name": "xLuz"
},
{
"children": [
{
"name": "xTel\u00e9fono 1"
}
],
"name": "xTel\u00e9fono"
},
{
"children": [
{
"name": "xContrato 1"
}
],
"name": "xInternet"
}
],
"name": "xServicios p\u00fablicos"
},
{
"children": [
{
"name": "xDepartamento 1"
}
],
"name": "xEquipo de c\u00f3mputo y comunicaci\u00f3n"
}
],
"name": "xGastos administrativos"
}
],
"name": "xGastos principales"
},
{
"children": [
{
"name": "xGastos Financieros"
},
{
"name": "xDepreciaci\u00f3n de activo fijo"
},
{
"name": "xAjustes"
},
{
"name": "xPerdida por robo"
},
{
"name": "xDonaciones deducibles"
}
],
"name": "xOtros gastos"
}
],
"name": "xGastos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "xBancos"
},
{
"children": [
{
"children": [
{
"name": "xFondo de caja oficinas centrales USD"
}
],
"name": "xFondos de caja USD"
},
{
"children": [
{
"name": "xFondo de caja oficinas centrales CRC"
}
],
"name": "xFondos de caja CRC"
}
],
"name": "xFondos de caja"
},
{
"children": [
{
"name": "xFondos en tr\u00e1nsito en bancos"
},
{
"name": "xFondos en tr\u00e1nsito de PayPal a Bancos"
},
{
"name": "xFondos en tr\u00e1nsito en tesorer\u00eda"
}
],
"name": "xFondos en tr\u00e1nsito"
},
{
"children": [
{
"name": "xInversi\u00f3n 1"
}
],
"name": "xInversiones a la vista"
},
{
"children": [
{
"name": "xCuenta PayPal 1"
}
],
"name": "xPayPal"
}
],
"name": "xActivo circulante disponible"
},
{
"children": [
{
"children": [
{
"name": "xInventario de producto para la venta"
},
{
"name": "xInventario de consumibles"
}
],
"name": "xInventarios"
}
],
"name": "xActivo circulante realizable"
},
{
"children": [
{
"name": "xInversiones de corto plazo"
},
{
"name": "xOtras cuentas por cobrar"
},
{
"name": "xCuentas por cobrar a empleados"
},
{
"name": "xCuentas por cobrar a compa\u00f1\u00edas relacionadas"
},
{
"name": "xCuentas por cobrar comerciales"
}
],
"name": "xActivo circulante exigible"
}
],
"name": "xActivo circulante"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "xTerreno 1"
}
],
"name": "xValores originales"
},
{
"children": [
{
"name": "xTerreno 1"
}
],
"name": "xRevaluaciones"
}
],
"name": "xTerrenos"
}
],
"name": "xActivo fijo no depreciable"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xEdificios \u2013 Revaluaciones"
},
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xEdificios \u2013 Valores originales"
}
],
"name": "xEdificios"
},
{
"children": [
{
"name": "xMoibliario y equipo de oficina"
},
{
"name": "xHerramientas mayores"
},
{
"name": "xMaquinaria y equipo de edificios"
},
{
"name": "xVeh\u00edculos"
},
{
"name": "xEquipo de c\u00f3mputo"
}
],
"name": "xActivos depreciables m\u00f3viles"
},
{
"children": [
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xMejoras a edificios \u2013 Valores originales"
},
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xMejoras a edificios \u2013 Revaluaciones"
}
],
"name": "xMejoras a edificios"
}
],
"name": "xActivo fijo depreciable"
}
],
"name": "xActivo fijo"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xDep. ac. de edificios \u2013 Revaluaciones"
},
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xDep. ac. de edificios \u2013 Valores originales"
}
],
"name": "xDep. ac. de edificios"
},
{
"children": [
{
"name": "xDep. ac. de herramientas mayores"
},
{
"name": "xDep. ac. de mobiliario y equipo de oficina"
},
{
"name": "xDep. ac. de maquinaria y equipo de edificios"
},
{
"name": "xDep. ac. de equipo de c\u00f3mputo"
},
{
"name": "xDep. ac. de veh\u00edculos"
}
],
"name": "xDep. ac. de activos depreciables m\u00f3viles"
},
{
"children": [
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xDep. ac. de mejoras a edificios \u2013 Valores originales"
},
{
"children": [
{
"name": "xEdificio 1"
}
],
"name": "xDep. ac. de mejoras a edificios \u2013 Revaluaciones"
}
],
"name": "xDep. ac. de mejoras a edificios"
}
],
"name": "xDepreciaciones acumuladas sobre activo fijo depreciable"
},
{
"children": [
{
"children": [
{
"name": "xDep\u00f3sitos sobre conexiones de Internet"
},
{
"name": "xDep\u00f3sitos sobre locales en alquiler"
},
{
"name": "xDep\u00f3sitos sobre derechos telef\u00f3nicos"
}
],
"name": "xDep\u00f3sitos de garant\u00eda"
},
{
"children": [
{
"name": "xP\u00f3lizas de seguros prepagadas"
}
],
"name": "xGastos pagados por anticipado"
}
],
"name": "xOtros activos"
}
],
"name": "xActivo"
},
{
"children": [
{
"children": [
{
"name": "xDonaciones"
},
{
"name": "xAjustes"
}
],
"name": "xOtros ingresos"
},
{
"children": [
{
"name": "xIntereses ganados sobre cuentas corrientes"
}
],
"name": "xIngresos financieros"
},
{
"name": "xIngresos por ventas"
},
{
"children": [
{
"name": "xCuota por administraci\u00f3n"
}
],
"name": "xIngresos por administraci\u00f3n"
},
{
"children": [
{
"name": "xDiferencial cambiario"
}
],
"name": "xIngresos no gravables"
}
],
"name": "xIngresos"
}
],
"name": "xPlan Contable",
"parent_id": null
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,489 @@
{
"name": "Ethiopia Tax and Account Chart Template",
"root": {
"children": [
{
"children": [
{
"name": "Other"
},
{
"name": "Purchase Returns and Allowances"
},
{
"name": "Cost of Goods and Services"
},
{
"name": "Inventory Adjustments"
}
],
"name": "COST OF GOODS SOLD"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Commercial Loan"
}
],
"name": "Foreign Loans"
},
{
"children": [
{
"name": "Commercial Loan"
}
],
"name": "Local Loans"
}
],
"name": "Long-Term Debt"
},
{
"children": [
{
"children": [
{
"name": "Retention on contract"
}
],
"name": "Retentions"
},
{
"children": [
{
"name": "Pension contribution payable"
},
{
"name": "Trade Creditors"
},
{
"name": "Grace period payables"
},
{
"name": "VAT Payable"
},
{
"name": "Witholding Payable"
},
{
"name": "Salary payable"
},
{
"name": "Federal Income Tax"
}
],
"name": "Accounts Payable"
},
{
"children": [
{
"name": "Other deposits"
}
],
"name": "Deposits"
}
],
"name": "Payables"
}
],
"name": "LIABILITIES"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Allowances to contract staff"
},
{
"name": "Allowances to permanent staff"
},
{
"name": "Allowances to external contract staff"
}
],
"name": "Allowances/benefits"
},
{
"children": [
{
"name": "Contribution to permanent staff pensions"
}
],
"name": "Pension Contributions"
},
{
"children": [
{
"name": "Wages to contract staff"
},
{
"name": "Salaries to permanent staff"
},
{
"name": "Miscellaneous payments to staff"
},
{
"name": "Wages to casual staff"
},
{
"name": "Wages to external contract staff"
}
],
"name": "Compensation"
}
],
"name": "PERSONNEL SERVICES"
},
{
"children": [
{
"children": [
{
"name": "Official entertainment"
},
{
"name": "Transport fees"
},
{
"name": "Per diem"
}
],
"name": "Travelling and Official Entertainment Services"
},
{
"children": [
{
"name": "Maintenance and repair of plant, machinery, and equipment"
},
{
"name": "Maintenance and repair of vehicles and other transport"
},
{
"name": "Maintenance and repair of buildings, furnishings and fixtures"
},
{
"name": "Maintenance and repair of infrastructure"
}
],
"name": "Maintenance and Repair Services"
},
{
"children": [
{
"name": "Agriculture, forestry and marine inputs"
},
{
"name": "Veterinary supplies and drugs"
},
{
"name": "Research and development supplies"
},
{
"name": "Miscellaneous equipment"
},
{
"name": "Other material and supplies"
},
{
"name": "Uniforms, clothing, bedding"
},
{
"name": "Printing"
},
{
"name": "Office supplies"
},
{
"name": "Educational supplies"
},
{
"name": "Medical supplies"
},
{
"name": "Fuel and lubricants"
},
{
"name": "Food"
}
],
"name": "Goods and Supplies"
},
{
"children": [
{
"name": "Local training"
},
{
"name": "External training"
}
],
"name": "Training Services"
},
{
"children": [
{
"name": "Water and other utilities"
},
{
"name": "Telecommunication charges"
},
{
"name": "Freight"
},
{
"name": "Insurance"
},
{
"name": "Electricity charges"
},
{
"name": "Fees and charges"
},
{
"name": "Contracted professional services"
},
{
"name": "Advertising"
},
{
"name": "Rent"
}
],
"name": "Contracted Services"
}
],
"name": "GOODS AND SERVICES"
},
{
"children": [
{
"children": [
{
"name": "Pre-construction activities"
},
{
"name": "Construction of buildings"
},
{
"name": "Construction of infrastructure"
}
],
"name": "Construction"
},
{
"children": [
{
"name": "Depreciation of vehicles and other vehicular transport"
},
{
"name": "Depreciation of plant, machinery and equipment"
},
{
"name": "Depreciation of buildings, furnishings and fixtures"
},
{
"name": "Depreciation of livestock and transport animals"
}
],
"name": "Fixed Assets"
}
],
"name": "FIXED ASSETS AND CONSTRUCTION"
},
{
"children": [
{
"children": [
{
"name": "Payments of interest and bank charges on local debt"
},
{
"name": "Payments on the principal of foreign debt"
},
{
"name": "Payments on the principal of local debt"
},
{
"name": "Payments of interest and bank charges on foreign debt"
}
],
"name": "Debt Payments"
}
],
"name": "OTHER PAYMENTS"
}
],
"name": "EXPENSES"
},
{
"children": [
{
"name": "Stock"
},
{
"children": [
{
"name": "Other Debtors"
},
{
"children": [
{
"name": "Advance to supplier"
},
{
"name": "Advance to contractors"
},
{
"name": "Advance to consultant"
}
],
"name": "Prepayments"
},
{
"children": [
{
"name": "VAT Withholding Receivable on Sales"
},
{
"name": "Trade Debtors"
},
{
"name": "Withholding Receivable on Sales"
},
{
"name": "VAT Receivable on Purchases"
},
{
"name": "Cash shortage"
},
{
"name": "Advance to staff"
},
{
"name": "Suspense"
},
{
"name": "Cash Registers"
}
],
"name": "Accounts Receivable"
}
],
"name": "Receivables"
},
{
"name": "Investments"
},
{
"name": "Long Term Loans"
},
{
"children": [
{
"name": "Finished Goods"
},
{
"name": "Work in Progress"
}
],
"name": "Production Stock"
},
{
"name": "Goods in Transit"
},
{
"children": [
{
"children": [
{
"name": "Construction of buildings"
},
{
"name": "Construction of infrastructure"
}
],
"name": "Construction in Progress"
},
{
"children": [
{
"name": "Plant machinery and equipment"
},
{
"name": "Furnishings and fixtures"
},
{
"name": "Aircraft, boats, etc"
},
{
"name": "Vehicles and other vehicular transport"
},
{
"name": "Infrastructure"
},
{
"name": "Buildings"
},
{
"name": "Livestock and tansport animals"
}
],
"name": "Property and Equipment"
}
],
"name": "Fixed Assets"
},
{
"children": [
{
"name": "Investments current assets"
},
{
"name": "Cash on hand and at bank"
},
{
"name": "Letter of Credit restricted account"
},
{
"name": "Cash at bank in foreigh currency"
}
],
"name": "Cash and Cash Equivalents"
}
],
"name": "ASSETS"
},
{
"children": [
{
"name": "Profit and loss account"
},
{
"name": "Reserves"
},
{
"name": "Share capital / equity"
}
],
"name": "NET ASSETS/EQUITY"
},
{
"children": [
{
"name": "Sales of Goods and Services"
}
],
"name": "REVENUE"
}
],
"name": "Ethiopia",
"parent_id": null
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,365 @@
{
"name": "Plantilla de cuentas de Guatemala (sencilla)",
"root": {
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "Impuestos",
"report_type": "Balance Sheet"
}
],
"name": "Impuestos"
},
{
"children": [
{
"name": "IVA por Pagar",
"report_type": "Balance Sheet"
}
],
"name": "IVA por Pagar"
},
{
"children": [
{
"name": "Cuentas y Documentos por Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas y Documentos por Pagar"
}
],
"name": "Pasivo Corto Plazo"
},
{
"children": [
{
"children": [
{
"name": "Anticipos",
"report_type": "Balance Sheet"
}
],
"name": "Cr\u00e9ditos Diferidos"
}
],
"name": "Cr\u00e9ditos Diferidos"
},
{
"children": [
{
"children": [
{
"name": "Provisi\u00f3n para Indemnizaciones",
"report_type": "Balance Sheet"
}
],
"name": "Provisi\u00f3n para Indemnizaciones"
}
],
"name": "Pasivo a Largo Plazo"
}
],
"name": "Pasivo"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Capital Autorizado, Suscr\u00edto y Pagado",
"report_type": "Balance Sheet"
},
{
"name": "Perdidas y Ganancias",
"report_type": "Balance Sheet"
},
{
"name": "Reservas",
"report_type": "Balance Sheet"
}
],
"name": "Patrimonio de los Accionistas"
}
],
"name": "Patrimonio de los Accionistas"
}
],
"name": "Patrimonio"
},
{
"children": [
{
"children": [
{
"name": "Inventario"
},
{
"children": [
{
"name": "Retenciones de IVA recibidas",
"report_type": "Balance Sheet"
},
{
"name": "IVA por Cobrar",
"report_type": "Balance Sheet"
}
],
"name": "IVA por Cobrar"
},
{
"children": [
{
"name": "Prestamos al Personal",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar Empresas Afilidas",
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar Generales",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas y Documentos por Cobrar"
},
{
"children": [
{
"name": "Caja Chica",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos"
}
],
"name": "Activo Corriente"
},
{
"children": [
{
"children": [
{
"name": "Propiedad, Planta y Equipo",
"report_type": "Balance Sheet"
}
],
"name": "Propiedad, Planta y Equipo"
},
{
"children": [
{
"name": "Depreciaciones Acumuladas",
"report_type": "Balance Sheet"
}
],
"name": "Depreciaciones Acumuladas"
}
],
"name": "No Corriente"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Organizaci\u00f3n",
"report_type": "Balance Sheet"
}
],
"name": "Gastos de Organizaci\u00f3n"
},
{
"children": [
{
"name": "Gastos por Amortizar",
"report_type": "Balance Sheet"
}
],
"name": "Gastos por Amortizar"
},
{
"children": [
{
"name": "Gastos Anticipados",
"report_type": "Balance Sheet"
}
],
"name": "Gastos Anticipados"
},
{
"children": [
{
"name": "Otros Activos",
"report_type": "Balance Sheet"
}
],
"name": "Otros Activos"
}
],
"name": "Diferido"
}
],
"name": "Activo"
}
],
"name": "Balance General"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "Gastos no Deducibles",
"report_type": "Profit and Loss"
}
],
"name": "Gastos no Deducibles"
}
],
"name": "Gastos no Deducibles"
},
{
"children": [
{
"children": [
{
"name": "Otros Gastos de Operaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Otros Gastos de Operaci\u00f3n"
},
{
"children": [
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Gastos de Administraci\u00f3n"
}
],
"name": "Gastos de Operaci\u00f3n"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Gastos de Ventas"
}
],
"name": "Gastos de Ventas"
}
],
"name": "Gastos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Otros Ingresos",
"report_type": "Profit and Loss"
}
],
"name": "Otros Ingresos"
}
],
"name": "Otros Ingresos"
},
{
"children": [
{
"children": [
{
"name": "Descuentos Sobre Ventas",
"report_type": "Profit and Loss"
},
{
"name": "Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Ventas Netas"
}
],
"name": "Ventas"
}
],
"name": "Ingresos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Intereses",
"report_type": "Profit and Loss"
},
{
"name": "Otros Gastos Financieros",
"report_type": "Profit and Loss"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Costos de Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Costos de Ventas"
}
],
"name": "Costos"
}
],
"name": "Egresos"
}
],
"name": "Estado de Resultados"
}
],
"name": "Plan contable de Guatemala (sencillo)"
}
}

View File

@@ -11,148 +11,17 @@
{
"children": [
{
"name": "Gastos de Ventas",
"root_type": "Expense"
"name": "Impuestos",
"report_type": "Balance Sheet"
}
],
"name": "Gastos de Ventas"
}
],
"name": "Gastos de Ventas"
},
{
"children": [
{
"children": [
{
"name": "Gastos no Deducibles",
"root_type": "Expense"
}
],
"name": "Gastos no Deducibles"
}
],
"name": "Gastos no Deducibles"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Administraci\u00f3n",
"root_type": "Expense"
}
],
"name": "Gastos de Administraci\u00f3n"
"name": "Impuestos"
},
{
"children": [
{
"name": "Otros Gastos de Operaci\u00f3n",
"root_type": "Expense"
}
],
"name": "Otros Gastos de Operaci\u00f3n"
}
],
"name": "Gastos de Operaci\u00f3n"
}
],
"name": "Gastos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Costos de Ventas",
"root_type": "Expense"
}
],
"name": "Costos de Ventas"
}
],
"name": "Costos"
}
],
"name": "Egresos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Intereses",
"root_type": "Expense"
},
{
"name": "Otros Gastos Financieros",
"root_type": "Expense"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Descuentos Sobre Ventas",
"root_type": "Income"
},
{
"name": "Ventas",
"root_type": "Income"
}
],
"name": "Ventas Netas"
}
],
"name": "Ventas"
},
{
"children": [
{
"children": [
{
"name": "Otros Ingresos",
"root_type": "Income"
}
],
"name": "Otros Ingresos"
}
],
"name": "Otros Ingresos"
}
],
"name": "Ingresos"
}
],
"name": "Estado de Resultados"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "ISV por Pagar",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "ISV por Pagar"
@@ -161,19 +30,10 @@
"children": [
{
"name": "Cuentas y Documentos por Pagar",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Cuentas y Documentos por Pagar"
},
{
"children": [
{
"name": "Impuestos",
"root_type": "Liability"
}
],
"name": "Impuestos"
}
],
"name": "Pasivo Corto Plazo"
@@ -184,7 +44,7 @@
"children": [
{
"name": "Anticipos",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Cr\u00e9ditos Diferidos"
@@ -198,7 +58,7 @@
"children": [
{
"name": "Provisi\u00f3n para Indemnizaciones",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Provisi\u00f3n para Indemnizaciones"
@@ -216,16 +76,16 @@
{
"children": [
{
"name": "Reservas",
"root_type": "Asset"
"name": "Capital Autorizado, Suscr\u00edto y Pagado",
"report_type": "Balance Sheet"
},
{
"name": "Perdidas y Ganancias",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "Capital Autorizado, Suscr\u00edto y Pagado",
"root_type": "Asset"
"name": "Reservas",
"report_type": "Balance Sheet"
}
],
"name": "Patrimonio de los Accionistas"
@@ -246,12 +106,12 @@
{
"children": [
{
"name": "ISV por Cobrar",
"root_type": "Asset"
"name": "Retenciones de ISV recibidas",
"report_type": "Balance Sheet"
},
{
"name": "Retenciones de ISV recibidas",
"root_type": "Asset"
"name": "ISV por Cobrar",
"report_type": "Balance Sheet"
}
],
"name": "ISV por Cobrar"
@@ -260,19 +120,19 @@
"children": [
{
"name": "Prestamos al Personal",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar Empresas Afilidas",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "Cuentas por Cobrar Generales",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Cuentas y Documentos por Cobrar"
@@ -281,7 +141,7 @@
"children": [
{
"name": "Caja Chica",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos"
@@ -295,7 +155,7 @@
"children": [
{
"name": "Propiedad, Planta y Equipo",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Propiedad, Planta y Equipo"
@@ -304,7 +164,7 @@
"children": [
{
"name": "Depreciaciones Acumuladas",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Depreciaciones Acumuladas"
@@ -318,7 +178,7 @@
"children": [
{
"name": "Gastos de Organizaci\u00f3n",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Gastos de Organizaci\u00f3n"
@@ -327,7 +187,7 @@
"children": [
{
"name": "Gastos por Amortizar",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Gastos por Amortizar"
@@ -336,7 +196,7 @@
"children": [
{
"name": "Gastos Anticipados",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Gastos Anticipados"
@@ -345,7 +205,7 @@
"children": [
{
"name": "Otros Activos",
"root_type": "Asset"
"report_type": "Balance Sheet"
}
],
"name": "Otros Activos"
@@ -358,6 +218,146 @@
}
],
"name": "Balance General"
},
{
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "Gastos no Deducibles",
"report_type": "Profit and Loss"
}
],
"name": "Gastos no Deducibles"
}
],
"name": "Gastos no Deducibles"
},
{
"children": [
{
"children": [
{
"name": "Otros Gastos de Operaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Otros Gastos de Operaci\u00f3n"
},
{
"children": [
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "Gastos de Administraci\u00f3n"
}
],
"name": "Gastos de Operaci\u00f3n"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Gastos de Ventas"
}
],
"name": "Gastos de Ventas"
}
],
"name": "Gastos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Otros Ingresos",
"report_type": "Profit and Loss"
}
],
"name": "Otros Ingresos"
}
],
"name": "Otros Ingresos"
},
{
"children": [
{
"children": [
{
"name": "Descuentos Sobre Ventas",
"report_type": "Profit and Loss"
},
{
"name": "Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Ventas Netas"
}
],
"name": "Ventas"
}
],
"name": "Ingresos"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Intereses",
"report_type": "Profit and Loss"
},
{
"name": "Otros Gastos Financieros",
"report_type": "Profit and Loss"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
}
],
"name": "Otros Gastos y Productos Financieros"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Costos de Ventas",
"report_type": "Profit and Loss"
}
],
"name": "Costos de Ventas"
}
],
"name": "Costos"
}
],
"name": "Egresos"
}
],
"name": "Estado de Resultados"
}
],
"name": "Plan contable de Honduras (sencillo)"

View File

@@ -0,0 +1,263 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
"""
Import chart of accounts from OpenERP sources
"""
from __future__ import unicode_literals
import os, json
import ast
from xml.etree import ElementTree as ET
from frappe.utils.csvutils import read_csv_content
from frappe.utils import cstr
import frappe
path = "/Users/nabinhait/Documents/openerp/openerp/addons"
accounts = {}
charts = {}
all_account_types = []
def go():
global accounts, charts
default_account_types = get_default_account_types()
country_dirs = []
for basepath, folders, files in os.walk(path):
basename = os.path.basename(basepath)
if basename.startswith("l10n_"):
country_dirs.append(basename)
for country_dir in country_dirs:
accounts, charts = {}, {}
country_path = os.path.join(path, country_dir)
manifest = ast.literal_eval(open(os.path.join(country_path, "__openerp__.py")).read())
data_files = manifest.get("data", []) + manifest.get("init_xml", []) + \
manifest.get("update_xml", [])
files_path = [os.path.join(country_path, d) for d in data_files]
xml_roots = get_xml_roots(files_path)
csv_content = get_csv_contents(files_path)
prefix = country_dir if csv_content else None
account_types = get_account_types(xml_roots.get("account.account.type", []),
csv_content.get("account.account.type", []), prefix)
account_types.update(default_account_types)
if xml_roots:
make_maps_for_xml(xml_roots, account_types, country_dir)
if csv_content:
make_maps_for_csv(csv_content, account_types, country_dir)
make_account_trees()
make_charts()
def get_default_account_types():
default_types_root = []
for file in ["data_account_type.xml"]:
default_types_root.append(ET.parse(os.path.join(path, "account", "data",
"data_account_type.xml")).getroot())
return get_account_types(default_types_root, None, prefix="account")
def get_xml_roots(files_path):
xml_roots = frappe._dict()
for filepath in files_path:
fname = os.path.basename(filepath)
if fname.endswith(".xml"):
tree = ET.parse(filepath)
root = tree.getroot()
for node in root[0].findall("record"):
if node.get("model") in ["account.account.template",
"account.chart.template", "account.account.type"]:
xml_roots.setdefault(node.get("model"), []).append(root)
break
return xml_roots
def get_csv_contents(files_path):
csv_content = {}
for filepath in files_path:
fname = os.path.basename(filepath)
for file_type in ["account.account.template", "account.account.type",
"account.chart.template"]:
if fname.startswith(file_type) and fname.endswith(".csv"):
with open(filepath, "r") as csvfile:
try:
csv_content.setdefault(file_type, [])\
.append(read_csv_content(csvfile.read()))
except Exception, e:
continue
return csv_content
def get_account_types(root_list, csv_content, prefix=None):
types = {}
account_type_map = {
'cash': 'Cash',
'bank': 'Bank',
'tr_cash': 'Cash',
'tr_bank': 'Bank',
'receivable': 'Receivable',
'tr_receivable': 'Receivable',
'account rec': 'Receivable',
'payable': 'Payable',
'tr_payable': 'Payable',
'equity': 'Equity',
'stocks': 'Stock',
'stock': 'Stock',
'tax': 'Tax',
'tr_tax': 'Tax',
'tax-out': 'Tax',
'tax-in': 'Tax',
'charges_personnel': 'Chargeable',
'fixed asset': 'Fixed Asset',
'cogs': 'Cost of Goods Sold',
}
for root in root_list:
for node in root[0].findall("record"):
if node.get("model")=="account.account.type":
data = {}
for field in node.findall("field"):
if field.get("name")=="report_type" and field.text.lower() != "none":
data["report_type"] = get_report_type(field.text.title())
if field.get("name")=="code" and field.text.lower() != "none" \
and account_type_map.get(field.text):
data["account_type"] = account_type_map[field.text]
node_id = prefix + "." + node.get("id") if prefix else node.get("id")
types[node_id] = data
if csv_content and csv_content[0][0]=="id":
for row in csv_content[1:]:
row_dict = dict(zip(csv_content[0], row))
data = {}
if row_dict.get("report_type"):
data["report_type"] = get_report_type(row_dict.get("report_type"))
if row_dict.get("code") and account_type_map.get(row_dict["code"]):
data["account_type"] = account_type_map[row_dict["code"]]
if data and data.get("id"):
node_id = prefix + "." + data.get("id") if prefix else data.get("id")
types[node_id] = data
return types
def get_report_type(report_type):
report_type_map = {
"asset": "Balance Sheet",
"liability": "Balance Sheet",
"equity": "Balance Sheet",
"expense": "Profit and Loss",
"income": "Profit and Loss"
}
for d in report_type_map:
if d in report_type.lower():
return report_type_map[d]
def make_maps_for_xml(xml_roots, account_types, country_dir):
"""make maps for `charts` and `accounts`"""
for model, root_list in xml_roots.iteritems():
for root in root_list:
for node in root[0].findall("record"):
if node.get("model")=="account.account.template":
data = {}
for field in node.findall("field"):
if field.get("name")=="name":
data["name"] = field.text
if field.get("name")=="parent_id":
parent_id = field.get("ref") or field.get("eval")
data["parent_id"] = parent_id
if field.get("name")=="user_type":
value = field.get("ref")
if account_types.get(value, {}).get("report_type"):
data["report_type"] = account_types[value]["report_type"]
if account_types.get(value, {}).get("account_type"):
data["account_type"] = account_types[value]["account_type"]
if data["account_type"] not in all_account_types:
all_account_types.append(data["account_type"])
data["children"] = []
accounts[node.get("id")] = data
if node.get("model")=="account.chart.template":
data = {}
for field in node.findall("field"):
if field.get("name")=="name":
data["name"] = field.text
if field.get("name")=="account_root_id":
data["account_root_id"] = field.get("ref")
data["id"] = country_dir
charts.setdefault(node.get("id"), {}).update(data)
def make_account_trees():
"""build tree hierarchy"""
for id in accounts.keys():
account = accounts[id]
if account.get("parent_id"):
if accounts.get(account["parent_id"]):
accounts[account["parent_id"]]["children"].append(account)
del account["parent_id"]
# remove empty children
for id in accounts.keys():
if "children" in accounts[id] and not accounts[id].get("children"):
del accounts[id]["children"]
def make_maps_for_csv(csv_content, account_types, country_dir):
for content in csv_content.get("account.account.template", []):
for row in content[1:]:
data = dict(zip(content[0], row))
account = {
"name": data.get("name"),
"parent_id": data.get("parent_id:id") or data.get("parent_id/id"),
"children": []
}
user_type = data.get("user_type/id") or data.get("user_type:id")
if account_types.get(user_type, {}).get("report_type"):
account["report_type"] = account_types[user_type]["report_type"]
if account_types.get(user_type, {}).get("account_type"):
account["account_type"] = account_types[user_type]["account_type"]
if account["account_type"] not in all_account_types:
all_account_types.append(account["account_type"])
accounts[data.get("id")] = account
if not account.get("parent_id") and data.get("chart_template_id:id"):
chart_id = data.get("chart_template_id:id")
charts.setdefault(chart_id, {}).update({"account_root_id": data.get("id")})
for content in csv_content.get("account.chart.template", []):
for row in content[1:]:
if row:
data = dict(zip(content[0], row))
charts.setdefault(data.get("id"), {}).update({
"account_root_id": data.get("account_root_id:id") or \
data.get("account_root_id/id"),
"name": data.get("name"),
"id": country_dir
})
def make_charts():
"""write chart files in app/setup/doctype/company/charts"""
for chart_id in charts:
src = charts[chart_id]
if not src.get("name") or not src.get("account_root_id"):
continue
if not src["account_root_id"] in accounts:
continue
filename = src["id"][5:] + "_" + chart_id
print "building " + filename
chart = {}
chart["name"] = src["name"]
chart["root"] = accounts[src["account_root_id"]]
with open(os.path.join("erpnext", "accounts", "doctype", "chart_of_accounts",
"charts", filename + ".json"), "w") as chartfile:
chartfile.write(json.dumps(chart, indent=1, sort_keys=True))
if __name__=="__main__":
go()

View File

@@ -0,0 +1,219 @@
{
"name": "India - Chart of Accounts for Private Ltd/Partnership",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Mortgage Loan Payable",
"report_type": "Balance Sheet"
},
{
"name": "Interest Payable",
"report_type": "Balance Sheet"
},
{
"name": "Wages Payable",
"report_type": "Balance Sheet"
},
{
"name": "Owner's Equity Accounts",
"report_type": "Balance Sheet"
},
{
"name": "Notes Payable",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Exice Duty Payable",
"report_type": "Balance Sheet"
},
{
"name": "Sales Tax Payable",
"report_type": "Balance Sheet"
},
{
"name": "Service Tax Payable",
"report_type": "Balance Sheet"
},
{
"name": "VAT Payable",
"report_type": "Balance Sheet"
}
],
"name": "Tax payable",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "Accounts Payable",
"report_type": "Balance Sheet"
},
{
"name": "Unearned Revenues",
"report_type": "Balance Sheet"
},
{
"name": "Reserve and Surplus Account",
"report_type": "Balance Sheet"
}
],
"name": "Liabilities",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Buildings",
"report_type": "Balance Sheet"
},
{
"name": "Supplies",
"report_type": "Balance Sheet"
},
{
"name": "Land",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "Accounts Receivable",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation - Equipment",
"report_type": "Balance Sheet"
},
{
"name": "Tax Receivable",
"report_type": "Balance Sheet"
},
{
"name": "Equipment",
"report_type": "Balance Sheet"
},
{
"account_type": "Cash",
"name": "Cash",
"report_type": "Balance Sheet"
},
{
"name": "Prepaid Insurance",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation - Buildings",
"report_type": "Balance Sheet"
},
{
"name": "Merchandise Inventory",
"report_type": "Balance Sheet"
}
],
"name": "Assets",
"report_type": "Balance Sheet"
}
],
"name": "Balance Sheet"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Salaries Expense",
"report_type": "Profit and Loss"
},
{
"name": "Wages Expense",
"report_type": "Profit and Loss"
},
{
"name": "Supplies Expense",
"report_type": "Profit and Loss"
},
{
"name": "Rent Expense",
"report_type": "Profit and Loss"
},
{
"name": "Utilities Expense",
"report_type": "Profit and Loss"
},
{
"name": "Telephone Expense",
"report_type": "Profit and Loss"
},
{
"name": "Advertising Expense",
"report_type": "Profit and Loss"
},
{
"name": "Depreciation Expense",
"report_type": "Profit and Loss"
}
],
"name": "Operating Expense Accounts",
"report_type": "Profit and Loss"
}
],
"name": "Expense",
"report_type": "Profit and Loss"
},
{
"children": [
{
"children": [
{
"name": "Interest Revenues",
"report_type": "Profit and Loss"
},
{
"name": "Gain on Sale of Assets",
"report_type": "Profit and Loss"
}
],
"name": "Non-Operating Revenue and Gains",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Product Sales",
"report_type": "Profit and Loss"
},
{
"name": "Service Revenues",
"report_type": "Profit and Loss"
}
],
"name": "Operating Revenue Accounts",
"report_type": "Profit and Loss"
}
],
"name": "Income",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Loss on Sale of Assets",
"report_type": "Profit and Loss"
}
],
"name": "Non-Operating Expenses and Losses",
"report_type": "Profit and Loss"
}
],
"name": "Profit And Loss"
}
],
"name": "Partnership/Private Firm Chart of Account"
}
}

View File

@@ -9,120 +9,120 @@
{
"children": [
{
"name": "Payroll Dept. Telephone",
"root_type": "Expense"
"name": "Sales - Division #1, Product Line 010",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Supplies",
"root_type": "Expense"
"name": "Sales - Division #3, Product Line 110",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Payroll Taxes",
"root_type": "Expense"
"name": "Sales - Division #1, Product Line 022",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Salaries",
"root_type": "Expense"
"name": "Sales - Division #2, Product Line 015",
"report_type": "Profit and Loss"
}
],
"name": "Payroll Dept. Expenses",
"root_type": "Expense"
"name": "Operating Revenues",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "COGS - Division #3, Product Line 110",
"root_type": "Expense"
},
{
"name": "COGS - Division #2, Product Line 015",
"root_type": "Expense"
},
{
"name": "COGS - Division #1, Product Line 022",
"root_type": "Expense"
},
{
"name": "COGS - Division #1, Product Line 010",
"root_type": "Expense"
"name": "Gain on Sale of Assets",
"report_type": "Profit and Loss"
}
],
"name": "Cost of Goods Sold",
"root_type": "Expense"
},
{
"children": [
{
"name": "Loss on Sale of Assets",
"root_type": "Expense"
}
],
"name": "Non-Operating Expenses and Losses",
"root_type": "Expense"
},
{
"children": [
{
"name": "Marketing Dept. Supplies",
"root_type": "Expense"
},
{
"name": "Marketing Dept. Salaries",
"root_type": "Expense"
},
{
"name": "Marketing Dept. Telephone",
"root_type": "Expense"
},
{
"name": "Marketing Dept. Payroll Taxes",
"root_type": "Expense"
}
],
"name": "Marketing Expenses",
"root_type": "Expense"
"name": "Non-Operating Revenue and Gains",
"report_type": "Profit and Loss"
}
],
"name": "Expense",
"root_type": "Expense"
"name": "Income",
"report_type": "Profit and Loss"
},
{
"children": [
{
"children": [
{
"name": "Gain on Sale of Assets",
"root_type": "Income"
"name": "Payroll Dept. Payroll Taxes",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Supplies",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Telephone",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Dept. Salaries",
"report_type": "Profit and Loss"
}
],
"name": "Non-Operating Revenue and Gains",
"root_type": "Income"
"name": "Payroll Dept. Expenses",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Sales - Division #1, Product Line 010",
"root_type": "Income"
"name": "Marketing Dept. Supplies",
"report_type": "Profit and Loss"
},
{
"name": "Sales - Division #1, Product Line 022",
"root_type": "Income"
"name": "Marketing Dept. Telephone",
"report_type": "Profit and Loss"
},
{
"name": "Sales - Division #3, Product Line 110",
"root_type": "Income"
"name": "Marketing Dept. Payroll Taxes",
"report_type": "Profit and Loss"
},
{
"name": "Sales - Division #2, Product Line 015",
"root_type": "Income"
"name": "Marketing Dept. Salaries",
"report_type": "Profit and Loss"
}
],
"name": "Operating Revenues",
"root_type": "Income"
"name": "Marketing Expenses",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "COGS - Division #1, Product Line 022",
"report_type": "Profit and Loss"
},
{
"name": "COGS - Division #2, Product Line 015",
"report_type": "Profit and Loss"
},
{
"name": "COGS - Division #3, Product Line 110",
"report_type": "Profit and Loss"
},
{
"name": "COGS - Division #1, Product Line 010",
"report_type": "Profit and Loss"
}
],
"name": "Cost of Goods Sold",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Loss on Sale of Assets",
"report_type": "Profit and Loss"
}
],
"name": "Non-Operating Expenses and Losses",
"report_type": "Profit and Loss"
}
],
"name": "Income",
"root_type": "Income"
"name": "Expense",
"report_type": "Profit and Loss"
}
],
"name": "Profit And Loss"
@@ -134,175 +134,185 @@
{
"children": [
{
"name": "Equipment",
"root_type": "Asset"
"account_type": "Cash",
"name": "Cash - Payroll Checking",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation - Equipment",
"root_type": "Asset"
"account_type": "Cash",
"name": "Petty Cash Fund",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation - Vehicles",
"root_type": "Asset"
"account_type": "Receivable",
"name": "Accounts Receivable",
"report_type": "Balance Sheet"
},
{
"name": "Buildings",
"root_type": "Asset"
"name": "Inventory",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation - Buildings",
"root_type": "Asset"
"name": "Tax Receivable",
"report_type": "Balance Sheet"
},
{
"name": "Vehicles",
"root_type": "Asset"
"name": "Supplies",
"report_type": "Balance Sheet"
},
{
"name": "Land",
"root_type": "Asset"
"account_type": "Cash",
"name": "Cash - Regular Checking",
"report_type": "Balance Sheet"
},
{
"name": "Prepaid Insurance",
"report_type": "Balance Sheet"
},
{
"name": "Allowance for Doubtful Accounts",
"report_type": "Balance Sheet"
}
],
"name": "Property, Plant, and Equipment",
"root_type": "Asset"
"name": "Current Assets",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Tax Receivable",
"root_type": "Asset"
"name": "Accumulated Depreciation - Vehicles",
"report_type": "Balance Sheet"
},
{
"name": "Inventory",
"root_type": "Asset"
"name": "Vehicles",
"report_type": "Balance Sheet"
},
{
"name": "Cash - Regular Checking"
"name": "Accumulated Depreciation - Buildings",
"report_type": "Balance Sheet"
},
{
"name": "Petty Cash Fund"
"name": "Equipment",
"report_type": "Balance Sheet"
},
{
"name": "Allowance for Doubtful Accounts",
"root_type": "Asset"
"name": "Land",
"report_type": "Balance Sheet"
},
{
"name": "Supplies",
"root_type": "Asset"
"name": "Buildings",
"report_type": "Balance Sheet"
},
{
"name": "Cash - Payroll Checking"
},
{
"name": "Accounts Receivable"
},
{
"name": "Prepaid Insurance",
"root_type": "Asset"
"name": "Accumulated Depreciation - Equipment",
"report_type": "Balance Sheet"
}
],
"name": "Current Assets",
"root_type": "Asset"
"name": "Property, Plant, and Equipment",
"report_type": "Balance Sheet"
}
],
"name": "Assets",
"root_type": "Asset"
"report_type": "Balance Sheet"
},
{
"children": [
{
"children": [
{
"name": "Discount on Bonds Payable",
"root_type": "Liability"
},
{
"name": "Mortgage Loan Payable",
"root_type": "Liability"
},
{
"name": "Bonds Payable",
"root_type": "Liability"
}
],
"name": "Long-term Liabilities",
"root_type": "Liability"
},
{
"children": [
{
"name": "Reserve and Surplus Account",
"root_type": "Liability"
},
{
"children": [
{
"name": "VAT Payable",
"root_type": "Liability"
"name": "Service Tax Payable",
"report_type": "Balance Sheet"
},
{
"name": "Exice Duty Payable",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Service Tax Payable",
"root_type": "Liability"
"name": "VAT Payable",
"report_type": "Balance Sheet"
},
{
"name": "Sales Tax Payable",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Tax payable",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Interest Payable",
"root_type": "Liability"
},
{
"name": "Accounts Payable"
},
{
"name": "Notes Payable - Credit Line #2",
"root_type": "Liability"
},
{
"name": "Notes Payable - Credit Line #1",
"root_type": "Liability"
},
{
"name": "Unearned Revenues",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Wages Payable",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Reserve and Surplus Account",
"report_type": "Balance Sheet"
},
{
"name": "Notes Payable - Credit Line #2",
"report_type": "Balance Sheet"
},
{
"name": "Unearned Revenues",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "Accounts Payable",
"report_type": "Balance Sheet"
},
{
"name": "Notes Payable - Credit Line #1",
"report_type": "Balance Sheet"
}
],
"name": "Current Liabilities",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Common Stock, No Par",
"root_type": "Liability"
"name": "Mortgage Loan Payable",
"report_type": "Balance Sheet"
},
{
"name": "Bonds Payable",
"report_type": "Balance Sheet"
},
{
"name": "Discount on Bonds Payable",
"report_type": "Balance Sheet"
}
],
"name": "Long-term Liabilities",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Treasury Stock",
"report_type": "Balance Sheet"
},
{
"name": "Retained Earnings",
"root_type": "Liability"
"report_type": "Balance Sheet"
},
{
"name": "Treasury Stock",
"root_type": "Liability"
"name": "Common Stock, No Par",
"report_type": "Balance Sheet"
}
],
"name": "Stockholders' Equity",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Liabilities",
"root_type": "Liability"
"report_type": "Balance Sheet"
}
],
"name": "Balance Sheet"

View File

@@ -0,0 +1,996 @@
{
"name": "Italy - Generic Chart of Accounts",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "canoni di leasing",
"report_type": "Profit and Loss"
},
{
"name": "fitti passivi",
"report_type": "Profit and Loss"
}
],
"name": "COSTI PER GODIMENTO BENI DI TERZI"
},
{
"children": [
{
"name": "merci c/rimanenze finali",
"report_type": "Profit and Loss"
},
{
"name": "materie di consumo c/rimanenze finali",
"report_type": "Profit and Loss"
},
{
"name": "materie di consumo c/esistenze iniziali",
"report_type": "Profit and Loss"
},
{
"name": "merci c/esistenze iniziali",
"report_type": "Profit and Loss"
},
{
"name": "premi su acquisti",
"report_type": "Profit and Loss"
},
{
"name": "resi su acquisti",
"report_type": "Profit and Loss"
},
{
"name": "ribassi e abbuoni attivi",
"report_type": "Profit and Loss"
},
{
"name": "merci c/acquisti",
"report_type": "Profit and Loss"
},
{
"name": "materie di consumo c/acquisti",
"report_type": "Profit and Loss"
},
{
"name": "merci c/apporti",
"report_type": "Profit and Loss"
}
],
"name": "COSTO DEL VENDUTO"
},
{
"children": [
{
"children": [
{
"name": "accantonamento per spese future",
"report_type": "Profit and Loss"
},
{
"name": "accantonamento per manutenzioni programmate",
"report_type": "Profit and Loss"
}
],
"name": "ALTRI ACCANTONAMENTI"
},
{
"children": [
{
"name": "accantonamento per responsabilit\u00e0 civile",
"report_type": "Profit and Loss"
}
],
"name": "ACCANTONAMENTI PER RISCHI"
}
],
"name": "ACCANTONAMENTI"
},
{
"children": [
{
"name": "oneri fiscali diversi",
"report_type": "Profit and Loss"
},
{
"name": "oneri vari",
"report_type": "Profit and Loss"
},
{
"name": "arrotondamenti passivi",
"report_type": "Profit and Loss"
},
{
"name": "sopravvenienze passive ordinarie diverse",
"report_type": "Profit and Loss"
},
{
"name": "perdite su crediti",
"report_type": "Profit and Loss"
},
{
"name": "minusvalenze ordinarie diverse",
"report_type": "Profit and Loss"
},
{
"name": "insussistenze passive ordinarie diverse",
"report_type": "Profit and Loss"
}
],
"name": "ONERI DIVERSI"
},
{
"children": [
{
"name": "ammortamento fabbricati",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento imballaggi durevoli",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento arredamento",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento automezzi",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento attrezzature commerciali",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento macchine d'ufficio",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento impianti e macchinari",
"report_type": "Profit and Loss"
}
],
"name": "AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI"
},
{
"children": [
{
"name": "altri costi per il personale",
"report_type": "Profit and Loss"
},
{
"name": "oneri sociali",
"report_type": "Profit and Loss"
},
{
"name": "salari e stipendi",
"report_type": "Profit and Loss"
},
{
"name": "TFRL",
"report_type": "Profit and Loss"
}
],
"name": "COSTI PER IL PERSONALE"
},
{
"children": [
{
"name": "ammortamento software",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento costi di impianto",
"report_type": "Profit and Loss"
},
{
"name": "ammortamento avviamento",
"report_type": "Profit and Loss"
}
],
"name": "AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI"
},
{
"children": [
{
"name": "costi di vigilanza",
"report_type": "Profit and Loss"
},
{
"name": "costi per i locali",
"report_type": "Profit and Loss"
},
{
"name": "costi per energia",
"report_type": "Profit and Loss"
},
{
"name": "costi di pubblicit\u00e0",
"report_type": "Profit and Loss"
},
{
"name": "costi di trasporto",
"report_type": "Profit and Loss"
},
{
"name": "costi postali",
"report_type": "Profit and Loss"
},
{
"name": "spese di incasso",
"report_type": "Profit and Loss"
},
{
"name": "provvigioni passive",
"report_type": "Profit and Loss"
},
{
"name": "costi di manutenzione e riparazione",
"report_type": "Profit and Loss"
},
{
"name": "costi di assicurazione",
"report_type": "Profit and Loss"
},
{
"name": "costi telefonici",
"report_type": "Profit and Loss"
},
{
"name": "costi di consulenze",
"report_type": "Profit and Loss"
},
{
"name": "costi di esercizio automezzi",
"report_type": "Profit and Loss"
}
],
"name": "COSTI PER SERVIZI"
},
{
"children": [
{
"name": "svalutazioni immobilizzazioni materiali",
"report_type": "Profit and Loss"
},
{
"name": "svalutazioni immobilizzazioni immateriali",
"report_type": "Profit and Loss"
},
{
"name": "svalutazione crediti",
"report_type": "Profit and Loss"
}
],
"name": "SVALUTAZIONI"
}
],
"name": "COSTI DELLA PRODUZIONE"
},
{
"children": [
{
"name": "imposte dell'esercizio",
"report_type": "Profit and Loss"
}
],
"name": "IMPOSTE DELL'ESERCIZIO"
},
{
"children": [
{
"children": [
{
"name": "banche c/sovvenzioni",
"report_type": "Balance Sheet"
},
{
"name": "mutui passivi",
"report_type": "Balance Sheet"
},
{
"name": "debiti v/altri finanziatori",
"report_type": "Balance Sheet"
},
{
"name": "banche c/c passivi",
"report_type": "Balance Sheet"
},
{
"name": "banche c/RIBA all'incasso",
"report_type": "Balance Sheet"
},
{
"name": "banche c/anticipi su fatture",
"report_type": "Balance Sheet"
},
{
"name": "banche c/cambiali all'incasso",
"report_type": "Balance Sheet"
}
],
"name": "DEBITI FINANZIARI"
},
{
"children": [
{
"name": "debiti per imposte",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "erario c/IVA",
"report_type": "Balance Sheet"
},
{
"name": "IVA n/debito",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "debiti per ritenute da versare",
"report_type": "Balance Sheet"
},
{
"name": "debiti per cauzioni",
"report_type": "Balance Sheet"
},
{
"name": "personale c/retribuzioni",
"report_type": "Balance Sheet"
},
{
"name": "clienti c/cessione",
"report_type": "Balance Sheet"
},
{
"name": "debiti v/istituti previdenziali",
"report_type": "Balance Sheet"
},
{
"name": "personale c/liquidazioni",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "creditori diversi",
"report_type": "Balance Sheet"
}
],
"name": "DEBITI DIVERSI"
},
{
"children": [
{
"name": "ratei passivi",
"report_type": "Balance Sheet"
},
{
"name": "risconti passivi",
"report_type": "Balance Sheet"
}
],
"name": "RATEI E RISCONTI PASSIVI"
},
{
"children": [
{
"name": "perdita d'esercizio",
"report_type": "Balance Sheet"
},
{
"name": "utile d'esercizio",
"report_type": "Balance Sheet"
},
{
"name": "patrimonio netto",
"report_type": "Balance Sheet"
},
{
"name": "titolare c/ritenute subite",
"report_type": "Balance Sheet"
},
{
"name": "prelevamenti extra gestione",
"report_type": "Balance Sheet"
}
],
"name": "PATRIMONIO NETTO"
},
{
"children": [
{
"name": "debiti per TFRL",
"report_type": "Balance Sheet"
}
],
"name": "TRATTAMENTO FINE RAPPORTO DI LAVORO"
},
{
"children": [
{
"name": "banca ... c/c",
"report_type": "Balance Sheet"
},
{
"name": "banca ... c/c",
"report_type": "Balance Sheet"
},
{
"name": "banca ... c/c",
"report_type": "Balance Sheet"
},
{
"name": "bilancio di chiusura",
"report_type": "Balance Sheet"
},
{
"name": "bilancio di apertura",
"report_type": "Balance Sheet"
},
{
"name": "istituti previdenziali",
"report_type": "Balance Sheet"
},
{
"name": "IVA c/liquidazioni",
"report_type": "Balance Sheet"
}
],
"name": "CONTI TRANSITORI E DIVERSI"
},
{
"children": [
{
"name": "merci da ricevere",
"report_type": "Balance Sheet"
},
{
"name": "fornitori c/impegni",
"report_type": "Balance Sheet"
},
{
"name": "impegni per beni in leasing",
"report_type": "Balance Sheet"
},
{
"name": "creditori c/leasing",
"report_type": "Balance Sheet"
},
{
"name": "clienti c/impegni",
"report_type": "Balance Sheet"
},
{
"name": "merci da consegnare",
"report_type": "Balance Sheet"
},
{
"name": "creditori per fideiussioni",
"report_type": "Balance Sheet"
},
{
"name": "depositanti beni",
"report_type": "Balance Sheet"
},
{
"name": "beni di terzi",
"report_type": "Balance Sheet"
},
{
"name": "creditori per avalli",
"report_type": "Balance Sheet"
},
{
"name": "rischi per avalli",
"report_type": "Balance Sheet"
},
{
"name": "rischi per effetti scontati",
"report_type": "Balance Sheet"
},
{
"name": "banche c/effetti scontati",
"report_type": "Balance Sheet"
},
{
"name": "rischi per fideiussioni",
"report_type": "Balance Sheet"
}
],
"name": "CONTI DEI SISTEMI SUPPLEMENTARI"
},
{
"children": [
{
"name": "fatture da ricevere",
"report_type": "Balance Sheet"
},
{
"name": "debiti da liquidare",
"report_type": "Balance Sheet"
},
{
"name": "cambiali passive",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "debiti v/fornitori",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "clienti c/acconti",
"report_type": "Balance Sheet"
}
],
"name": "DEBITI COMMERCIALI"
},
{
"children": [
{
"name": "fondo per imposte",
"report_type": "Balance Sheet"
},
{
"name": "fondo responsabilit\u00e0 civile",
"report_type": "Balance Sheet"
},
{
"name": "fondo spese future",
"report_type": "Balance Sheet"
},
{
"name": "fondo manutenzioni programmate",
"report_type": "Balance Sheet"
}
],
"name": "FONDI PER RISCHI E ONERI"
}
],
"name": "PASSIVO"
},
{
"children": [
{
"children": [
{
"name": "arrotondamenti attivi",
"report_type": "Profit and Loss"
},
{
"name": "proventi vari",
"report_type": "Profit and Loss"
},
{
"name": "insussistenze attive ordinarie diverse",
"report_type": "Profit and Loss"
},
{
"name": "plusvalenze ordinarie diverse",
"report_type": "Profit and Loss"
},
{
"name": "fitti attivi",
"report_type": "Profit and Loss"
},
{
"name": "sopravvenienze attive ordinarie diverse",
"report_type": "Profit and Loss"
}
],
"name": "RICAVI E PROVENTI DIVERSI"
},
{
"children": [
{
"name": "ribassi e abbuoni passivi",
"report_type": "Profit and Loss"
},
{
"name": "merci c/vendite",
"report_type": "Profit and Loss"
},
{
"name": "rimborsi spese di vendita",
"report_type": "Profit and Loss"
},
{
"name": "premi su vendite",
"report_type": "Profit and Loss"
},
{
"name": "resi su vendite",
"report_type": "Profit and Loss"
}
],
"name": "VENDITE E PRESTAZIONI"
}
],
"name": "VALORE DELLA PRODUZIONE"
},
{
"children": [
{
"children": [
{
"name": "sopravvenienze passive straordinarie",
"report_type": "Profit and Loss"
},
{
"name": "imposte esercizi precedenti",
"report_type": "Profit and Loss"
},
{
"name": "insussistenze passive straordinarie",
"report_type": "Profit and Loss"
},
{
"name": "minusvalenze straordinarie",
"report_type": "Profit and Loss"
}
],
"name": "ONERI STRAORDINARI"
},
{
"children": [
{
"name": "insussistenze attive straordinarie",
"report_type": "Profit and Loss"
},
{
"name": "sopravvenienze attive straordinarie",
"report_type": "Profit and Loss"
},
{
"name": "plusvalenze straordinarie",
"report_type": "Profit and Loss"
}
],
"name": "PROVENTI STRAORDINARI"
}
],
"name": "PROVENTI E ONERI STRAORDINARI"
},
{
"children": [
{
"children": [
{
"name": "mutui attivi",
"report_type": "Balance Sheet"
}
],
"name": "IMMOBILIZZAZIONI FINANZIARIE"
},
{
"children": [
{
"name": "fornitori immobilizzazioni c/acconti",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento impianti e macchinari",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento fabbricati",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento arredamento",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento automezzi",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento attrezzature commerciali",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento macchine d'ufficio",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento imballaggi durevoli",
"report_type": "Balance Sheet"
},
{
"name": "imballaggi durevoli",
"report_type": "Balance Sheet"
},
{
"name": "macchine d'ufficio",
"report_type": "Balance Sheet"
},
{
"name": "attrezzature commerciali",
"report_type": "Balance Sheet"
},
{
"name": "automezzi",
"report_type": "Balance Sheet"
},
{
"name": "arredamento",
"report_type": "Balance Sheet"
},
{
"name": "fabbricati",
"report_type": "Balance Sheet"
},
{
"name": "impianti e macchinari",
"report_type": "Balance Sheet"
}
],
"name": "IMMOBILIZZAZIONI MATERIALI"
},
{
"children": [
{
"name": "fondo ammortamento costi di impianto",
"report_type": "Balance Sheet"
},
{
"name": "avviamento",
"report_type": "Balance Sheet"
},
{
"name": "software",
"report_type": "Balance Sheet"
},
{
"name": "costi di impianto",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento software",
"report_type": "Balance Sheet"
},
{
"name": "fondo ammortamento avviamento",
"report_type": "Balance Sheet"
}
],
"name": "IMMOBILIZZAZIONI IMMATERIALI"
},
{
"children": [
{
"name": "fondo svalutazione crediti",
"report_type": "Balance Sheet"
},
{
"name": "fondo rischi su crediti",
"report_type": "Balance Sheet"
},
{
"name": "crediti da liquidare",
"report_type": "Balance Sheet"
},
{
"name": "crediti commerciali diversi",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "clienti c/spese anticipate",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "crediti v/clienti",
"report_type": "Balance Sheet"
},
{
"name": "cambiali allo sconto",
"report_type": "Balance Sheet"
},
{
"name": "cambiali all'incasso",
"report_type": "Balance Sheet"
},
{
"name": "cambiali attive",
"report_type": "Balance Sheet"
},
{
"name": "fatture da emettere",
"report_type": "Balance Sheet"
},
{
"name": "cambiali insolute",
"report_type": "Balance Sheet"
},
{
"name": "crediti insoluti",
"report_type": "Balance Sheet"
}
],
"name": "CREDITI COMMERCIALI"
},
{
"children": [
{
"name": "fornitori c/acconti",
"report_type": "Balance Sheet"
},
{
"name": "materie di consumo",
"report_type": "Balance Sheet"
},
{
"name": "merci",
"report_type": "Balance Sheet"
}
],
"name": "RIMANENZE"
},
{
"children": [
{
"name": "crediti v/istituti previdenziali",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "debitori diversi",
"report_type": "Balance Sheet"
},
{
"name": "personale c/acconti",
"report_type": "Balance Sheet"
},
{
"name": "crediti per cauzioni",
"report_type": "Balance Sheet"
},
{
"name": "crediti per ritenute subite",
"report_type": "Balance Sheet"
},
{
"name": "crediti per imposte",
"report_type": "Balance Sheet"
},
{
"name": "IVA n/credito",
"report_type": "Balance Sheet"
},
{
"name": "IVA c/acconto",
"report_type": "Balance Sheet"
},
{
"name": "crediti per IVA",
"report_type": "Balance Sheet"
},
{
"name": "imposte c/acconto",
"report_type": "Balance Sheet"
}
],
"name": "CREDITI DIVERSI"
},
{
"children": [
{
"name": "risconti attivi",
"report_type": "Balance Sheet"
},
{
"name": "ratei attivi",
"report_type": "Balance Sheet"
}
],
"name": "RATEI E RISCONTI ATTIVI"
},
{
"children": [
{
"account_type": "Cash",
"name": "assegni",
"report_type": "Balance Sheet"
},
{
"account_type": "Cash",
"name": "denaro in cassa",
"report_type": "Balance Sheet"
},
{
"account_type": "Cash",
"name": "valori bollati",
"report_type": "Balance Sheet"
},
{
"account_type": "Bank",
"name": "c/c postali",
"report_type": "Balance Sheet"
},
{
"account_type": "Bank",
"name": "banche c/c",
"report_type": "Balance Sheet"
}
],
"name": "DISPONIBILIT\u00c0 LIQUIDE"
}
],
"name": "ATTIVO"
},
{
"children": [
{
"children": [
{
"name": "proventi finanziari diversi",
"report_type": "Profit and Loss"
},
{
"name": "interessi attivi v/clienti",
"report_type": "Profit and Loss"
},
{
"name": "interessi attivi bancari",
"report_type": "Profit and Loss"
},
{
"name": "interessi attivi postali",
"report_type": "Profit and Loss"
}
],
"name": "PROVENTI FINANZIARI"
},
{
"children": [
{
"name": "oneri finanziari diversi",
"report_type": "Profit and Loss"
},
{
"name": "interessi passivi bancari",
"report_type": "Profit and Loss"
},
{
"name": "interessi passivi su mutui",
"report_type": "Profit and Loss"
},
{
"name": "interessi passivi v/fornitori",
"report_type": "Profit and Loss"
},
{
"name": "sconti passivi bancari",
"report_type": "Profit and Loss"
}
],
"name": "ONERI FINANZIARI"
}
],
"name": "PROVENTI E ONERI FINANZIARI"
},
{
"children": [
{
"name": "stato patrimoniale",
"report_type": "Profit and Loss"
},
{
"name": "conto di risultato economico",
"report_type": "Profit and Loss"
}
],
"name": "CONTI DI RISULTATO"
}
],
"name": "Azienda",
"parent_id": null
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,667 @@
{
"name": "Panam\u00e1 - Plan de Cuentas",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Acreedor por Garant\u00edas Otorgadas"
},
{
"name": "Acreedor por Documentos Descontados"
},
{
"name": "Comitente por Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN ACREEDORAS"
},
{
"children": [
{
"name": "Documentos Endosados"
},
{
"name": "Documentos Descontados"
},
{
"name": "Garantias Otorgadas"
},
{
"name": "Dep\u00f3sito de Valores Recibos en Garant\u00eda"
},
{
"name": "Mercaderias Recibidas en Consignaci\u00f3n"
}
],
"name": "CUENTAS DE ORDEN DEUDORAS"
}
],
"name": "Cuentas de Orden"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Recupero de Rezagos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Activo Fijo",
"report_type": "Profit and Loss"
},
{
"name": "Recupero de Deudores Incobrables",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta Inversiones Permanentes",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones obtenidas, ganandas, percibidas",
"report_type": "Profit and Loss"
}
],
"name": "Ingresos No Operativos"
},
{
"children": [
{
"name": "Comisiones gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Descuentos gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Interese sobre Inversiones",
"report_type": "Profit and Loss"
},
{
"name": "Honorarios gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Ventas - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Ventas"
},
{
"name": "Intereses gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Alquileres gananados, obtenidos, percibidos",
"report_type": "Profit and Loss"
},
{
"name": "Ganancia Venta de Acciones",
"report_type": "Profit and Loss"
}
],
"name": "Ingresos Operativos"
}
],
"name": "INGRESOS"
},
{
"children": [
{
"children": [
{
"name": "Costo de Venta - Categoria de productos 01",
"report_type": "Profit and Loss"
}
],
"name": "Costo de Venta"
},
{
"children": [
{
"name": "Compras - Categoria de productos 01"
}
],
"name": "Compras"
},
{
"name": "Costos de Producci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Administraci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos de Comercializaci\u00f3n",
"report_type": "Profit and Loss"
}
],
"name": "COSTOS"
},
{
"children": [
{
"children": [
{
"name": "Gastos de Publicidad y Propaganda",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Servicios P\u00fablicos"
},
{
"name": "Gastos en Amortizaci\u00f3n",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Cargas Sociales",
"report_type": "Profit and Loss"
},
{
"name": "Gastos en Salarios",
"report_type": "Profit and Loss"
},
{
"name": "Gastos Bancarios"
},
{
"name": "Gastos en Impuestos"
},
{
"name": "Gastos en Depreciaci\u00f3n de Activo Fijo",
"report_type": "Profit and Loss"
}
],
"name": "Gastos Operativos"
},
{
"children": [
{
"name": "Gastos en Siniestros",
"report_type": "Profit and Loss"
},
{
"name": "Donaciones Cedidas, Otorgadas",
"report_type": "Profit and Loss"
},
{
"name": "P\u00e9rdida Venta Activo Fijo",
"report_type": "Profit and Loss"
}
],
"name": "Gastos No Operativos"
}
],
"name": "GASTOS"
}
],
"name": "Estado de Resultado"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Ajustes al Patrimonio / Revaluo T\u00e9cnico de Activo Fijo",
"report_type": "Balance Sheet"
}
],
"name": "Ajustes al Patrimonio"
},
{
"children": [
{
"name": "Aportes No Capitalizados / Aportes Irrevocables Futura Suscripci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Aportes No Capitalizados / Primas de Emsi\u00f3n",
"report_type": "Balance Sheet"
}
],
"name": "Aportes No Capitalizados"
},
{
"children": [
{
"name": "Capital / Dividendos a Distribuir en Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Capital / Acciones en Circulaci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Capital / Capital Propio",
"report_type": "Balance Sheet"
},
{
"name": "Capital / (-) Descuento de Emisi\u00f3n de Acciones",
"report_type": "Balance Sheet"
}
],
"name": "Capital"
},
{
"children": [
{
"name": "Resultados Acumulados",
"report_type": "Balance Sheet"
},
{
"name": "Resultado del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Utilidades y P\u00e9rdidas del Ejercicio",
"report_type": "Balance Sheet"
},
{
"name": "Resultados Acumulados del Ejercicio Anterior",
"report_type": "Balance Sheet"
}
],
"name": "Resultados No Asignados"
},
{
"children": [
{
"name": "Reserva para Renovaci\u00f3n de Activo Fijo",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Estatutaria",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Facultativa",
"report_type": "Balance Sheet"
},
{
"name": "Reserva Legal",
"report_type": "Balance Sheet"
}
],
"name": "Futuras Eventualidades"
}
],
"name": "PATRIMONIO"
},
{
"children": [
{
"children": [
{
"name": "Salarios por Pagar / Retenciones a Depositar",
"report_type": "Balance Sheet"
},
{
"name": "Salarios por Pagar / Sueldos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Salarios por Pagar / Provisi\u00f3n para Sueldo Anual Complementario",
"report_type": "Balance Sheet"
},
{
"name": "Salarios por Pagar / Cargas Sociales a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Salarios por Pagar"
},
{
"children": [
{
"name": "Otras Cuentas por Pagar / Acreedores Varios",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Honorarios Directores y S\u00edndicos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Dividendos a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Pagar / Cobros por Adelantado",
"report_type": "Balance Sheet"
}
],
"name": "Otras Cuentas por Pagar"
},
{
"children": [
{
"name": "Provisiones / Previsi\u00f3n para Garant\u00edas por Service",
"report_type": "Balance Sheet"
},
{
"name": "Provisiones / Previsi\u00f3n para juicios Pendientes",
"report_type": "Balance Sheet"
},
{
"name": "Provisiones / Previsi\u00f3n Indemnizaci\u00f3n por Despidos",
"report_type": "Balance Sheet"
}
],
"name": "Provisiones"
},
{
"children": [
{
"account_type": "Payable",
"name": "Cuentas por Pagar / Anticipos de Clientes",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "Cuentas por Pagar / (-) Intereses a Devengar por Compras al Cr\u00e9dito",
"report_type": "Balance Sheet"
},
{
"account_type": "Payable",
"name": "Cuentas por Pagar / Proveedores",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas por Pagar"
},
{
"children": [
{
"name": "Pasivo Circulante / Debentures Emitidos",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Intereses a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Obligaciones a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Prestamos",
"report_type": "Balance Sheet"
},
{
"name": "Pasivo Circulante / Adelantos en Cuenta Corriente",
"report_type": "Balance Sheet"
}
],
"name": "Pasivo Circulante"
},
{
"children": [
{
"name": "Impuestos por Pagar / ITBMS a Pagar",
"report_type": "Balance Sheet"
},
{
"name": "Impuestos por Pagar / Impuesto sobre la Renta a Pagar",
"report_type": "Balance Sheet"
}
],
"name": "Impuestos por Pagar"
}
],
"name": "PASIVOS"
},
{
"children": [
{
"children": [
{
"account_type": "Bank",
"name": "Caja y Bancos - Valores a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"account_type": "Bank",
"name": "Caja y Bancos.../ BCO. CTA CTE PAB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Bancos"
},
{
"account_type": "Bank",
"name": "Caja y Bancos - Recaudaciones a Depositar ",
"report_type": "Balance Sheet"
},
{
"children": [
{
"account_type": "Cash",
"name": "Caja y Bancos - Caja / efectivo PAB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Caja"
},
{
"children": [
{
"account_type": "Cash",
"name": "Caja y Bancos - Fondos fijos / caja menuda 01 PAB",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Fondos fijos"
},
{
"children": [
{
"account_type": "Cash",
"name": "Caja y Bancos - Caja / efectivo USD",
"report_type": "Balance Sheet"
}
],
"name": "Caja y Bancos - Moneda Extranjera"
}
],
"name": "Caja y Bancos"
},
{
"children": [
{
"name": "Otras Cuentas por Cobrar / Anticipo de Impuestos",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Anticipos a Proveedores",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Pr\u00e9stamos otorgados",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Accionistas",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Intereses Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Alquileres Pagados por Adelantado",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / Anticipo al Personal",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / (-) Intereses (+) a Devengar",
"report_type": "Balance Sheet"
},
{
"name": "Otras Cuentas por Cobrar / (-) Previsi\u00f3n para Descuentos",
"report_type": "Balance Sheet"
}
],
"name": "Otras Cuentas por Cobrar"
},
{
"children": [
{
"account_type": "Receivable",
"name": "Cuentas por Cobrar / Deudores por Ventas",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "Cuentas por Cobrar / Deudores Morosos",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "Cuentas por Cobrar / Deudores en Gesti\u00f3n Judicial",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "Cuentas por Cobrar / Deudores Varios",
"report_type": "Balance Sheet"
},
{
"account_type": "Receivable",
"name": "Cuentas por Cobrar / (-) Previsi\u00f3n para Incobrables",
"report_type": "Balance Sheet"
}
],
"name": "Cuentas por Cobrar"
},
{
"children": [
{
"children": [
{
"name": "Inventarios - Mercancias / Categoria de productos 01",
"report_type": "Balance Sheet"
}
],
"name": "Inventarios - Mercancias"
},
{
"name": "Materias primas",
"report_type": "Balance Sheet"
},
{
"name": "Inventarios - Mercancias en Tr\u00e1nsito",
"report_type": "Balance Sheet"
},
{
"name": "Productos Elaborados",
"report_type": "Balance Sheet"
},
{
"name": "Productos en Curso de Elaboraci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "(-) Previsi\u00f3n para Desvalorizaci\u00f3n de Inventarios",
"report_type": "Balance Sheet"
},
{
"name": "Materiales Varios ",
"report_type": "Balance Sheet"
}
],
"name": "Inventarios"
},
{
"children": [
{
"name": "Inversiones / (-) Previsi\u00f3n para Devalorizaci\u00f3n de Acciones",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Permanentes",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / T\u00edtulos P\u00fablicos",
"report_type": "Balance Sheet"
},
{
"name": "Inversiones / Acciones Transitorias",
"report_type": "Balance Sheet"
}
],
"name": "Inversiones Financieras"
},
{
"children": [
{
"name": "Activo Intangible / (-) Amortizaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Marcas y Patentes de Invenci\u00f3n",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Concesiones y Franquicias",
"report_type": "Balance Sheet"
},
{
"name": "Activo Intangible / Derecho de Llaves",
"report_type": "Balance Sheet"
}
],
"name": "Activo Intangible"
},
{
"children": [
{
"name": "Activo Fijo / Inmuebles",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Maquinaria",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Material Rodante Motorizado",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / (-) Depreciaci\u00f3n Acumulada",
"report_type": "Balance Sheet"
},
{
"name": "Activo Fijo / Equipos",
"report_type": "Balance Sheet"
}
],
"name": "Activo Fijo"
}
],
"name": "ACTIVOS"
}
],
"name": "Balance General"
}
],
"name": "Panam\u00e1"
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,126 @@
{
"name": "Thailand - Chart of Accounts",
"root": {
"children": [
{
"children": [
{
"children": [
{
"name": "Accumulated Depreciation - Equipment"
}
],
"name": "Equipment"
},
{
"name": "Outstanding Cheques"
},
{
"children": [
{
"name": "Accumulated Depreciation - Building"
}
],
"name": "Building"
},
{
"name": "Inventory"
},
{
"name": "Input VAT"
},
{
"name": "Account Receivable"
},
{
"children": [
{
"name": "Petty Cash"
},
{
"name": "Cash at Bank"
}
],
"name": "Cash"
},
{
"name": "Withholding Income Tax"
}
],
"name": "Assets"
},
{
"children": [
{
"name": "Income"
}
],
"name": "Income"
},
{
"children": [
{
"name": "Accrued Expenses"
},
{
"name": "Withholding Tax"
},
{
"name": "Uninvoiced Receipts"
},
{
"name": "Output VAT"
},
{
"name": "Account Payable"
},
{
"name": "Loans"
}
],
"name": "Liabilities"
},
{
"children": [
{
"name": "Retained Earnings"
},
{
"name": "Capital Stock"
},
{
"name": "Dividends"
},
{
"name": "Income Summary"
}
],
"name": "Equity"
},
{
"children": [
{
"name": "Cost of goods sold"
},
{
"name": "Income tax expenses"
},
{
"name": "Office Expenses"
},
{
"name": "Rent"
},
{
"name": "Interest expenses"
},
{
"name": "Salary"
}
],
"name": "Expenses"
}
],
"name": "Simple chart of accounts"
}
}

View File

@@ -0,0 +1,488 @@
{
"name": "UK Tax and Account Chart Template (by SmartMode)",
"root": {
"children": [
{
"children": [
{
"children": [
{
"children": [
{
"name": "Sales Tax Control Account"
},
{
"name": "Purchase Tax Control Account"
},
{
"name": "HMRC - VAT Account"
},
{
"name": "Manual Adjustments \uff96 VAT"
},
{
"name": "P.A.Y.E. & NI"
},
{
"name": "Other Creditors"
},
{
"name": "Sundry Creditors"
},
{
"name": "Creditors Control Account"
},
{
"name": "Net Wages"
},
{
"name": "Pension Fund"
}
],
"name": "Creditors due within one year"
},
{
"children": [
{
"name": "Corporation Tax"
},
{
"name": "Accruals"
}
],
"name": "Accruals and deferred income"
},
{
"children": [
{
"name": "Bad debt provision"
}
],
"name": "Provisions for liabilities and charges"
}
],
"name": "Current Liabilities"
},
{
"children": [
{
"children": [
{
"name": "Company Credit Card"
},
{
"name": "Bank Accounts"
}
],
"name": "Cash at bank and in hand"
},
{
"children": [
{
"name": "Debtors Control Account"
},
{
"name": "Other Debtors"
},
{
"name": "Sundry Debtors"
}
],
"name": "Trade Debtors"
},
{
"children": [
{
"name": "Prepayments"
}
],
"name": "Prepayments and accrued income"
},
{
"name": "Investment current assets"
},
{
"children": [
{
"name": "Finished Goods"
},
{
"name": "Work in Progress"
},
{
"name": "Stock"
}
],
"name": "Stocks & WIP"
}
],
"name": "Current assets"
},
{
"children": [
{
"name": "Other reserves"
},
{
"name": "Revaluation reserve"
},
{
"name": "Share premium account"
},
{
"name": "Called up share capital"
},
{
"name": "Profit and loss account"
}
],
"name": "Capital & Reserves"
},
{
"children": [
{
"children": [
{
"name": "Hire Purchase"
},
{
"name": "Loans"
},
{
"name": "Mortgages"
}
],
"name": "Creditors due after one year"
}
],
"name": "Non Current Liabilities"
},
{
"children": [
{
"name": "Investments"
},
{
"children": [
{
"name": "Fixtures and fittings Depreciation"
},
{
"name": "Fixtures and fittings"
},
{
"name": "Land and buildings"
},
{
"name": "Land and buildings Depreciation"
},
{
"name": "Motor vehicles Depreciation"
},
{
"name": "Motor vehicles"
},
{
"name": "Office equipment (inc computer equipment)"
},
{
"name": "Office equipment (inc computer equipment) Depreciation"
},
{
"name": "Plant and machinery Depreciation"
},
{
"name": "Plant and machinery"
}
],
"name": "Tangible assets"
},
{
"children": [
{
"name": "Software Depreciation"
},
{
"name": "Software"
},
{
"name": "Patents & Trademarks"
},
{
"name": "Patents & Trademarks Depreciation"
}
],
"name": "Intangible assets"
}
],
"name": "Fixed assets"
}
],
"name": "Balance Sheet"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Light, heat and power"
},
{
"name": "Repairs, renewals and maintenance"
},
{
"name": "Rent and rates"
}
],
"name": "Property costs"
},
{
"children": [
{
"name": "Auditing"
},
{
"name": "Accounting"
}
],
"name": "Accountancy and audit"
},
{
"children": [
{
"name": "Consultancy"
},
{
"name": "Legal and professional charges"
}
],
"name": "Legal and professional costs"
},
{
"children": [
{
"name": "Recruitment fees"
},
{
"name": "Software expenses"
},
{
"name": "Travel and subsistence"
},
{
"name": "Other admin expenses"
},
{
"name": "Other computer costs"
},
{
"name": "Internet & hosting"
},
{
"name": "Mobiles"
},
{
"name": "Stationery"
},
{
"name": "Office consumables"
},
{
"name": "Postage and Carriage"
},
{
"name": "Telephone"
},
{
"name": "Books"
},
{
"name": "Network costs"
}
],
"name": "Administration and office expenses"
},
{
"children": [
{
"name": "Car maintenance"
},
{
"name": "Car hire"
},
{
"name": "Car fuel"
}
],
"name": "Vehicle expenses"
},
{
"children": [
{
"name": "Intangible assets depn"
},
{
"name": "Tangible assets depn"
}
],
"name": "Depreciation expense"
},
{
"children": [
{
"name": "Entertaining"
},
{
"name": "Other sundry expenses"
},
{
"name": "Donations"
},
{
"name": "Exchange gains/losses"
},
{
"name": "Bad debts"
},
{
"name": "Bank, credit card and other financial charges"
},
{
"name": "Insurance"
}
],
"name": "Sundry expenses"
},
{
"children": [
{
"name": "Subcontractors payments"
},
{
"name": "Employers NIC"
},
{
"name": "Admin gross salaries"
},
{
"name": "Management gross salaries"
},
{
"name": "Directors remuneration"
},
{
"name": "Directors pension"
}
],
"name": "Salaries & wages"
}
],
"name": "Administrative expenses"
},
{
"children": [
{
"name": "Corporation tax expense"
}
],
"name": "Tax on profit or loss on ordinary activities"
},
{
"children": [
{
"name": "Interest paid"
}
],
"name": "Interest payable and similar charges"
},
{
"children": [
{
"name": "Bank Interest received"
},
{
"name": "Investment Interest received"
}
],
"name": "Interest receivable and similar income:"
},
{
"children": [
{
"name": "Profits/Losses on disposals of assets"
}
],
"name": "Other operating income"
},
{
"children": [
{
"name": "Sales category 1"
},
{
"name": "Sales category 2"
},
{
"name": "Sales category 3"
},
{
"name": "Sales category 4"
}
],
"name": "Turnover"
},
{
"children": [
{
"name": "Distribution vehicles"
},
{
"name": "Distribution salaries and wages"
},
{
"children": [
{
"name": "PR"
},
{
"name": "Marketing, POS"
},
{
"name": "Exhibitions and events"
}
],
"name": "Advertising and promotions"
},
{
"name": "Shipping"
}
],
"name": "Distribution costs"
},
{
"children": [
{
"name": "Cost of sales 4"
},
{
"name": "Cost of sales 3"
},
{
"name": "Cost of sales 2"
},
{
"name": "Cost of sales 1"
}
],
"name": "Cost of sales"
}
],
"name": "Profit and Loss"
}
],
"name": "Company",
"parent_id": null
}
}

View File

@@ -0,0 +1,543 @@
{
"name": "Basic Chart of Account",
"root": {
"children": [
{
"children": [
{
"name": "Automobile Expense",
"report_type": "Profit and Loss"
},
{
"name": "Payroll Expenses",
"report_type": "Profit and Loss"
},
{
"name": "Interest Expense",
"report_type": "Profit and Loss"
},
{
"name": "Continuing Education",
"report_type": "Profit and Loss"
},
{
"name": "Meals and Entertainment",
"report_type": "Profit and Loss"
},
{
"name": "Custom Hire and Contract Labor",
"report_type": "Profit and Loss"
},
{
"name": "Repairs and Maintenance",
"report_type": "Profit and Loss"
},
{
"name": "Postage and Delivery",
"report_type": "Profit and Loss"
},
{
"name": "Small Tools and Equipment",
"report_type": "Profit and Loss"
},
{
"name": "Chemicals Purchased",
"report_type": "Profit and Loss"
},
{
"name": "Gasoline, Fuel and Oil",
"report_type": "Profit and Loss"
},
{
"name": "Equipment Rental",
"report_type": "Profit and Loss"
},
{
"name": "Taxes - Property",
"report_type": "Profit and Loss"
},
{
"name": "Miscellaneous Expense",
"report_type": "Profit and Loss"
},
{
"name": "Uniforms",
"report_type": "Profit and Loss"
},
{
"name": "Veterinary, Breeding, Medicine",
"report_type": "Profit and Loss"
},
{
"name": "Professional Fees",
"report_type": "Profit and Loss"
},
{
"name": "Janitorial Expense",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "General Liability Insurance",
"report_type": "Profit and Loss"
},
{
"name": "Life and Disability Insurance",
"report_type": "Profit and Loss"
},
{
"name": "Health Insurance",
"report_type": "Profit and Loss"
},
{
"name": "Professional Liability",
"report_type": "Profit and Loss"
},
{
"name": "Worker's Compensation",
"report_type": "Profit and Loss"
}
],
"name": "Insurance Expense",
"report_type": "Profit and Loss"
},
{
"name": "Travel Expense",
"report_type": "Profit and Loss"
},
{
"name": "Advertising and Promotion",
"report_type": "Profit and Loss"
},
{
"name": "Office Supplies",
"report_type": "Profit and Loss"
},
{
"name": "Dues and Subscriptions",
"report_type": "Profit and Loss"
},
{
"name": "Feed Purchased",
"report_type": "Profit and Loss"
},
{
"name": "Bank Service Charges",
"report_type": "Profit and Loss"
},
{
"name": "Marketing Expense",
"report_type": "Profit and Loss"
},
{
"name": "Storage and Warehousing",
"report_type": "Profit and Loss"
},
{
"name": "Computer and Internet Expenses",
"report_type": "Profit and Loss"
},
{
"name": "Fertilizers and Lime",
"report_type": "Profit and Loss"
},
{
"name": "Seeds and Plants Purchased",
"report_type": "Profit and Loss"
},
{
"name": "Conservation Expenses",
"report_type": "Profit and Loss"
},
{
"name": "Freight and Trucking",
"report_type": "Profit and Loss"
},
{
"name": "Depreciation Expense",
"report_type": "Profit and Loss"
},
{
"name": "Printing and Reproduction",
"report_type": "Profit and Loss"
},
{
"name": "Car and Truck Expenses",
"report_type": "Profit and Loss"
},
{
"name": "Charitable Contributions",
"report_type": "Profit and Loss"
},
{
"name": "Rent Expense",
"report_type": "Profit and Loss"
},
{
"name": "Utilities",
"report_type": "Profit and Loss"
},
{
"name": "Telephone Expense",
"report_type": "Profit and Loss"
},
{
"name": "Business Licenses and Permits",
"report_type": "Profit and Loss"
}
],
"name": "Expenses",
"report_type": "Profit and Loss"
},
{
"children": [
{
"children": [
{
"name": "Client Trust Account",
"report_type": "Balance Sheet"
},
{
"children": [
{
"account_type": "Receivable",
"name": "Account Receivable",
"report_type": "Balance Sheet"
}
],
"name": "Receivable",
"report_type": "Balance Sheet"
},
{
"account_type": "Cash",
"name": "Cash or Cash Equivalents",
"report_type": "Balance Sheet"
}
],
"name": "Current Assets",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Security Deposits Asset",
"report_type": "Balance Sheet"
}
],
"name": "Other Assets",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Court Costs",
"report_type": "Balance Sheet"
},
{
"name": "Advanced Client Costs",
"report_type": "Balance Sheet"
},
{
"name": "Filing Fees",
"report_type": "Balance Sheet"
},
{
"name": "Expert Witness Fees",
"report_type": "Balance Sheet"
}
],
"name": "Other Current Assets",
"report_type": "Balance Sheet"
},
{
"account_type": "Fixed Asset",
"children": [
{
"account_type": "Fixed Asset",
"name": "Furniture and Equipment",
"report_type": "Balance Sheet"
},
{
"name": "Accumulated Depreciation",
"report_type": "Balance Sheet"
}
],
"name": "Fixed Assets",
"report_type": "Balance Sheet"
}
],
"name": "Assets",
"report_type": "Balance Sheet"
},
{
"children": [
{
"account_type": "Equity",
"children": [
{
"account_type": "Equity",
"name": "Capital Stock",
"report_type": "Balance Sheet"
},
{
"account_type": "Equity",
"name": "Retained Earnings",
"report_type": "Balance Sheet"
},
{
"account_type": "Equity",
"name": "Dividends Paid",
"report_type": "Balance Sheet"
},
{
"account_type": "Equity",
"name": "Opening Balance Equity",
"report_type": "Balance Sheet"
}
],
"name": "Equity",
"report_type": "Balance Sheet"
},
{
"children": [
{
"children": [
{
"children": [
{
"name": "Account Payable",
"report_type": "Balance Sheet"
}
],
"name": "Payable",
"report_type": "Balance Sheet"
}
],
"name": "Current Liabilities",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Sales Tax Payable",
"report_type": "Balance Sheet"
},
{
"name": "Customer Deposits Received",
"report_type": "Balance Sheet"
},
{
"name": "Payroll Liabilities",
"report_type": "Balance Sheet"
},
{
"name": "Use Tax Payable",
"report_type": "Balance Sheet"
}
],
"name": "Other Current Liabilities",
"report_type": "Balance Sheet"
}
],
"name": "Liabilities",
"report_type": "Balance Sheet"
}
],
"name": "Liabilities and Equity",
"report_type": "Balance Sheet"
},
{
"children": [
{
"name": "Settlement Income",
"report_type": "Profit and Loss"
},
{
"name": "Commodity Credit Loans",
"report_type": "Profit and Loss"
},
{
"name": "Administrative Fees",
"report_type": "Profit and Loss"
},
{
"name": "Shipping and Delivery Income",
"report_type": "Profit and Loss"
},
{
"name": "Sales",
"report_type": "Profit and Loss"
},
{
"name": "Commission income",
"report_type": "Profit and Loss"
},
{
"name": "Fuel Tax Credits and Other Inc.",
"report_type": "Profit and Loss"
},
{
"name": "Livestock Sales",
"report_type": "Profit and Loss"
},
{
"name": "Custom Hire Income",
"report_type": "Profit and Loss"
},
{
"name": "Crop Insurance Proceeds",
"report_type": "Profit and Loss"
},
{
"name": "Legal Fee Income",
"report_type": "Profit and Loss"
},
{
"name": "Cooperative Distributions",
"report_type": "Profit and Loss"
},
{
"name": "Job Income",
"report_type": "Profit and Loss"
},
{
"name": "Crop Sales",
"report_type": "Profit and Loss"
},
{
"name": "Sales Discounts",
"report_type": "Profit and Loss"
},
{
"name": "Rental Income",
"report_type": "Profit and Loss"
},
{
"name": "Farmers Market Sales",
"report_type": "Profit and Loss"
},
{
"name": "Sales",
"report_type": "Profit and Loss"
},
{
"name": "Sales Discounts",
"report_type": "Profit and Loss"
},
{
"name": "Service Income",
"report_type": "Profit and Loss"
},
{
"name": "Agricultural Program Payments",
"report_type": "Profit and Loss"
}
],
"name": "Income",
"report_type": "Profit and Loss"
},
{
"children": [
{
"name": "Proceeds from Sale of Assets",
"report_type": "Profit and Loss"
},
{
"name": "Finance Charge Income",
"report_type": "Profit and Loss"
},
{
"name": "Interest Income",
"report_type": "Profit and Loss"
},
{
"name": "Insurance Proceeds Received",
"report_type": "Profit and Loss"
}
],
"name": "Other Income",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"children": [
{
"account_type": "Cost of Goods Sold",
"name": "Other Job Related Costs",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Commissions Paid",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Tools and Small Equipment",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Merchant Account Fees",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Job Materials Purchased",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Subcontracted Services",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Equipment Rental for Jobs",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Purchases - Resale Items",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Commissions Paid",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Freight and Shipping Costs",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Merchant Account Fees",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Media Purchased for Clients",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Purchase Discounts",
"report_type": "Profit and Loss"
},
{
"account_type": "Cost of Goods Sold",
"name": "Subcontractors Expense",
"report_type": "Profit and Loss"
}
],
"name": "Cost of Goods Sold",
"report_type": "Profit and Loss"
}
],
"name": "Basic",
"parent_id": null
}
}

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More