Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,752 Commits 3 Branches 0 Tags 1 GiB
175640d910
Commit Graph

1217 Commits

Author SHA1 Message Date
Anand Doshi
b7d0dcdd14 changed wn.downloadify to wn.tools.downloadify 2013-01-10 14:44:03 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Anand Doshi
6411b930d7 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:40 +05:30
Nabin Hait
4fb4659a03 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-08 15:42:04 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
62299260dc shifted UOM field to after qty field in purchase cycle 2013-01-04 13:16:34 +05:30
Rushabh Mehta
9b1ddfd9ef merge 2013-01-02 15:32:29 +05:30
Rushabh Mehta
d4872483e4 fixes to permission manager / user property setter 2013-01-02 15:29:37 +05:30
Nabin Hait
e8b7ac1469 opening and closing balance fix in general ledger 2013-01-02 15:11:29 +05:30
Nabin Hait
2f1d1a05b8 general ledger report group by ledgers 2013-01-01 19:52:52 +05:30
Anand Doshi
6f6fadd360 group gl entries by ledger 2013-01-01 18:32:49 +05:30
Nabin Hait
3882db03e2 Trial Balance : with/without closing entry 2013-01-01 13:48:40 +05:30
Rushabh Mehta
8bf41ea461 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-31 10:52:10 +05:30
Rushabh Mehta
e2c7e583f5 updated usability of payment_to_invoice_matching tool and fixed hide_toolbar 2012-12-31 10:51:31 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Anand Doshi
b420e88955 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 15:36:30 +05:30
Anand Doshi
b62c4edf02 added is_item_table_empty validation in submit event of purchase common 2012-12-27 15:35:58 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Anand Doshi
98d588cd7d deprecated form 16 print format 2012-12-25 18:53:25 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Rushabh Mehta
6f65de15ae appframe fixes 2012-12-22 13:50:35 +05:30
Nabin Hait
f33831abe4 Merge branch 'master' into production 2012-12-20 14:31:26 +05:30
Nabin Hait
457b0b8648 fixes in sales/purchase register 2012-12-20 14:29:53 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +05:30
Anand Doshi
879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production 
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
 2012-12-19 22:28:00 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Anand Doshi
