Commit Graph

6275 Commits

Author SHA1 Message Date
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
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Anand Doshi
2862c9e1df [webshop] [cart] show prices based on geoip of guest user 2013-07-08 18:50:33 +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
304a4a66b4 [production order] [delivery note] fixes, pull 2013-07-08 17:01:32 +05:30
Rushabh Mehta
b4c68531ea [pull-mappers] sales order 2013-07-08 15:58:50 +05:30
Rushabh Mehta
862a02b8d2 [pull-mappers] no fields via custom button, started with quotation, material request, purchase order 2013-07-08 15:52:24 +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
Rushabh Mehta
886c9ef5d1 [material requests] [tests] 2013-07-08 12:08:06 +05:30
Anand Doshi
111ae7d6cd Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
2013-07-08 11:57:40 +05:30
Anand Doshi
690c2f5ffe [patch] [fix] delete report 2013-07-08 11:55:50 +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
70eda07bcf [report] deleted duplicate report 2013-07-08 11:33:09 +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
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Nabin Hait
2b3ca41450 [mapper] support 2013-07-07 12:32:01 +05:30
Nabin Hait
650501526f [merge] fixed conflict 2013-07-07 11:38:10 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Nabin Hait
fcd9434daf [mapper] 2013-07-06 18:25:36 +05:30
Nabin Hait
2d2d800f0f Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 18:34:10 +05:30
Nabin Hait
126aedda08 [mapper] 2013-07-05 18:30:16 +05:30
Anand Doshi
29ea5d014e [sales common] [fix] calculate outstanding amount only for docstatus=0 on client side 2013-07-05 17:23:14 +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
Rushabh Mehta
22bf5f4dbd [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:33:54 +05:30
Rushabh Mehta
1439854b27 [icons] added icons to forms, toolbars, moduleview, doclistview, reportview 2013-07-05 16:28:00 +05:30