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

6613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
cb04d0cd14 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 15:16:30 +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
2deca5f3f6 queries to server side 2013-07-10 14:31:29 +05:30
Nabin Hait
a0af48f101 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 14:17:19 +05:30
Nabin Hait
749b37f4f5 [fix][hr] pull salary structure in salary slip 2013-07-10 14:16:59 +05:30
Saurabh
86408c3d44 queries to server side 2013-07-10 14:00:37 +05:30
Rushabh Mehta
790a91271e [fix] Customer Issue no longer submittable, does not make sense 2013-07-10 13:18:02 +05:30
Nabin Hait
96b8acb9da Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 13:16:17 +05:30
Saurabh
d8a9033c9b Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-10 13:09:11 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
852a602624 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 13:06:45 +05:30
Rushabh Mehta
919b9fcccf [cleanup] Maintenance Schedule, Maintenance Visit 2013-07-10 13:06:14 +05:30
Akhilesh Darjee
0c9a7a0a13 [Fix]Warehouse in Item grid of Purchase Order to call get_projected_qty 2013-07-10 12:54:32 +05:30
Nabin Hait
b7770cf510 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 12:31:42 +05:30
Nabin Hait
6c17f012ba [minor][hr] validation added: salary slip can not be made if employee left before this month 2013-07-10 12:28:56 +05:30
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +05:30
Anand Doshi
afad0efca3 [minor] [fix] trigger startup after page route in app.js so that dialogs created in startup do not auto-close 2013-07-10 12:00:26 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Anand Doshi
0cc2830392 [minor] [fix] use --no-color in latest updates build 2013-07-09 16:42:36 +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
d33244ce27 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 15:45:54 +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
c81236770f Merge branch 'master' of github.com:webnotes/erpnext 2013-07-09 15:39:21 +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
Rushabh Mehta
30d3dcb258 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 14:37:28 +05:30
Rushabh Mehta
3ed351df8e [feature] generate latest updates page from git commit log 2013-07-09 14:36:41 +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
0f3d2df8e8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-09 12:44:17 +05:30
Nabin Hait
d49aae27df Merge pull request #564 from akhileshdarjee/master 
[Cleanup][Report]Removed Filters from Warehouse-Wise Stock Balance & Batch-Wise Balance History, added company in Warehouse-Wise Stock Balance
 2013-07-09 00:06:47 -07:00
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Nabin Hait
170f3fa575 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 12:08:19 +05:30
Rushabh Mehta
5758f7e3b7 [stock-entry] show gl if auto inventory accounting #561 2013-07-09 12:05:33 +05:30
Akhilesh Darjee
d3c74c1a1b [Cleanup][Report] Added company in Warehouse-wise Stock Balance & removed filters from both reports 2013-07-09 11:51:24 +05:30
Nabin Hait
fd33b2b718 [patch] copy customer_address to shipping_address in delivery note 2013-07-09 11:42:38 +05:30
Rushabh Mehta
f0e4f9e0c3 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 11:38:37 +05:30
Rushabh Mehta
cfb54ceb43 [material request/purchase order] [bug] required date automatically set #433 2013-07-09 11:38:08 +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
Rushabh Mehta
44c1447b60 [setup] added icons, links, fixed single 2013-07-09 10:42:10 +05:30
Rushabh Mehta
56b66e22ab [email] force use of loginid as the sender 2013-07-09 10:29:01 +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
Anand Doshi
3c6d440f09 [bean] [mandatory] fixes in test cases 2013-07-08 19:47:37 +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