ab28978755 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-19 12:02:46 +05:30
Anand Doshi
f1854b1c2f removed discount from print hide in purchase cycle 2012-12-19 12:01:48 +05:30
Nabin Hait
bb852e45e9 fixes in ordered/delivered items to be billed 2012-12-19 11:55:42 +05:30
Nabin Hait
64a839a747 fixes in ordered/delivered items to be billed 2012-12-19 11:43:28 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Rushabh Mehta
7adf17e95d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-18 11:47:46 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Nabin Hait
5c2bb9d9ed sales order linked with project 2012-12-18 10:44:01 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Nabin Hait
49415d90fc create recurring invoices on any date 2012-12-17 11:09:08 +05:30
Nabin Hait
3af7b981fa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:50:13 +05:30
Nabin Hait
506f7a3f7b fixed null issue in recurring invoice 2012-12-17 10:49:20 +05:30
Nabin Hait
0a8a67129e fixed null issue in recurring invoice 2012-12-17 10:48:04 +05:30
webnotes
ff4e996a8f fixed syntax error in recurring sales invoice code 2012-12-15 17:51:24 +05:30
Nabin Hait
fce76cd5b2 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-14 13:21:52 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
a59aa68eac added new reports 2012-12-14 10:27:10 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +05:30
Rushabh Mehta
e848e9c4c3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 13:14:22 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
561be839c5 voucher import tool message 2012-12-12 16:35:31 +05:30
Nabin Hait
003b31ae06 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:27:22 +05:30
Nabin Hait
06cbd3427f dynamic query for root in sales browser, validation for tree structure document 2012-12-12 16:26:39 +05:30
Rushabh Mehta
d1b2afcd18 webnotes.user.roles deprecated to webnotes.user.get_roles() 2012-12-12 15:58:46 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Nabin Hait
69b3730a18 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-11 14:36:19 +05:30
Nabin Hait
cddbe6dd80 validation while created through company saving and root deleted 2012-12-11 14:35:45 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30
Rushabh Mehta
a494b88ad8 updates to website: removed webnotes.cms 2012-12-07 12:44:45 +05:30
Nabin Hait
f71d8e0ee4 debit/credit adjustment if there is difference due to rounding 2012-12-06 17:24:59 +05:30
Anand Doshi
bd8ef60929 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-06 15:15:18 +05:30
Anand Doshi
85e44b4247 fix in voucher import tool 2012-12-06 15:14:51 +05:30
Rushabh Mehta
89c7b41fee account_browser: remove can_create check 2012-12-06 14:58:44 +05:30
Rushabh Mehta
06d24a60d0 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-06 12:19:33 +05:30
Rushabh Mehta
b536d36771 more refactoring to renaming 2012-12-06 12:19:05 +05:30
Rushabh Mehta
76c4f61ffb more refactoring to renaming 2012-12-06 12:09:52 +05:30
Nabin Hait
27184e0e05 default filters set in debtors and creditors ledger 2012-12-06 11:46:41 +05:30
Rushabh Mehta
a112981ca2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 14:34:51 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Nabin Hait
1ad42f09df bom fixes: item selection before server call 2012-12-05 12:36:19 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Rushabh Mehta
535d6c4d91 added client side functions and mode_of_payment defaults 2012-12-04 16:34:26 +05:30
Rushabh Mehta
586ac7c977 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 16:32:28 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Anand Doshi
188f977f73 fixes in tax controller and tests 2012-12-04 16:17:48 +05:30
Anand Doshi
5c2319549a updated webnotes.utils.__init__ with a few refactored methods 2012-12-04 11:53:42 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Anand Doshi
ef6a76f8aa fixes in renaming account, supplier, customer; fixes in accounts browser; fixes in customer address contact fetching in opportunity 2012-12-03 15:45:03 +05:30
Rushabh Mehta
7dd13a45f6 chart of account fixes, added delete, rename 2012-12-03 14:11:24 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +05:30
Anand Doshi
88be29e43b flt before round in gl control 2012-12-01 18:03:05 +05:30
Nabin Hait
4bbaddd57d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-01 16:33:35 +05:30
Rushabh Mehta
79ed5d8c35 communication print format bugfix 2012-12-01 13:09:08 +05:30
Nabin Hait
995b5c617b Patch for fixing floating point issue in gl entry 2012-11-30 19:40:37 +05:30
Rushabh Mehta
f16bf42045 communication cleanup + journal voucher: ref no, ref date conditional mandatory 2012-11-30 18:29:54 +05:30
Anand Doshi
535fbb1b00 replaced get_value 2012-11-30 17:16:03 +05:30
Anand Doshi
a2c6349342 added get_value 2012-11-30 17:08:00 +05:30
Anand Doshi
32485ecdc3 changed description of Period Dates 2012-11-30 16:41:20 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Anand Doshi
746e229026 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-30 15:15:16 +05:30
Anand Doshi
420e1b42e2 refactored a recurring sales invoice 2012-11-30 15:11:12 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Anand Doshi
f991fe3997 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-30 12:48:53 +05:30
Anand Doshi
b2293c48e8 fixing recurring invoice 2012-11-30 12:48:33 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Nabin Hait
6aa80071e5 Production plan cleanup and fixes 2012-11-29 19:26:49 +05:30
Anand Doshi
681d21dd1f for tax account, rate is no more mandatory 2012-11-29 18:29:56 +05:30
Rushabh Mehta
b12d5363bc merge 2012-11-29 16:30:57 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Anand Doshi
88d522aa51 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 17:14:23 +05:30
Anand Doshi
47514097be show Net Profit only when company is selected 2012-11-28 17:12:30 +05:30
Anand Doshi
01bf10b8b6 changed default to Monthly in new grid reports 2012-11-28 17:12:18 +05:30
Nabin Hait
c62fe40e85 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 16:49:53 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Anand Doshi
42d37bf6c2 added Net Profit in financial analytis 2012-11-28 16:06:37 +05:30
Anand Doshi
7507303d34 removed Total at the end of PL/BS 2012-11-28 16:03:32 +05:30
Nabin Hait
ef71940d58 Update delivered qty and billed amt in SO, if POS against Sales Order 2012-11-28 12:15:45 +05:30
Anand Doshi
7255a9a660 show Total Income as Total Expenses + Profile/Loss in Financial Statements 2012-11-27 16:33:10 +05:30
Anand Doshi
ca868e42ae added module icons in grid reports 2012-11-26 18:47:54 +05:30
Anand Doshi
f377475f38 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-26 11:54:43 +05:30
Anand Doshi
0c1ed4d9c6 fixed: added missing option Address for link field: Supplier Address 2012-11-26 11:53:50 +05:30
Rushabh Mehta
78ba38106b fix in delivered items to be billed 2012-11-26 10:12:32 +05:30
Rushabh Mehta
04f5bdf7bf added report in sync and added customer to delivered items to be billed 2012-11-24 17:21:32 +05:30
Anand Doshi
0245a7b92d added ifnull in query report 2012-11-23 18:35:22 +05:30
Rushabh Mehta
7d665818b5 moved delivered_items_to_be_billed from stock to accounts 2012-11-23 17:56:30 +05:30
Rushabh Mehta
bc54dadd44 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-23 17:54:19 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
c9bfbf94f2 fix in voucher import tool 2012-11-23 16:34:28 +05:30
Anand Doshi
5202de4764 fix in voucher import tool 2012-11-23 15:23:26 +05:30
Anand Doshi
8cab3f5f1c Removed Chosen and implemented Link field - autocomplete in grid report 2012-11-23 13:38:39 +05:30
Anand Doshi
34af63cf51 convert account amount to float in voucher import 2012-11-22 18:28:12 +05:30
Anand Doshi
ba6aafedad commented out chosen code -- unable to adjust the margin/position correctly 2012-11-22 17:38:48 +05:30
Anand Doshi
1e6f25086f syntax fix in voucher import tool 2012-11-22 16:54:54 +05:30
Anand Doshi
293e0124cd convert select to chosen, if specified in filters 2012-11-22 16:53:04 +05:30
Anand Doshi
d7f1bcbde6 changes to make select field compatible to chosen 2012-11-22 16:34:09 +05:30
Anand Doshi
93a35cab19 added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series 2012-11-21 18:02:22 +05:30
Anand Doshi
e65e621145 get_query for profile based link fields to enable searching by name 2012-11-19 15:43:18 +05:30
Rushabh Mehta
2a44bf8245 customer_issue: moved allocated to assigned 2012-11-15 15:11:15 +05:30
Rushabh Mehta
3684155f28 deprecated breadcrumbs, titles are now selectable 2012-11-13 16:44:27 +05:30
Rushabh Mehta
af416cf8ee saveupdate bugfix 2012-11-13 13:36:01 +05:30
Rushabh Mehta
c68fc3f3d7 trial balance, export ledgers only and groups only 2012-11-13 13:28:26 +05:30
Rushabh Mehta
9d0569a690 general_ledger: show against account, set title, and show is_opening as opening 2012-11-13 11:42:42 +05:30
Rushabh Mehta
c5a8d427f1 link fix in general ledger 2012-11-12 15:45:08 +05:30
Rushabh Mehta
fe7b444903 reportview, grid_report part of build and separate default dates 2012-11-12 15:39:47 +05:30
Rushabh Mehta
a0f7bd26f8 jv filter for against_jv, freeze fix, added show ledger in account 2012-11-12 14:57:12 +05:30
Anand Doshi
70d32da9fd made naming series mandatory in JV 2012-11-09 15:50:57 +05:30
Nabin Hait
4fecbc1b3d error fixes in voucher import tool 2012-11-07 17:38:39 +05:30
Nabin Hait
f597fe937f itemwise sales/purchase register js code cleanup 2012-11-06 17:35:25 +05:30
Nabin Hait
1e1d1c0a5f Validation message changed 2012-11-06 16:33:32 +05:30
Nabin Hait
f05d045fca Validation message changed 2012-11-06 16:31:42 +05:30
Anand Doshi
0c38d19ab8 hide transactions based on permissions in Trend Analyzer 2012-11-06 12:07:20 +05:30
Nabin Hait
9ff6ccb92f fixes in voucher import tool 2012-11-01 16:53:29 +05:30
Nabin Hait
cf543d1979 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-29 14:46:27 +05:30
Nabin Hait
e3ee0b5ee8 floating point tolerance increased 2012-10-29 14:45:58 +05:30
Anand Doshi
548eb7b1c3 change project get_query to include projects with status other than Completed and Cancelled 2012-10-29 14:26:38 +05:30
Nabin Hait
5a624eb3fb trend analyzer permission fix 2012-10-29 10:49:21 +05:30
Nabin Hait
e8a5e5e4b5 Import journal vouchers with multiple accounts 2012-10-28 15:44:50 +05:30
Nabin Hait
981d48339a Warehouse merging feature and update_bin cleanup 2012-10-26 14:42:48 +05:30
Nabin Hait
32c1293a45 issue fixed in bank reconciliation statement 2012-10-22 12:15:12 +05:30
Nabin Hait
fbdd7fc49f fixes in AR/AP reports 2012-10-19 12:18:31 +05:30
Nabin Hait
49c93661c1 Transaction Date removed and fixed in aging date calculation in AR/AP report 2012-10-17 11:03:56 +05:30
Anand Doshi
7aedaec6b6 added get_site_address method to website's init 2012-10-16 10:47:18 +05:30
Anand Doshi
d441ce9c02 fixed message url in recurring invoice error message 2012-10-15 14:50:08 +05:30
Anand Doshi
1a2f23254b changed label from Cheque No and Date to Reference Number and Date 2012-10-15 12:41:05 +05:30
Anand Doshi
2482bf32c0 fix in recurring invoice error email 2012-10-15 12:32:58 +05:30
Anand Doshi
9035aa825d fix in bank reconciliation 2012-10-12 14:51:06 +05:30
Nabin Hait
35d01ed3a4 fixes in bank reconciliation 2012-10-11 17:14:46 +05:30
Anand Doshi
cc798f4e0d fixed syntax error in journal voucher 2012-10-11 12:43:28 +05:30
Nabin Hait
66660f489e Merge branch 'master' of github.com:webnotes/erpnext 2012-10-10 15:38:58 +05:30
Nabin Hait
27b1c30735 fix cancelled gl entries :patch 2012-10-10 15:34:38 +05:30
Anand Doshi
1aace542c9 removed import error bypass and added missing py files for each doctype 2012-10-10 14:26:23 +05:30
Anand Doshi
d69b32e856 fix in get_balance_on for a date which does not fall within any fiscal year 2012-10-10 11:44:21 +05:30
Anand Doshi
d7972e361b Merge branch 'master' of github.com:webnotes/erpnext 2012-10-05 19:45:00 +05:30
Anand Doshi
bbe2403491 fix in get_fiscal_year 2012-10-05 19:29:11 +05:30
Nabin Hait
cca0b4aab7 error fixed in financial analytics and financial statement 2012-10-05 18:33:22 +05:30
Anand Doshi
de4aee7ffa removed accounts-home page roles 2012-10-05 16:31:12 +05:30
Anand Doshi
3ea58605de fixes in voucher import tool 2012-10-05 16:26:18 +05:30
Anand Doshi
372697d9c5 fixes in voucher import tool 2012-10-05 15:58:47 +05:30
Nabin Hait
8579262f61 hide master_name if not master_type 2012-10-05 14:34:09 +05:30
Nabin Hait
91e9e5c47b fields disables in account doctype 2012-10-05 14:18:38 +05:30
Nabin Hait
5417f5666c deprecated dashboard 2012-10-05 12:11:23 +05:30
Anand Doshi
cdba51c5a9 added page permissions, modified report listing links 2012-10-04 18:11:29 +05:30
Anand Doshi
278f93c941 Merge branch 'master' of github.com:webnotes/erpnext 2012-10-04 13:54:17 +05:30
Anand Doshi
90a54a0435 fixed: hide links based on roles in accounts home 2012-10-04 13:53:50 +05:30
Anand Doshi
809226bcb7 fixes in data import tool and voucher import tool 2012-10-04 13:26:04 +05:30
Rushabh Mehta
e7ccc317de dynamic loading for reports 2012-10-04 09:57:01 +05:30
Nabin Hait
97971c43e0 bank reco fixes 2012-10-03 17:47:10 +05:30
Nabin Hait
5e66ce121b fix wrong vouchers due to Valuation charges 2012-10-03 16:58:24 +05:30
Nabin Hait
92dd87f0fe debit-credit tolerance increased to .005 2012-10-03 13:33:13 +05:30
Nabin Hait
9462ce9aef Taxes and charges category issue fixed 2012-10-03 11:54:06 +05:30
Nabin Hait
bc06c7c17c Fixes in GL Mapper 2012-10-03 11:13:12 +05:30
Rushabh Mehta
2ccabb26c2 jv print format & core module appframe fix 2012-10-02 16:49:41 +05:30
Rushabh Mehta
4b1894aa85 jv merge fix 2012-10-02 16:27:23 +05:30
Rushabh Mehta
0b24c5ec0c Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-02 15:58:19 +05:30
Rushabh Mehta
9d1faea10c separated query-report and added module marker to appframe 2012-10-02 14:56:41 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
 2012-10-02 14:35:20 +05:30
