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

1081 Commits

Author SHA1 Message Date
Anand Doshi
93b638af4d Merge branch 'master' into edge 
Conflicts:
	patches/patch_list.py
 2013-04-10 19:47:46 +05:30
Nabin Hait
54cab9cded [fixes] fixes in general ledger grid report 2013-04-10 16:04:18 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Nabin Hait
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Nabin Hait
a477d41843 [aii] some fixes 2013-04-08 12:39:11 +05:30
Nabin Hait
93b4e4d90c [JV] added letter head field in jv 2013-04-05 11:11:14 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Anand Doshi
0b9ec8cbc1 [auto inventory accounting] [fix] if non stock item, dont create gl entry in delivery note and pos sales invoice 2013-04-03 13:45:28 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Nabin Hait
eaeb50effa [fixes] small issue fixed in sales taxes and charges 2013-04-01 15:40:50 +05:30
Nabin Hait
1013e77957 fixes in checking print_hide property in standard print format 2013-04-01 12:18:36 +05:30
Nabin Hait
dc35137e20 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-30 17:47:56 +05:30
Anand Doshi
19acce9fa1 [aii] [patches] minor fixes 2013-03-29 20:40:23 +05:30
Anand Doshi
82433e81c6 Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release 2013-03-29 16:47:56 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Anand Doshi
10a209d405 [gross profit] [request] added Avg. Buying Rate column 2013-03-29 12:26:47 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Anand Doshi
8c45420f19 fixes in gross profit report 2013-03-28 16:40:30 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Anand Doshi
c09831f8f2 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 18:47:01 +05:30
Anand Doshi
96b189c118 fixes in test cases and buying amount function 2013-03-26 18:43:10 +05:30
Nabin Hait
d1d7de2b43 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 17:44:17 +05:30
Nabin Hait
88eb328622 fixes: show deducted tax in purchase register 2013-03-26 17:44:00 +05:30
Rushabh Mehta
f9d2ff067e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 17:16:15 +05:30
Rushabh Mehta
e9ef6be57f [rename] [feature] added merge feature to rename_doc 2013-03-26 17:15:49 +05:30
Nabin Hait
808b085057 fixes: make payment entry from purchase invoice 2013-03-26 17:07:11 +05:30
Nabin Hait
19da7b8bdf fixes: fetching from pos setting 2013-03-26 15:47:46 +05:30
Nabin Hait
7483485ac0 fixes: fetching from pos setting 2013-03-26 15:43:18 +05:30
Nabin Hait
495db08104 copy expense account to all row if entered in one 2013-03-26 15:24:56 +05:30
Nabin Hait
e28efd8dc8 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 15:03:49 +05:30
Nabin Hait
b3b335c89e fixes: make payment entry from sales invoice 2013-03-26 15:03:13 +05:30
Anand Doshi
ea4b05bb2c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 14:49:48 +05:30
Anand Doshi
40dc9e83a5 fixes in test cases and added fiscal year field to stock reco 2013-03-26 14:49:25 +05:30
Rushabh Mehta
08c33bd6bc [accounts] [fix] aganist_jv query error 2013-03-26 14:43:41 +05:30
Rushabh Mehta
f5784e785a [accounts] [fix] aganist_jv query error 2013-03-26 14:41:09 +05:30
Nabin Hait
e1c76a1a8e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-26 13:01:28 +05:30
Nabin Hait
4a4ae0840a expense account optional mandatory in pos setting 2013-03-26 13:00:53 +05:30
Nabin Hait
fd606afcb9 expense account optional mandatory in pos sett 2013-03-26 12:50:03 +05:30
Anand Doshi
fc33ef6bfb fixes in purchase invoice 2013-03-26 12:13:14 +05:30
Nabin Hait
72d9c5b724 fixed floating point issue in jv 2013-03-26 11:54:40 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Rushabh Mehta
e97ce3475d [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:55:24 +05:30
Rushabh Mehta
2f8ad5e5c1 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:48:57 +05:30
Rushabh Mehta
df8b652402 [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher 2013-03-25 15:44:36 +05:30
Rushabh Mehta
c5570c6341 added warehouse company validation, if warehouse is added to company 2013-03-25 15:21:24 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
aeed499d12 Merge branch 'master' into edge 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
 2013-03-22 18:43:47 +05:30
Anand Doshi
b632ba5f51 changed fieldtype of repeat_on_day_of_month to Int 2013-03-22 18:38:33 +05:30
Akhilesh Darjee
2f2ac966ad Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-22 18:28:51 +05:30
Akhilesh Darjee
ac61ec3a5b Permissions problem in invoice fixed. 2013-03-22 18:20:11 +05:30
Anand Doshi
c8e64f5d42 shifted field category of Purchase Taxes and Charges to the left 2013-03-22 16:49:16 +05:30
Anand Doshi
ceba917e86 Merge branch 'master' into edge 2013-03-22 14:16:53 +05:30
Anand Doshi
a47ac1bed0 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-22 13:32:11 +05:30
Anand Doshi
a3b9b1a868 added filters from date and to date 2013-03-22 13:16:10 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Nabin Hait
54e79995ee fixes in trend analyzer 2013-03-22 12:35:11 +05:30
Anand Doshi
8c5844e3fb show sales invoice data in gross profit report 2013-03-21 20:24:10 +05:30
Anand Doshi
6d8d3b4cee fixes in gross profit report 2013-03-21 18:45:02 +05:30
Nabin Hait
a0e7c1539b aii: book expense in delivery note instead of sales invoice 2013-03-21 18:37:06 +05:30
Rushabh Mehta
af578d73ef merge 2013-03-21 17:40:08 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Akhilesh Darjee
34c13ac52c added description to sales_invoice.txt 2013-03-21 13:22:32 +05:30
Akhilesh Darjee
fadffcf528 description added to 'Is Opening' and 'Aging Date' field 2013-03-21 13:06:41 +05:30
Anand Doshi
407331675f recurring invoice test cases, set period start date and period end date as first and last day of the month if previously so, else just add months 2013-03-20 21:14:03 +05:30
Anand Doshi
7da72dd449 unlink against voucher in jv when Purchase Invoice, Sales Invoice or Journal Voucher are cancelled 2013-03-20 17:00:41 +05:30
Nabin Hait
364f08a171 fixed conflict 2013-03-19 18:29:05 +05:30
Nabin Hait
80abad2ee0 aii: default account from company 2013-03-19 18:18:52 +05:30
Anand Doshi
9a20cc5cd8 Merge branch 'sales_purchase_return' 2013-03-19 16:23:11 +05:30
Nabin Hait
fbafced1e4 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 13:53:55 +05:30
Anand Doshi
688b52e14b increase width of taxes table in print format 2013-03-19 13:35:40 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Anand Doshi
5afe037a5b deprecate sales and purchase return tool 2013-03-18 17:59:56 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Anand Doshi
f55922e962 fix in chart of accounts balance display 2013-03-13 12:53:00 +05:30
Anand Doshi
c9d229ec9e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:06:06 +05:30
Nabin Hait
bffbc18b2d fixes in cleanup data 2013-03-12 10:41:21 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Nabin Hait
0e6ce9af17 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 18:50:23 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Nabin Hait
ad7266e48d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 11:42:47 +05:30
Nabin Hait
58b2a101ae aii: testcases for sales invoice gl entries 2013-03-07 11:42:14 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Nabin Hait
a72c5127a6 aii: gl entries for delivery note 2013-03-06 18:50:53 +05:30
Nabin Hait
87b9cd5ba1 use get_global_default instead of control panel 2013-03-06 13:15:08 +05:30
Nabin Hait
acd52a021b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 18:23:50 +05:30
Nabin Hait
46043f2d94 messages updated in voucher import tool 2013-03-05 18:23:34 +05:30
Anand Doshi
b343a4895c fix in empty col check in voucher import tool 2013-03-05 17:24:15 +05:30
Anand Doshi
bec17f078c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:44:28 +05:30
Anand Doshi
18c1980e38 voucher import tool - throw message if empty columns are found 2013-03-05 14:44:05 +05:30
Rushabh Mehta
ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:20:24 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
5640a69e78 updated sync 2013-03-05 14:12:34 +05:30
Anand Doshi
1f3a5c3798 use validate value method to validate valuation rate should be greater than 0 in stock entry 2013-03-05 12:25:15 +05:30
Anand Doshi
9bba9ed4d2 fixes in cform 2013-03-04 17:48:31 +05:30
Nabin Hait
4c5af2f33d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-04 15:36:27 +05:30
Nabin Hait
0d20d6fdd2 fixes for purchase price list 2013-03-04 15:35:45 +05:30
Rushabh Mehta
f934a240ba refactored get_value and added backlink check in 'cancel' 2013-03-04 15:34:45 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
fee642d547 completed Time Log / Time Log Batch 2013-03-01 18:24:52 +05:30
Nabin Hait
37ef553f6b fixes for sub_contracting 2013-03-01 17:39:41 +05:30
Nabin Hait
1ead851e16 datatype validation in voucher import tool 2013-03-01 13:21:29 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Nabin Hait
a71ace0d74 fixed asynchronus issue in purchase cycle 2013-02-28 16:30:53 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
d4d0288540 fixed test case of purchase invoice for auto inventory accounting 2013-02-27 18:29:13 +05:30
Anand Doshi
55d9a62114 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py
 2013-02-27 18:14:28 +05:30
Nabin Hait
5418d71fc0 sub-contracting rewrite with testcases 2013-02-27 18:11:17 +05:30
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30
Anand Doshi
9d794fccc1 fixes in jv test and purchase invoice test 2013-02-27 13:34:22 +05:30
Anand Doshi
a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt 2013-02-26 18:09:47 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Nabin Hait
d09cec71da fixes in print format for recurring invoice period 2013-02-26 11:13:21 +05:30
Nabin Hait
6dfa84164e fixes in new gross profit report 2013-02-25 18:57:41 +05:30
Anand Doshi
258c3fb228 new gross profit report based on query report 2013-02-25 18:17:51 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
586ee7603f query report reload fix 2013-02-23 14:39:53 +05:30
Anand Doshi
05f90651f6 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 18:02:43 +05:30
Anand Doshi
ebae9ae272 fix in financial statements 2013-02-22 18:02:06 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Rushabh Mehta
c359a58766 added Item Name in pending type query reports 2013-02-22 10:48:07 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Nabin Hait
8f7899a642 added stopped condition in pending to deliver/received/billed report 2013-02-21 11:44:08 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
 2013-02-21 11:09:43 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Rushabh Mehta
2fe861fa71 defaults cleanup 2013-02-19 15:54:15 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Anand Doshi
89869cf635 fixes in purchase invoice listing 2013-02-18 12:09:29 +05:30
Rushabh Mehta
aae45532f3 request: remove _type from form 2013-02-15 14:39:34 +05:30
Anand Doshi
fb67605042 fix in trend analyzer - show currency only for amt field 2013-02-14 15:50:01 +05:30
Anand Doshi
e74a1f2b85 fixes in outstanding amount calculation on cancellation of payment entry 2013-02-14 13:38:12 +05:30
Nabin Hait
362455e749 fix outstanding and floating point issue in gl entry 2013-02-13 15:50:39 +05:30
Rushabh Mehta
1c9e96f3a1 Merge branch 'edge' 2013-02-13 12:00:27 +05:30
Nabin Hait
bcbc2f6ce5 c-form fixes 2013-02-13 11:30:14 +05:30
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Nabin Hait
4860754407 call calc_adjustment_amount function only if docstatus is zero 2013-02-12 18:49:55 +05:30
Nabin Hait
cd50c2513f removed wrong validation 2013-02-12 15:46:24 +05:30
Nabin Hait
945b39f984 fixes in payemnt reconciliation 2013-02-12 15:17:25 +05:30
Nabin Hait
b31c222c0e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-11 13:57:48 +05:30
Nabin Hait
fdb4d49ae3 get_query 2013-02-11 13:56:47 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
872359c61c pass purchase invoice test cases 2013-02-08 19:34:18 +05:30
Anand Doshi
3c1fee7c6e validate fiscal year reused from accounts.utils 2013-02-08 19:28:32 +05:30
Anand Doshi
8595fcf910 purchase invoice taxes and totals calculations with test cases 2013-02-08 19:28:14 +05:30
Anand Doshi
a11a21c6a9 changed _Test Fiscal Year to _Test Fiscal Year 2013 2013-02-08 19:27:38 +05:30
Nabin Hait
2604a99072 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 14:08:28 +05:30
Nabin Hait
0739e7f573 fixed conflict 2013-02-08 14:07:29 +05:30
Nabin Hait
a76a0687ef get_query continued 2013-02-08 14:04:13 +05:30
Anand Doshi
6a5efa972b added test record for purchase invoice test case 2013-02-08 13:57:05 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
dc95c15002 changed args to filters in get_query 2013-02-07 12:08:38 +05:30
Nabin Hait
e343ac7173 fixes in voucher import tool 2013-02-06 18:42:26 +05:30
Nabin Hait
b5bc99376e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 17:40:46 +05:30
Nabin Hait
fa230e47f4 get_query shifted to server for account 2013-02-06 17:40:14 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Anand Doshi
22807a61cd patch to remove accounts/utils folder and removed unrequired test cases related to unused tax controller 2013-02-06 15:41:32 +05:30
Rushabh Mehta
1d98e6c61c Merge branch 'edge' 2013-02-06 08:50:59 +05:30
Rushabh Mehta
c2563effbf added test case for leave_application 2013-02-05 23:25:37 +05:30
Nabin Hait
6fb3814b92 added project column in to be delivered/billed report 2013-02-05 16:56:14 +05:30
Nabin Hait
7bdf27b19c new feature: validation on account negative balance 2013-02-05 15:52:46 +05:30
Rushabh Mehta
9607582881 currency fix 2013-02-05 11:39:49 +05:30
Rushabh Mehta
e9c334a778 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-05 11:31:56 +05:30
Rushabh Mehta
2e8d078adf adding block list, part 1 2013-02-05 11:31:27 +05:30
Nabin Hait
98c6bbf1e7 make gl entry only if amount is there 2013-02-04 18:35:54 +05:30
Nabin Hait
1af093f6b0 fixes in purchase invoice gl entry 2013-02-02 22:33:26 +05:30
Rushabh Mehta
6282c4a18a added bar indicators to Sales Invoice & Purchase Invoice 2013-02-02 15:12:45 +05:30
Nabin Hait
9159786d35 fixes in budget control 2013-02-01 17:49:56 +05:30
Nabin Hait
41434f1eb4 fixes for gl entries in purchase invoice 2013-02-01 17:14:30 +05:30
Nabin Hait
982a0a0e0a fixes for gl entries in purchase invoice 2013-02-01 17:03:05 +05:30
Nabin Hait
1a2974c53d fixes for gl entries in purchase invoice 2013-02-01 16:50:54 +05:30
Nabin Hait
2feab912a1 fixes in budget control 2013-02-01 16:34:48 +05:30
Nabin Hait
24c4bb5d6a fixes in sales invoice 2013-02-01 16:03:50 +05:30
Nabin Hait
298b334cb6 account type field added in payment reconciliation tool 2013-02-01 14:09:07 +05:30
Nabin Hait
cc9528c8e2 removed gl mapper with patch 2013-02-01 12:15:44 +05:30
Nabin Hait
fb3fd6e3e5 deprecated gl_control and some rewrites 2013-01-30 19:16:13 +05:30
Nabin Hait
53595c6521 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-30 12:49:44 +05:30
Nabin Hait
bf495c9a6d GL Control rewrite and many other cleanup using inheritence 2013-01-30 12:49:08 +05:30
Rushabh Mehta
9732250a83 ignore create permission in gl control 2013-01-30 11:46:59 +05:30
Nabin Hait
7c40531a7e Update accounts/doctype/gl_control/gl_control.py 
ignore permission while creating account for customer and supplier
 2013-01-29 18:55:34 +05:30
Rushabh Mehta
dacfa901c6 finished listviews 2013-01-29 18:33:48 +05:30
Rushabh Mehta
abf8fe414b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 17:54:04 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Anand Doshi
55b93764b4 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 17:05:42 +05:30
Anand Doshi
763fcf735d removed Accounts User role for accounts report pages 2013-01-29 17:05:00 +05:30
Nabin Hait
cc8312a98d gl_entry_map for journal voucher 2013-01-29 11:35:07 +05:30
Nabin Hait
2df4d546ae make_gl_entry function in account_controller: deprecated gl mapper 2013-01-29 11:34:39 +05:30
Nabin Hait
23941aa8f2 accounts utils file instead of utils directory 2013-01-29 11:32:38 +05:30
Nabin Hait
53e36b34d3 fixed syntax issue in financial statements 2013-01-29 10:47:58 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Nabin Hait
d4c7159f60 fixes in dynamic label setting and column hiding based on currency 2013-01-25 18:31:06 +05:30
Rushabh Mehta
d9acb4bc0d Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 17:25:39 +05:30
Nabin Hait
f89fb1e41a Other charges in currect currency fixes for all classic/modern/spartan print g=format 2013-01-25 17:24:47 +05:30
Rushabh Mehta
83e08362bd nsm bug in customer_group and removed abbr in Cost Center 2013-01-25 15:11:26 +05:30
Rushabh Mehta
9babf9dbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 11:58:45 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Nabin Hait
27b4a92b02 error fixed in recurring invoices 2013-01-25 11:10:29 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
877a1a9274 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 15:56:15 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Nabin Hait
282d8cdd34 Removed 'Tax Included in Print Rate' from no_copy 2013-01-24 14:19:43 +05:30
Rushabh Mehta
c3c67d31ec merge fix 2013-01-23 19:57:35 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Nabin Hait
3ac8e59cb8 fixes in payment reconciliation 2013-01-23 13:59:29 +05:30
Nabin Hait
8e4a772a35 fixes in payment reconciliation 2013-01-23 13:59:00 +05:30
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Rushabh Mehta
efe8102351 merge 2013-01-22 15:23:58 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
025e01322c stock balance report: qty and value in same page, valuation method from item master 2013-01-22 14:03:34 +05:30
Nabin Hait
ec52db8490 commonified in_words function and introduced selling_controller 2013-01-22 11:53:14 +05:30
Nabin Hait
0394f78382 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-01-22 11:22:53 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Rushabh Mehta
cb46a2df55 accounts_browser: fix for number formatting 2013-01-21 21:58:53 +05:30
Rushabh Mehta
6dd9d4583d updated payment receipt voucher format 2013-01-21 18:44:43 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
9700bafbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-21 16:29:05 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Nabin Hait
ec44cd763e in payment matching tool only show outstanding invoices 2013-01-21 12:29:20 +05:30
Nabin Hait
8f4c78c4bf in payment matching tool only show outstanding invoices 2013-01-21 11:57:03 +05:30
Rushabh Mehta
1a6220a332 Merge branch 'master' into edge 2013-01-21 10:33:22 +05:30
Rushabh Mehta
4ef3a28450 journal voucher difference fix 2013-01-21 10:32:28 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Nabin Hait
f2223102e2 removed supplier account field from jv 2013-01-18 17:45:24 +05:30
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Nabin Hait
b9b1e67c7d made c-form submittable 2013-01-18 12:58:21 +05:30
Anand Doshi
2865571cb9 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	patches/patch_list.py
 2013-01-18 12:32:00 +05:30
Nabin Hait
a642ae14eb updated gl mapper for tds entry 2013-01-18 10:49:39 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Nabin Hait
16546d25e7 gl control cleanup[ 2013-01-17 18:43:54 +05:30
Nabin Hait
274de5462b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:27:20 +05:30
Nabin Hait
1efaf841c4 payment reconciliation fixes 2013-01-17 18:26:58 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
a81010a5b3 removed debug mode 2013-01-17 17:25:55 +05:30
Nabin Hait
144ba186d3 fixes in c-form 2013-01-17 17:21:29 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
 2013-01-14 13:28:31 +05:30
Rushabh Mehta
6995bb36e8 module apostrophe link issue 2013-01-14 10:27:18 +05:30
Anand Doshi
4d79bfb225 added back Trend Analyzer report to home pages 2013-01-11 19:06:57 +05:30
Rushabh Mehta
1233c4a800 financial statements: show only companies where permission is given 2013-01-11 11:00:20 +05:30
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