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

1232 Commits

Author SHA1 Message Date
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Anand Doshi
ea55734df5 [fix] [minor] delivered items to be billed 2013-09-05 12:41:16 +05:30
Anand Doshi
8543469fba Merge branch 'master' of github.com:webnotes/erpnext 2013-09-05 12:22:14 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master 
[pos][fix] fixed pos view in sales_invoice.js
 2013-09-04 22:03:42 -07:00
Akhilesh Darjee
734b2aab5c [fix] pos setting link fields validate to specific company 2013-09-04 18:48:08 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Anand Doshi
0e23929740 Merge branch 'master' into customer-login 2013-09-03 16:42:21 +05:30
Anand Doshi
1dadf35fc7 [fix] [minor] [query] sales invoice from delivery note 2013-09-03 16:21:01 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Akhilesh Darjee
45af0a18b6 [pos] [minor] pos setting fix 2013-09-02 19:05:55 +05:30
Akhilesh Darjee
7a274e4d2f [pos] [minor] pos print format & pos setting cancel function allowed 2013-09-02 18:53:09 +05:30
Akhilesh Darjee
12425ce85e [pos] [minor] pos completed 2013-09-02 18:48:39 +05:30
Nabin Hait
da3110fc12 [merge] [minor] merged with master 2013-09-02 13:07:49 +05:30
Anand Doshi
ddb7c8048e Merge branch 'master' of github.com:webnotes/erpnext into customer-login 2013-09-02 11:13:32 +05:30
Nabin Hait
0ddcc6f7cf [fix] [minor] set invoice due date based on credit days 2013-08-31 10:19:56 +05:30
Nabin Hait
5836c58a4b [docs] [minor] accounting for stock 2013-08-31 10:17:27 +05:30
Nabin Hait
94c90bdbf9 [fix] [minor] buying amount for sales bom item 2013-08-30 22:48:19 +05:30
Anand Doshi
c8e39b0965 [fix] [minor] use prop instead of attr to disable a field 2013-08-30 18:22:58 +05:30
Nabin Hait
da1e503f3d [fix] [minor] removed sample item field from item 2013-08-30 16:24:44 +05:30
Akhilesh Darjee
cf0b6d579f [pos] POS Invoice print format done 2013-08-29 19:21:03 +05:30
Nabin Hait
bb77756069 [fix] [minor] auto accounting for stock transactions 2013-08-29 18:19:37 +05:30
Akhilesh Darjee
d2714310ed [pos][minor] barcode clear timeout done 2013-08-28 19:35:22 +05:30
Nabin Hait
d85d63bb81 [minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry 2013-08-28 19:24:52 +05:30
Nabin Hait
2e296fa46f [fix] [minor] Repost future gl entries and testcases 2013-08-28 18:53:11 +05:30
Akhilesh Darjee
f3eae2344b [pos][minor] fixed sales_invoice.js for pos view 2013-08-28 11:50:01 +05:30
Anand Doshi
c753d31ba7 [fix] [minor] erpnext demo 2013-08-26 17:33:50 +05:30
Nabin Hait
92b0e777e8 [fix] [minor] merged with master 2013-08-26 16:55:42 +05:30
Nabin Hait
27994c216a [perpetual accounting] gl entries based on stock_value difference in sl entries 2013-08-26 16:53:30 +05:30
Anand Doshi
6c0a1a9674 [fix] [minor] temporarily disabled pos view 2013-08-23 19:30:44 +05:30
Akhilesh Darjee
1f0b8606d6 [pos][minor] 2013-08-23 18:22:32 +05:30
Nabin Hait
aeba24ee81 [minor] make gl entry through bean and testcases 2013-08-23 15:17:36 +05:30
Rushabh Mehta
cb50dee98c [pos] [minor] added css file 2013-08-23 13:35:21 +05:30
Rushabh Mehta
16a62fa4be [pos] [cleanup] 2013-08-23 13:16:22 +05:30
Nabin Hait
a391606a8f [cleanup] [minor] budget code cleaned up with testcases 2013-08-23 10:46:41 +05:30
Nabin Hait
2b06aaa291 [cleanup] [minor] deprecated budget control and rewritten budget related code 2013-08-22 18:25:43 +05:30
Akhilesh Darjee
d6aa4bff7f [pos] pos view first commit 2013-08-22 17:26:43 +05:30
Nabin Hait
4212180804 Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 15:23:11 +05:30
Rushabh Mehta
622c98d6f4 [demo] [minor] Added accounts, moved JV creation to server-side 2013-08-22 15:17:58 +05:30
Nabin Hait
f3075e19dc Merge branch 'master' of github.com:webnotes/erpnext into perpetual 2013-08-22 14:42:20 +05:30
Nabin Hait
b4418a4997 [minor] budget cleanup 2013-08-22 14:38:46 +05:30
Nabin Hait
77343391f5 [fix] [minor] changed validation message 2013-08-22 10:45:41 +05:30
Nabin Hait
11bd44e447 [minor] fixed conflict while merging with master 2013-08-21 17:51:46 +05:30
Rushabh Mehta
cce21d11fa [major] upgrade to bootstrap 3 2013-08-21 17:48:08 +05:30
Nabin Hait
9b09c95d83 [cleanup] [accounts] delete gl entries on cancellation of accounting transactions 2013-08-21 17:47:11 +05:30
Nabin Hait
4af17a88b0 [cleanup] [minor] period closing voucher inherited from accounts_controller with testcases 2013-08-21 17:45:47 +05:30
Nabin Hait
9653f60e89 [fix] [minor] insert cancelled sl entry for serialized inventory and at the end delete 2013-08-20 15:37:33 +05:30
Nabin Hait
05652874fc [merge] [minor] merged with master for serial_no updatess 2013-08-20 11:28:38 +05:30
Nabin Hait
76273ebfbc [merge] [minor] Fixed conflict while merging serial_no branch with master 2013-08-19 16:26:13 +05:30
Nabin Hait
74c281cc55 [cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction 2013-08-19 16:17:18 +05:30
Nabin Hait
44da6f2efe [fix] [minor] fixed conflict while merging with master 2013-08-19 11:06:06 +05:30
Nabin Hait
176f3afd14 [fix] [minor] fixes in POS Invoice print format 2013-08-16 16:17:34 +05:30
Nabin Hait
3ccd07cc72 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:21:25 +05:30
Nabin Hait
21cf403b57 [fix] [minor] paid amount should be zero if not pos invoice 2013-08-16 15:15:16 +05:30
Rushabh Mehta
170be3b717 [minor] merge master 2013-08-14 18:41:42 +05:30
Rushabh Mehta
62030e05cc [Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master 2013-08-14 18:39:27 +05:30
Anand Doshi
30324b857a [fix] [minor] set due date in sales invoice after mapping 2013-08-14 17:07:42 +05:30
Anand Doshi
379acbbd77 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-14 14:23:07 +05:30
Anand Doshi
9618cb8ef1 [fix] [minor] downsample data to 1000 points before plotting using flot.downsample plugin 2013-08-14 14:22:47 +05:30
Nabin Hait
29c8327a2f [fix] [minor] Analytics role added in Financial Statements report 2013-08-14 12:48:41 +05:30
Anand Doshi
dd2ec17962 [fix] [minor] pull credit days from customer, update credit days in account of customer 2013-08-13 13:57:53 +05:30
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Anand Doshi
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Nabin Hait
4af2dbf84d [perpetual accounting] [minor] patch for intial setup 2013-08-12 12:24:08 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Nabin Hait
fd6a650e12 [perpetual accounting] [minor] create jv to book stock received but not billed 2013-08-09 14:42:48 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +05:30
Anand Doshi
79251492fe [fix] [minor] call set_dynamic_labels after onload_post_render 2013-08-09 00:20:34 +05:30
Anand Doshi
38a07cf86a [fix] [chart of accounts] view ledger should show correct account's ledger 2013-08-08 18:49:58 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Anand Doshi
1c77745d05 [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +05:30
Anand Doshi
5dd6b1d082 [optimization] [minor] pass filtered stock ledger entries to get_buying_amount 2013-08-07 19:27:30 +05:30
Nabin Hait
815a49e027 [perpetual accounting] fixes in testcases 2013-08-07 17:00:01 +05:30
Nabin Hait
cdd1d4bedb [perpetual accounting] fixes in testcases 2013-08-07 15:16:42 +05:30
Nabin Hait
aa34201dde [perpetual accounting] fixes in testcases 2013-08-07 14:21:04 +05:30
Nabin Hait
8daa702a90 Merge branch 'master' into perpetual 2013-08-07 12:46:50 +05:30
Nabin Hait
469ee71615 [perpetual accounting] [minor] fixes for test cases 2013-08-07 12:33:37 +05:30
Anand Doshi
fbe1e167d4 [fix] [selling] reduce round-off loss when using tax inclusive price 2013-08-06 19:38:19 +05:30
Nabin Hait
cc0e2d1740 [minor] merged with master 2013-08-06 16:19:18 +05:30
Nabin Hait
43eba26dcf [perpetual accounting] make gl entries relevant for different transactions 2013-08-06 16:00:50 +05:30
Nabin Hait
94d3963dd2 [perpetual accounting] get account stock balance difference 2013-08-06 15:58:44 +05:30
Nabin Hait
d9f4d174d1 [minor] [fix] 2013-08-06 15:28:55 +05:30
Nabin Hait
0d462745d2 Update sales_invoice.js 2013-08-06 15:26:52 +05:30
Rushabh Mehta
d056e1b453 [minor] added webnotes.get_list, fixed webnotes/erpnext#663 2013-08-05 16:21:04 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Nabin Hait
7e405e26b6 [fix] [minor] expense head get_query fixed in purchase invoice 2013-08-05 13:00:20 +05:30
Nabin Hait
4b7a79c2b3 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-05 12:44:30 +05:30
Nabin Hait
7895d34d41 [fix] [minor] SO/DN required validation and get_single_value deprecated 2013-08-05 12:44:10 +05:30
Nabin Hait
73d04b155c [minor] [fix] test cases fix for perpetual accounting 2013-08-05 12:19:38 +05:30
Rushabh Mehta
c12553fba1 [journal voucher] [minor] added Reference section break in Journal Voucher Detail 2013-08-02 18:20:10 +05:30
Nabin Hait
0b6e590766 [fix] [minor] get supplier details in purchase invoice 2013-08-02 16:08:04 +05:30
Nabin Hait
a36adbd1e0 [minor] [fix] make sl entry 2013-08-02 14:50:12 +05:30
Anand Doshi
6affb78e1f [minor] moved delivered items to be billed to accounts module 2013-08-02 12:50:40 +05:30
Anand Doshi
e5c69133a8 [minor] moved delivered items to be billed to accounts module 2013-08-02 12:45:00 +05:30
Nabin Hait
bbe1448fca Merge branch 'master' into perpetual 2013-08-02 11:53:00 +05:30
Nabin Hait
a1ad6e14ae Merge branch 'master' of github.com:webnotes/erpnext 2013-08-02 11:46:19 +05:30
Nabin Hait
cac622e097 [accounts] [perpetual] get account and stock balance difference 2013-08-02 11:44:29 +05:30
Nabin Hait
1e2f20a3da [cleanup] code commonified of making sl entry 2013-08-02 11:42:11 +05:30
Nabin Hait
b865db910b [accounts] [perpetual] accounts settings for perpetual accounting for inventory 2013-08-02 11:24:51 +05:30
Nabin Hait
dbe4d1930b [minor] added customer/supplier id and name in sales/purchase register 2013-08-02 11:20:02 +05:30
Anand Doshi
078129f58f [fix] [minor] removed default from conversion_rate 2013-08-01 16:54:32 +05:30
Anand Doshi
17350b899f [fix] [mapper] from delivery note to sales invoice, only map unbilled items 2013-08-01 15:45:23 +05:30
Nabin Hait
8608f0e9fa [fix] [minor] error display in voucher import tool 2013-07-31 18:00:25 +05:30
Anand Doshi
0fa631944c [fix] [minor] [bug] int docstatus before to_docstatus check 2013-07-31 16:08:51 +05:30
Anand Doshi
f006916518 [fix] [minor] [report] 2013-07-31 11:47:54 +05:30
Anand Doshi
5c76f014a7 [report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed 2013-07-30 18:42:16 +05:30
Anand Doshi
d2cb598b6b Merge branch 'master' of github.com:webnotes/erpnext 2013-07-30 14:51:08 +05:30
Anand Doshi
733681a426 [fix] [minor] [sales invoice] trigger update stock on fetching pos details 2013-07-30 14:49:12 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Nabin Hait
4525a0b900 [fix] [minor] null value issue 2013-07-30 11:19:20 +05:30
Anand Doshi
f314051e30 Merge branch 'master' of github.com:webnotes/erpnext into custom_script_defer 2013-07-30 10:44:07 +05:30
Anand Doshi
f90df7da02 [fix] [minor] if customer_account is mentioned in POS Settings, also fetch customer_name 2013-07-29 19:53:44 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
19d945a4e7 [minor] [fix] apply float precision on over-billing validation 2013-07-29 18:35:39 +05:30
Rushabh Mehta
17082e71f1 [pos] [minor] removed import of pos.js 2013-07-29 15:37:07 +05:30
Rushabh Mehta
895f61da84 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-29 15:31:42 +05:30
Rushabh Mehta
4a008f5567 [sales_invoice] [pos] [minor] Added view for POS 2013-07-29 15:31:11 +05:30
Nabin Hait
5e200e43a6 [minor] duplicate row id from same prevdoc 2013-07-29 15:29:51 +05:30
Nabin Hait
90d74d4bfa [minor] sales invoice to delivery note mapping and prevdoc validation 2013-07-29 13:27:18 +05:30
Anand Doshi
10c773dc1c [fix] [minor] [sales invoice] don't hide warehouse and delivered_qty 2013-07-29 12:27:47 +05:30
Nabin Hait
173e874610 [fix] maintain same rate throughout purchase cycle optional 2013-07-29 11:24:11 +05:30
Nabin Hait
114bc09164 [minor] [fix] same account in item and tax table 2013-07-26 15:47:47 +05:30
Nabin Hait
a10ef4592b [minor] total tax column in item-wise sales/purchase register 2013-07-26 15:45:38 +05:30
Anand Doshi
508bd4c7d5 [report] Item-wise Purchase Register [issue] webnotes/erpnext#374 2013-07-26 13:09:40 +05:30
Anand Doshi
ac90542414 [report] Item-wise Sales Register [issue] webnotes/erpnext#372 2013-07-26 13:09:23 +05:30
Anand Doshi
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +05:30
Anand Doshi
720a01a6f6 [selling] changed fieldtype of Price List to link 2013-07-26 11:32:02 +05:30
Anand Doshi
52b049145b [fix] [minor] call refresh_fields after cur_frm.call when doc is passed 2013-07-25 19:13:45 +05:30
Anand Doshi
742b55f700 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:53:50 +05:30
Anand Doshi
60403b2d8f [fix] [minor] [grid] set_colum_disp should force refresh the whole grid 2013-07-25 18:53:22 +05:30
Rushabh Mehta
c97fe01837 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 18:14:18 +05:30
Nabin Hait
ea51b41239 [fix] [minor] allowed territory group in all transactions 2013-07-25 18:01:13 +05:30
Rushabh Mehta
152cecc9cd Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 17:47:38 +05:30
Anand Doshi
f2045fb92e [fix] [minor] set customer/supplier defaults 2013-07-25 17:46:02 +05:30
Rushabh Mehta
4dca40195e [feature] Ability to set UOM as Integer-only and related validations. 2013-07-25 17:45:59 +05:30
Nabin Hait
bfe0c47805 [fix] [minor] budget distribution validation 2013-07-25 17:23:00 +05:30
Nabin Hait
d2b3fe8a02 [fix] [minor] get_query for cost center form 2013-07-25 16:29:15 +05:30
Rushabh Mehta
60117d6d62 [minor] moved Debit To and Credit To in Sales / Purchase Invoice to More Info #645 2013-07-25 16:09:50 +05:30
Anand Doshi
85fa3d2bb9 [fix] [minor] upload callback arguments changed 2013-07-25 16:02:15 +05:30
Nabin Hait
4166c35277 [fix] [minor] over billing validation against delivery note 2013-07-25 15:14:59 +05:30
Rushabh Mehta
a877053d90 [accounts] [minor] [fix] fixed set_query for Mode of Payment 2013-07-25 10:49:59 +05:30
Rushabh Mehta
148cbaeafe [minor] fixed help for Sales Invoice / Purchase Invoice 2013-07-24 21:44:59 +05:30
Anand Doshi
6c7f3db755 [report] [issue] #641 - added customer name and supplier name in accounts receivable and accounts payable reports respectively 2013-07-24 16:49:11 +05:30
Anand Doshi
56421289cc Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 17:16:22 +05:30
Anand Doshi
fafb9a8843 [fix] [report] general ledger - group by ledger and group by voucher 2013-07-23 17:13:55 +05:30
Nabin Hait
48a0bd3eda [minor] [fix] price list currency read only and SO-MR mapping 2013-07-23 15:31:39 +05:30
Anand Doshi
648a5c7e33 [fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse 2013-07-23 12:07:55 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Anand Doshi
21503f8fb9 [minor] [fix] on row add processing, [cleanup] shifted validate link and fetch to script_manager 2013-07-22 13:38:28 +05:30
Nabin Hait
461b417871 [minor] [fix] trigger in supplier address and contact person field 2013-07-20 18:29:45 +05:30
Anand Doshi
6fa5e42b40 [minor] [fix] [issue] #617 2013-07-19 15:33:11 +05:30
Anand Doshi
535d833523 [minor] [fix] call company trigger in onload for a new selling/buying transaction 2013-07-19 13:51:07 +05:30
Anand Doshi
82e006917a [minor] [fix] get queries 2013-07-19 12:54:33 +05:30
Anand Doshi
c8b2c0f091 [minor] [fix] net_total_export printing and hover effect for brand in navbar 2013-07-18 18:15:56 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Nabin Hait
6f61e2c426 [fix] [minor] net_total on sales/purchase register 2013-07-16 18:47:06 +05:30
Nabin Hait
6a3b951352 [accounts] [feature] optional checkbox for same rate validation in sales cycle 2013-07-16 18:34:35 +05:30
Nabin Hait
9a380ef40a [fix] [minor] get_query of tax account 2013-07-16 17:24:17 +05:30
Nabin Hait
496219ce6b Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-16 14:40:40 +05:30
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
cbc96d5d14 [fix] [report] accounts receivable/payable 2013-07-16 13:13:38 +05:30
Nabin Hait
642634f6c8 [fix] [report] sales/purchase register: if income/expense account entered in tax table for discount 2013-07-16 12:11:00 +05:30
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Nabin Hait
00dadc8bd5 [fix] [minor] get query 2013-07-15 18:16:37 +05:30
Anand Doshi
1ffc5b576c [minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List 2013-07-15 18:09:43 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Nabin Hait
8faa90fb20 [fix] [minor] add customer_name/supplier_name in sales/purchase register 2013-07-12 17:50:34 +05:30
Nabin Hait
87bed52818 [minor] [fix] get_query for cost center 2013-07-12 16:55:03 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
1bfb6db586 [minor] Bill Date not mandatory in Purchase Invoice 2013-07-11 12:16:59 +05:30
Nabin Hait
d96bfaf6af [fix] get_query where options not mentioned 2013-07-10 20:30:00 +05:30
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Rushabh Mehta
ad71473f35 [cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix 2013-07-10 18:59:55 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Saurabh
a29b69245e get_query to servet side 2013-07-10 16:06:31 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
86408c3d44 queries to server side 2013-07-10 14:00:37 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Nabin Hait
5c33e59e7a [fix][report] sales/purchase register, same accounts as income and tax account 2013-07-09 15:38:40 +05:30
Anand Doshi
c120776931 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
 2013-07-09 13:10:15 +05:30
Anand Doshi
bdee6e074a [cleanup] moved company to top section, hide company if only one exists, changed field labels 2013-07-09 13:03:39 +05:30
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Nabin Hait
e03e38db1e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 11:36:41 +05:30
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Rushabh Mehta
8f050f4cd3 [sales invoice] payment section visible only if is_pos is true #382 2013-07-09 11:28:47 +05:30
Saurabh
ebe50397d9 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-09 10:18:39 +05:30
Saurabh
7f00f7f89b [get_query] to server side 2013-07-09 10:08:18 +05:30
Anand Doshi
6172b6ffb8 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 19:47:55 +05:30
Nabin Hait
a131c0aa5e [fixed conflict] 2013-07-08 19:01:41 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Anand Doshi
615701d3ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	stock/doctype/material_request/material_request.txt
 2013-07-08 18:54:00 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Saurabh
028755941e get_query to server side 2013-07-08 18:45:55 +05:30
Rushabh Mehta
7eee8531b2 [mapper-pull] for sales / purchae 2013-07-08 18:03:40 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
11eda08cd5 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 12:40:06 +05:30
Rushabh Mehta
436467a5c9 [purchase order] tests pass 2013-07-08 12:37:59 +05:30
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
 2013-07-08 11:53:35 +05:30
Nabin Hait
1daad6b1ca [report] added some extra columns 2013-07-08 11:28:59 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Rushabh Mehta
8f48db33d2 [sales invoice] added progress bar of payment 2013-07-05 16:54:40 +05:30
Rushabh Mehta
f7de376932 [sales invoice] added progress bar of payment 2013-07-05 16:50:43 +05:30
Nabin Hait
1bec8012d2 [conflict] fixed 2013-07-05 15:25:58 +05:30
Nabin Hait
eb883ee7a3 [mapper] purchase cycle 2013-07-05 15:23:47 +05:30
Rushabh Mehta
11d688a536 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 15:14:15 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
ef8d3bcb77 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 12:57:41 +05:30
Anand Doshi
901773a139 [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files 2013-07-05 12:57:03 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Rushabh Mehta
8005362c6c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 10:51:51 +05:30
Rushabh Mehta
e953f0bb97 [form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt 2013-07-05 10:48:35 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Anand Doshi
0b4943cec1 [webshop] shopping cart with shipping rule selector, totals 2013-07-04 23:45:22 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Anand Doshi
f4d8d23241 [setup] [fix] creation of fiscal year if start date is 1st Jan 2013-07-04 18:29:55 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Nabin Hait
151b0bd153 [merge conflict] 2013-07-04 17:56:28 +05:30
Nabin Hait
df1fca9f65 [mapper] material request to purchase order 2013-07-04 17:50:06 +05:30
Rushabh Mehta
8fe97fcbe1 [mapper] sales order-sales invoice 2013-07-04 17:31:06 +05:30
Anand Doshi
8aaccf7269 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/lead/lead.txt
 2013-07-04 17:18:45 +05:30
Anand Doshi
99100a4135 [webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation 2013-07-04 17:13:53 +05:30
Nabin Hait
9010f92eab Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 16:03:24 +05:30
Nabin Hait
19f2396f95 Update Purchase Receipt-Purchase Invoice.txt 2013-07-04 14:56:50 +05:30
Nabin Hait
7dc77f764f Update Purchase Order-Purchase Invoice.txt 2013-07-04 14:56:29 +05:30
Nabin Hait
e2dd800999 Update purchase_register.py 2013-07-04 14:37:58 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Nabin Hait
18f754d53c Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 13:31:15 +05:30
Rushabh Mehta
9a04b19160 [form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation 2013-07-03 13:27:39 +05:30
Nabin Hait
72abfa6b4b Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 11:48:10 +05:30
Anand Doshi
15db6c4659 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
 2013-07-02 11:50:32 +05:30
Nabin Hait
71c3f95098 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 18:28:26 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30