Anand Doshi
3245a15cb7 added future imports 2012-10-01 11:35:49 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
b83307823b Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 12:39:37 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
224714c248 no role access for financial analytics 2012-09-28 10:23:27 +05:30
Rushabh Mehta
b0f1d71950 fixed voucher import tool 2012-09-26 16:22:03 +02:00
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
0aed26d83d moved report to folder 2011-09-15 13:00:46 +05:30
Rushabh Mehta
5f50617121 removed readme 2011-09-13 15:48:51 +05:30
Nabin Hait
4b66a1fa71 sales person incentives added in mapper exception flds 2011-09-13 13:35:14 +05:30
Nabin Hait
048b1a98bc voucher wise tax details report link added in accounts module 2011-09-12 13:25:04 +05:30
Nabin Hait
ad61f81f85 Added new report: voucher wise tax details 2011-09-12 13:24:08 +05:30
Nabin Hait
c94ba8a4c0 error fixed in accounts payable (column shifted) 2011-09-09 17:47:08 +05:30
Nabin Hait
4ddb36c518 exception flds added in mapper 2011-09-09 16:16:49 +05:30
Nabin Hait
fe8df0adb4 onload server calls in post render fn 2011-09-09 16:09:24 +05:30
Nabin Hait
8f494265ba fixed issue in reposting 2011-09-08 19:09:39 +05:30
Nabin Hait
f90f673903 validation logic changed in SO-RV mapper 2011-09-06 15:25:19 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Nabin Hait
e91fa64e58 fixed error in receivable voucher (fetching pos warehosue) 2011-09-05 14:21:46 +05:30
Rushabh Mehta
09938bda69 synced timestamps 2011-09-05 13:18:59 +05:30
Rushabh Mehta
2a9afbf4f6 synced timestamps 2011-09-05 13:17:22 +05:30
Rushabh Mehta
962e92ee00 timestamps, comments 2011-09-05 13:14:18 +05:30
Brahma K
779cfafa41 modified general ledger to add opening balance 2011-09-02 16:55:03 +05:30
Brahma K
cc236198f7 Feature Setup merge with upstream 2011-08-30 09:32:41 +05:30
Rushabh Mehta
a5109b7441 added erpnext_version file 2011-08-29 15:22:29 +05:30
Rushabh Mehta
dcaaea5041 merged from webnotes/erpnext 2011-08-29 10:47:58 +05:30
Nabin Hait
2c03015537 same from and to flds deleted from mapper 2011-08-25 19:41:24 +05:30
Brahma K
29d5549bde Features Setting 
1. Features Setting DocType
2. Startup.js will be added with a function which binds with refresh of doc
3. Startup.js contains the Features dictionary
 2011-08-25 16:20:16 +05:30
