Commit Graph

1199 Commits

Author SHA1 Message Date
William Moreno
6b34bca7d0 Best IFRS for SMES compatibility 2015-02-11 11:53:45 -06:00
William Moreno
6fd091d979 Rearrange accounts to improve readability 2015-02-11 09:36:03 -06:00
William Moreno
7d7113328d Change Style => TITLE to Title 2015-02-11 09:22:55 -06:00
William Moreno
1caea2ebae Fix missing Comma (,)
Yes, I did not validate the last edit to the JSON before commit, sorry
2015-02-11 07:39:23 -06:00
Neil Trini Lasrado
802d717a9e fixes 2015-02-11 17:27:58 +05:30
Neil Trini Lasrado
934d63de16 journal entry - accounts table cannot be blank - validation added 2015-02-11 17:05:41 +05:30
Nabin Hait
7945712171 Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc 2015-02-11 12:55:10 +05:30
William Moreno
ad45007362 Add chart of accounts template for Nicaragua
On branch v5.0

	new file:   erpnext/accounts/doctype/account/chart_of_accounts/ni_ni_chart_template.json
2015-02-10 23:57:24 -06:00
Nabin Hait
8fa503e177 Fixed conflict while merging v4 into v5 2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Rushabh Mehta
a232c80d77 [share] add share permission 2015-02-05 15:52:58 +05:30
Anand Doshi
dd942bb3d2 [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists 2015-02-04 18:53:24 +05:30
Nabin Hait
1dc8ff5220 item-wise tax distribution if amount entered in actual 2015-02-04 18:06:59 +05:30
Rushabh Mehta
0e13221338 [print] item tables - override description and uom 2015-02-04 17:02:24 +05:30
Nabin Hait
0c883500bb Expense account query in purchase invoice 2015-02-03 17:59:00 +05:30
Rushabh Mehta
c567e8e960 [fix] analytics reports + remove print item tables #2667 2015-02-03 17:56:25 +05:30
Rushabh Mehta
06fa46fafe [fix] onshow > on_page_show 2015-01-29 18:09:11 +05:30
Nabin Hait
538253e503 removed test files for purchase taxes and charges master 2015-01-23 17:47:44 +05:30
Nabin Hait
ecce5141eb replaced budget distribution 2015-01-23 16:32:35 +05:30
Nabin Hait
b4a3dfa893 All the calculations in taxes_and_totals file 2015-01-22 17:13:13 +05:30
Nabin Hait
59de1e23bc POS fix: setting discount amount 2015-01-21 17:50:28 +05:30
Nabin Hait
963393409e minor fix: child table length 2015-01-21 17:22:11 +05:30
Nabin Hait
0a3e5653ba bank reconciliation fix 2015-01-21 16:40:47 +05:30
Rushabh Mehta
81e972eac4 [cleanups] 2015-01-19 17:34:54 +05:30
Anand Doshi
f02e142d5d [design] mobile 2015-01-19 15:59:45 +05:30
Anand Doshi
b942cb86ae [minor] auto-create Fiscal Year, loading, general ledger 2015-01-19 15:59:45 +05:30
Nabin Hait
cff8993478 Merge pull request #2572 from neilLasrado/credit-note
journal entry linked with Stock Entry
2015-01-19 14:26:58 +05:30
Nabin Hait
9ef2e78905 Merge pull request #2553 from neilLasrado/mode-of-payment
mode of payment - company wise default account added
2015-01-19 14:26:00 +05:30
Nabin Hait
84662f2db5 minor fix in payment receipt voucher print format 2015-01-16 11:59:47 +05:30
Rushabh Mehta
0335005eea [minor] added allow rename 2015-01-15 15:29:22 +05:30
Nabin Hait
239c2c327c Hide currency and price list section after submission 2015-01-15 14:22:04 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
bd2ac2f51f mode of payment - company wise default account added 2015-01-14 12:00:17 +05:30
Neil Trini Lasrado
50763d58ce frappe.db.exist used 2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
adfdd6f83c journal entry linked and validation added 2015-01-14 11:54:55 +05:30
Neil Trini Lasrado
e3e3a56b5c Journal entries recalc totals on del of accounts table row 2015-01-13 12:33:15 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Neil Trini Lasrado
0866272ba1 get fiscal year fix 2015-01-12 16:41:55 +05:30
Nabin Hait
39c8c9e7b0 Fixes in print format css 2015-01-12 11:04:07 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +05:30
Anand Doshi
015fa7a1d1 [fix] escape quote in Accounts Receivable 2015-01-08 18:26:53 +05:30
Rushabh Mehta
d49a123fd0 [ui] listviews 2015-01-07 16:43:47 +05:30
Nabin Hait
6c1773025b fiscal year error message 2015-01-07 11:33:14 +05:30
Rushabh Mehta
738d4ef5c8 [ui] [listviews] indicators 2015-01-06 18:09:02 +05:30
Anand Doshi
50d7e8cf8f [design] Point of Sale 2015-01-06 17:14:26 +05:30
Rushabh Mehta
e1cb0ae738 [design] list views 2015-01-05 17:39:05 +05:30
Anand Doshi
9b955feff8 [design] POS - item grid and taxes 2015-01-05 16:19:12 +05:30
Anand Doshi
3f5e95a99e [design] Fixed Grid Reports 2015-01-01 16:26:18 +05:30
Rushabh Mehta
4c36d7388c [ux] fixed creation via tree views for Item Group etc 2015-01-01 15:59:34 +05:30
Rushabh Mehta
bfaf0a8f43 [tree] [ui] 2015-01-01 12:49:18 +05:30
Rushabh Mehta
419ae33c3e [merge] v5-design 2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
40431cbf89 focus on barcode field after adding a row 2014-12-30 17:53:16 +05:30
Nabin Hait
dd38a266b8 Removed tname and fname from code 2014-12-26 13:15:21 +05:30
Rushabh Mehta
a5b149c061 [design] module pages, messages, timelines 2014-12-26 12:53:02 +05:30
Rushabh Mehta
4096a3ab2b [design] form toolbar 2014-12-26 12:53:02 +05:30
Rushabh Mehta
a9ba5eff99 [design] pos 2014-12-26 12:52:11 +05:30
Rushabh Mehta
f870527e7c [design] wip 2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82 Merge pull request #2472 from neilLasrado/expense-claim
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Nabin Hait
57595cf73b fixed merge conflict 2014-12-23 18:05:13 +05:30
Neil Trini Lasrado
31a92bd9d9 company wise letter head feature added 2014-12-23 17:52:41 +05:30
Neil Trini Lasrado
9712e7dad4 holiday logic removed 2014-12-23 17:38:59 +05:30
Pratik Vyas
dc2630b7fa Make Tax Assets a group in standard chart of accounts 2014-12-17 16:23:51 +05:30
Nabin Hait
6ffa445dfd minor fixes in coa templates 2014-12-16 12:49:35 +05:30
Neil Trini Lasrado
e1f21682fb changes made 2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
cc73999497 validate fixed 2014-12-12 12:33:55 +05:30
Neil Trini Lasrado
f13c4f0145 New feature for issue #2419 2014-12-12 12:33:55 +05:30
Nabin Hait
abfc72ded4 Merge pull request #2450 from ankitjavalkarwork/fix2363
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
4f7c51d68e Merge pull request #2442 from ankitjavalkarwork/gross-profit
Gross profit
2014-12-11 17:37:54 +05:30
Nabin Hait
bef80bab0d Removed gross profit field from sales invoice 2014-12-11 16:27:18 +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
Neil Trini Lasrado
c0063a6e74 sales Invoice- filter added for debit to 2014-12-09 17:03:13 +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
ankitjavalkarwork
35db282765 Fix gross_profit.py, commonify and add elementwise grouping to report 2014-12-04 13:08:42 +05:30
Rushabh Mehta
ec9db4b799 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9 [report] gross profit WIP 2014-12-04 12:37:39 +05:30
ankitjavalkarwork
c41a0e2e38 Add print formats for Acc. Receivable/Payable and Summary reports 2014-12-02 15:13:36 +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
Rushabh Mehta
3d65d9602e [error-reports] 2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
ankitjavalkarwork
9440d080d4 Print Hide Recurring Order/Invoice based fields 2014-11-27 17:28:53 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Nabin Hait
707322adb9 Fixes for standard chart of accounts 2014-11-14 18:13:33 +05:30
Nabin Hait
601fcde31c Merge pull request #2383 from neilLasrado/pos
POS feature #2305
2014-11-14 18:12:26 +05:30
Nabin Hait
40c47b2236 Merge pull request #2395 from ankitjavalkarwork/fix2230
[#2230] Add Totals row to Gross Profit report
2014-11-14 18:06:19 +05:30
ankitjavalkarwork
fff1b42f80 Fix Error message, add account_type to 'inventories' in Chart Of Acc. 2014-11-14 14:19:06 +05:30
Nabin Hait
4215b3afc3 temporary fix in payment tool 2014-11-14 10:51:31 +05:30
Nabin Hait
4cd60d7d61 Included standard charts in json format 2014-11-12 14:29:44 +05:30
Nabin Hait
4963ac2af5 charts for brazil 2014-11-12 14:29:44 +05:30
Nabin Hait
f3d7ef3a1b Chart of accounts name cleanup 2014-11-12 14:29:44 +05:30
Nabin Hait
ed9c26db4d Show only active and enabled charts for any country 2014-11-12 14:29:44 +05:30
Neil Trini Lasrado
737cedaeef Required modifications done 2014-11-11 16:52:34 +05:30
Neil Trini Lasrado
2c388f9d7e POS feature #2305 2014-11-11 16:00:09 +05:30
Nabin Hait
6c1011df92 Reference / Cheque date is after due date 2014-11-10 14:57:53 +05:30
ankitjavalkarwork
bd8a8b9bd7 [#2230] Add Totals row to Gross Profit report 2014-11-10 12:36:43 +05:30
Nabin Hait
d795dfd8de Credit days validation fixes 2014-11-10 11:39:55 +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
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
fad0d566f9 Payment receipt voucher print format fixed 2014-11-04 15:34:03 +05:30
ankitjavalkarwork
e6e65b0907 [#2362] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report 2014-11-04 14:40:33 +05:30
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
7b3543caaf Check credit limit only if customer debited 2014-11-03 15:46:15 +05:30
Nabin Hait
f09667884b Root type indentified for multiple country's chart 2014-11-03 15:46:15 +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
Nabin Hait
e6370860a0 accounts receivable summary report cleanup 2014-10-30 15:54:40 +05:30
Nabin Hait
7dbcee87af AR/AP report cleanup 2014-10-30 15:54:39 +05:30
Nabin Hait
99be941e7b Party is only relevant to receivable/payable account 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
574e55788f [#1379] Add Accounts Receivable Summary Report 2014-10-30 15:54:39 +05:30
ankitjavalkarwork
e63432db63 Commonify AR and AP reports 2014-10-30 15:54:39 +05:30
Nabin Hait
ee212e7bb5 [fix] Floating point issue fixed in payment reconciliation 2014-10-29 14:26:05 +05:30
Nabin Hait
7cdb25b733 Merge pull request #2337 from neilLasrado/makepaymententryfix
Error fix, arguments in function call for Make Payment Entry from SI/PI
2014-10-27 11:42:50 +05:30
Nabin Hait
f5b94143dc Minor fixes 2014-10-22 16:14:41 +05:30
Rushabh Mehta
39dbf73de7 [merge] item-variants 2014-10-21 13:24:46 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Rushabh Mehta
ab43942b35 Merge pull request #2231 from rmehta/item-variants
Item variants
2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
572ad4c8ef Error fix, arguments in function call for Make Payment Entry from SI/PI 2014-10-21 12:34:07 +05:30
Nabin Hait
259f9779db Credit Note: Set total amount and print format fix 2014-10-20 11:18:11 +05:30
Neil Trini Lasrado
1cdfbdb899 fiscal year auto-create added 2014-10-17 15:44:22 +05:30
Nabin Hait
fc2dd44694 Partial payment reconciliation. Fixes #1982 2014-10-17 14:57:20 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Nabin Hait
38d0ed9f3a Negative stock allowed for perpetual inventory. Blocked in specific case 2014-10-14 16:08:19 +05:30
Nabin Hait
17a16eeaf4 Tets case fixed for payment tool 2014-10-13 11:43:14 +05:30
Nabin Hait
79ed124939 Update journal_voucher.py 2014-10-10 18:19:03 +05:30
Nabin Hait
30a0e3e8b4 Merge pull request #2275 from ankitjavalkarwork/fix2164
Add Delivery Qty to Sales Invoice From Delivery Note, Misc fixes
2014-10-10 18:05:19 +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
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
ankitjavalkarwork
9aadb0d95d [#2164] Add Delivered Qty to Sales Inv from Delivery Note, fix issues 2014-10-09 17:31:46 +05:30
Neil Trini Lasrado
9614b552fd fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
e6b14a4bf6 Fixed issues 2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
78fa6954e5 Fiscal year autofetch added 2014-10-09 15:01:12 +05:30
ankitjavalkarwork
e93b1fc508 [fix][#1450] Add Shipping Addr field to Sales Invoice 2014-10-09 12:11:49 +05:30
Nabin Hait
12ade3c682 Merge pull request #2250 from ankitjavalkarwork/fix1808
[fix][#1808] Allow configurable AR/AP ageing dates
2014-10-09 11:24:01 +05:30
ankitjavalkarwork
1b2944e871 Rearrange To/From, Recurring Type field for better UX 2014-10-08 14:24:58 +05:30
Rushabh Mehta
c2d2857540 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:19:55 +05:30
Nabin Hait
adeb976a1b Block negative stock in perpetual inventory 2014-10-08 11:02:18 +05:30
ankitjavalkarwork
6c29d8789a [fix][#1769] Add disable option to Sales/Purchase Tax Master with validation 2014-10-07 14:44:37 +05:30
Rushabh Mehta
baef96b5a2 [item-variants] allow production order of variant #2224 2014-10-07 12:34:19 +05:30