Nabin Hait
2a081c5cfa loan document deleted from git 2011-08-24 14:06:56 +05:30
Nabin Hait
7caae4d71a removed eval 2011-08-23 15:57:06 +05:30
Nabin Hait
503164ae15 Merge pull request #48 from nabinhait/master 
removed eval: hot fix
 2011-08-22 02:54:24 -07:00
Nabin Hait
ff4bf867bf removed eval in pull_details fn 2011-08-22 15:23:24 +05:30
Nabin Hait
a891bd445b Merge pull request #45 from nabinhait/master 
Serial No Issues
 2011-08-18 00:25:00 -07:00
Nabin Hait
81e36a34a6 Budget variance report based on company 2011-08-17 15:03:01 +05:30
Nabin Hait
d075a6c53d Removed cstr in return for get_server_fields() 2011-08-17 10:50:57 +05:30
Nabin Hait
192db6a7cd str removed for get_server_fields return 2011-08-17 10:28:46 +05:30
Brahma K
8703734087 Development is merged into Master 2011-08-16 14:33:32 +05:30
Brahma K
b77bfdb990 BOM Related changes (1.Unset as Default BOM, 2.Flat BOM Repair 3.delete_doc issue) 2011-08-16 12:10:51 +05:30
Rushabh Mehta
89717292b7 fixed get_server_values to make them utf-8 friendly 2011-08-12 10:55:43 +05:30
Nabin Hait
3cb7b165d1 considered half day lwp in sal slip 2011-08-08 14:58:38 +05:30
Nabin Hait
f82b1cc4bd old_parent field in account is linked to Account now, it will fix account renaming bug 2011-08-05 13:23:14 +05:30
Nabin Hait
7c285712e1 fixed error in period closing voucher 2011-07-28 16:25:11 +05:30
Nabin Hait
f88f2f4d13 Merge branch 'master' of github.com:webnotes/erpnext 2011-07-28 16:01:55 +05:30
Nabin Hait
3df2859299 update modified date of JV through bank reconciliation 2011-07-28 16:01:16 +05:30
Nabin Hait
43a3a619b3 clearance date will be copy while amending journal voucher 2011-07-28 15:38:23 +05:30
Brahma K
4e5fcf03fc Journal Voucher .txt file added 2011-07-28 15:29:12 +05:30
Brahma K
67b8da652c Added Lease Agreement text files 2011-07-28 12:58:14 +05:30
Brahma K
27f9f5edb7 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
	accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt
	accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt
 2011-07-28 12:41:42 +05:30
Brahma K
f1353e231d Added js,py and txt files related to Lease Agreement and its reports 2011-07-28 12:23:45 +05:30
Rushabh Mehta
5f3010735b updated email digest ui 2011-07-27 17:43:21 +05:30
Nabin Hait
7081d5e300 Check if any gl entry exists instead of current balance while delete/cancel or conveted from ledger to group or vice versa 
Excluded trashed account from Balance sheet and P&L statement
Added is_cancelled check in mis control
 2011-07-27 15:43:37 +05:30
Nabin Hait
d29916b7f5 file_list field hidden in bulk rename tool 2011-07-27 14:26:23 +05:30
Brahma K
3b1ebe0b24 Patch to give permission to Accounts Manager to Lease Agreement 2011-07-27 13:04:11 +05:30
Brahma K
a71160ebcc Added .txt in gitignore and added text files 2011-07-27 12:43:48 +05:30
Brahma K
0930762231 Added patch for Lease Agreement 2011-07-27 12:03:34 +05:30
Brahma K
790a78785b fixed conflict 2011-07-27 10:54:11 +05:30
Brahma K
d7db2ea20f Lease Agreement 
Used by leasing and loan agents (i.e. Automobile leasing etc) for receipt follow up and reporting

Account Transactions Upload
	Uploads transactions from a csv files, creates Journal Vouchers and submits
 2011-07-26 19:04:13 +05:30
Brahma K
8a76466d7c Lease Agreement 
Used by leasing and loan agents, who needs to followup their receipts against lease agreements
Contains leasing related reports with prefix "Lease"

Upload Account Transactions
Added a file to upload account transactions from csv file, which passes Journal Voucher and submits automatically
 2011-07-26 18:43:53 +05:30
Brahma K
7cd48f1d59 payable report in a single query 2011-07-21 17:57:32 +05:30
Brahma K
62a7b3cd4a loan file modification 2011-07-21 17:51:13 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
nabinhait
e6526369f3 Accounts Payable report improved: some query written outside the for-loop 
Supplier: supplier_status field has been deleted, not used by anyone except janak
index patch modified
 2011-07-19 18:09:26 +05:30
Brahma K
5e1d504483 Implemented the Auto JV posting upon Loan Installment posting 2011-07-15 19:35:24 +05:30
Brahma K
37fec6e219 Added Loan in Module Def 2011-07-15 11:20:04 +05:30
Rushabh Mehta
fd84f5ce90 added loan, loan_installment txts 2011-07-14 12:42:27 +05:30
Rushabh Mehta
62e77f536b added more features to loan 2011-07-14 12:41:39 +05:30
Rushabh Mehta
4fed41fb7a Merge branch 'master' of github.com:webnotes/erpnext into development 2011-07-14 10:59:20 +05:30
Rushabh Mehta
af596344ba merged conflict in gl_control.py 2011-07-13 14:37:17 +05:30
Rushabh Mehta
81aa8a0756 added loan and loan installment 2011-07-13 13:53:06 +05:30
Ravi Dey
6c174a6e35 company default currency fix 2011-07-11 16:40:49 +05:30
Nabin Hait
025d0620fe Merge branch 'master' of github.com:webnotes/erpnext 2011-07-10 13:50:00 +05:30
nabinhait
9f9b082f54 patch function written for illegal cancelled entry 2011-07-08 18:04:05 +05:30
Ravi Dey
b6e2488847 party_address fix 2011-07-08 15:33:18 +05:30
Ravi Dey
402ebab7df form_16a party address pull fix 2011-07-08 15:05:40 +05:30
Rushabh Mehta
a2ee615c94 added repost function gl_control 2011-07-06 16:15:59 +05:30
nabinhait
5deab24401 fixed conflict while merging with webnotes repo 2011-07-06 09:23:02 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
nabinhait
4b2f35ed79 fixed issue in update_voucher_outstanding 2011-07-05 14:25:47 +05:30
nabinhait
c297df5b16 Removed Tips Common from each js file 2011-07-05 10:54:05 +05:30
nabinhait
a56fc00ea3 resoved conflict in patch, company and renaming tools 2011-07-01 16:32:03 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
Ravi Dey
94a332a8ab Rename Tool updates 2011-07-01 13:50:34 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30
Ravi Dey
c1c54c9400 invoice account head fix 2011-06-30 18:10:20 +05:30
Ravi Dey
19da0247c8 fix cost center 2011-06-29 18:28:05 +05:30
Ravi Dey
73e155cadc Fixed Company Deletion 2011-06-29 17:50:12 +05:30
Ravi Dey
7d7d68e563 Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 19:01:32 +05:30
Ravi Dey
5708da5a9f Default currency for company fixed 2011-06-28 19:01:02 +05:30
nabinhait
d4be1aeb66 Merge branch 'master' of git@github.com:webnotes/erpnext 2011-06-28 16:22:30 +05:30
nabinhait
78f5bf6498 fixed conflict 2011-06-28 16:21:58 +05:30
Ravi Dey
2380eabb32 Fixed Company Default Currency in Accounts Browser 2011-06-28 14:55:50 +05:30
Ravi Dey
c5998ce2da Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 14:48:55 +05:30
Ravi Dey
bb24e5ff06 Fixed Company Default Currency in Accounts Browser 2011-06-28 14:48:19 +05:30
nabinhait
53e6b81322 synced to upstream 2011-06-28 14:44:27 +05:30
Anand Doshi
a6a8d57914 Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 13:47:32 +05:30
Anand Doshi
b74eec8e93 Removed sales_register1 and sales_register2 folders as they are not required anymore 2011-06-28 13:42:08 +05:30
Rushabh Mehta
ab24d950bb added sample tests 2011-06-28 13:26:02 +05:30
Anand Doshi
3766a5598d Merge branch 'master' of github.com:webnotes/erpnext 2011-06-28 13:11:45 +05:30
Anand Doshi
f295f212b1 Changed query to make it more efficient 2011-06-27 16:30:29 +05:30
Anand Doshi
c0d6502c9f Changed query for faster output. 2011-06-27 13:57:15 +05:30
nabinhait
dda379e2c0 removed trial bal sql file 2011-06-27 12:53:35 +05:30
Ravi Dey
560ee3d18d removed address from tabaccounts 2011-06-23 13:03:24 +05:30
nabinhait
aeee6bae4a last update 2011-06-22 18:25:29 +05:30
nabinhait
a18bef59ae Revert "trial bal: added filter to select what to show(group/ledger/both) and optionto show/hide zero balance" 
This reverts commit 9bffdc95da.
 2011-06-22 14:29:25 +05:30
nabinhait
60ee199e74 Revert "fixed indentation error" 
This reverts commit 3c48be9e60.
 2011-06-22 14:28:13 +05:30
nabinhait
9bffdc95da trial bal: added filter to select what to show(group/ledger/both) and optionto show/hide zero balance 2011-06-22 12:48:51 +05:30
nabinhait
3c48be9e60 fixed indentation error 2011-06-22 12:46:10 +05:30
nabinhait
5559ed9269 subject changed in payable voucher 2011-06-21 17:04:22 +05:30
nabinhait
31a73f2a26 fixed error in update_outstanding through fiscal year 2011-06-21 16:58:01 +05:30
nabinhait
6150e65f71 reload itemwise sales/purchase register: added new columns 2011-06-20 16:34:48 +05:30
nabinhait
95da6f6ad2 deleted server side code from itemwise pur register. Reason: itemwise tax rate was not considering, hence showing wrong result 2011-06-20 13:26:23 +05:30
nabinhait
69cf1a3a62 deleted server side code from itemwise pur register. Reason: itemwise tax rate was not considering, hence showing wrong result 2011-06-20 13:22:41 +05:30
nabinhait
fbf9a5853c deleted server side code from itemwise sales register report 2011-06-20 13:18:55 +05:30
nabinhait
a1c0148472 moved js and py file from itemwise_sales_register1 to itemwise_sales_register 2011-06-20 12:13:14 +05:30
nabinhait
804e6636e7 removed duplicate itemwise sales register 2011-06-20 12:05:30 +05:30
nabinhait
5299d1d293 removed scrapped fn get_pan_tan() from onload of tds payment 2011-06-15 16:15:27 +05:30
nabinhait
d537d1a078 fixed fetching of challan id in form 16A 2011-06-15 15:49:44 +05:30
nabinhait
75e67cfcdb in_words fld added in form 16a 2011-06-15 13:13:27 +05:30
nabinhait
e0250fbab6 Merge branch 'master' of git@github.com:webnotes/erpnext 2011-06-14 15:05:20 +05:30
Pratik Vyas
c1e6e4c752 Sourced wnframework-modules from Google Code as erpnext 2011-06-08 14:37:15 +05:30