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

881 Commits

Author SHA1 Message Date
Nabin Hait
65f038c926 [fixes] pull previous doc details 2013-06-24 11:59:37 +05:30
Nabin Hait
8086125705 Merge pull request #513 from saurabh6790/master 
Trends Analyzer's Cleanup Complete
 2013-06-21 03:37:59 -07:00
Akhilesh Darjee
64c8e28423 [Fixed] Merge conflict fixed 2013-06-21 13:09:18 +05:30
Akhilesh Darjee
1ded5c618e [Report]Cleanup of territory target variance, sales person target variance & budget variance reports 2013-06-21 12:47:51 +05:30
Anand Doshi
d52b03a8cc Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
 2013-06-21 12:22:52 +05:30
Saurabh
f8f68c54d9 [trends analyzer] cleanup completed 2013-06-20 18:52:31 +05:30
Nabin Hait
71253bea0f [fix][report] in item prices 2013-06-20 17:32:00 +05:30
Nabin Hait
b7784eac36 [fix][report] in item prices 2013-06-20 17:19:51 +05:30
Nabin Hait
b8ebbcafa9 [trend analyzer] cleanup 2013-06-20 13:03:10 +05:30
Nabin Hait
616657d4a2 Merge pull request #495 from saurabh6790/master 
[erpnext][reports][Trend Analyzer]
 2013-06-19 22:18:44 -07:00
Nabin Hait
21f7623d2e [fix][report] in item prices 2013-06-19 14:13:01 +05:30
Anand Doshi
e81321219e [webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods 2013-06-17 15:42:38 +05:30
Anand Doshi
aa0ccf8223 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-17 13:46:55 +05:30
Anand Doshi
1e820f352e Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	buying/doctype/purchase_common/purchase_common.py
 2013-06-17 12:02:04 +05:30
Anand Doshi
ad6180ef6d [material request on re-order level] [fixes] if error occurs, send email to the System Manager 2013-06-17 11:57:04 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
abc100302c [cart] create quotation on checkout 2013-06-14 17:44:03 +05:30
Saurabh
feb8669cbd [Reports][Validation changes in Purchase and Sales trends] 2013-06-14 17:40:48 +05:30
Saurabh
1848b71a0a [Reports][Sales and Purchase Trends][Completed] 2013-06-14 15:03:45 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +05:30
Anand Doshi
d826b08b7e [stock entry] [test] fixes 2013-06-11 18:17:52 +05:30
Anand Doshi
3b867f7377 [cleanup] [fix] removed amendment_date 2013-06-11 17:21:11 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
0ab1bdf94e [cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options 2013-06-11 12:35:46 +05:30
Rushabh Mehta
cd4bfa6b9a [docs] added for stock module 2013-06-11 12:04:01 +05:30
Rushabh Mehta
c382eb58d5 [cleanup] removed Featured Item, Website Product Category, Valuation Control 2013-06-11 12:03:37 +05:30
Anand Doshi
27a981677e [buying] [cleanup] deprecated load_default_taxes and get_purchase_tax_details 2013-06-10 16:32:55 +05:30
Anand Doshi
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
 2013-06-10 15:25:07 +05:30
Saurabh
5ee811d842 [removed merge conflict] 2013-06-07 15:23:56 +05:30
Saurabh
5b1e899250 [Reports] [Customers Not Buying Sinse Long Time] and [Itemwise Recommended Reorder level] 2013-06-07 13:34:16 +05:30
Akhilesh Darjee
426b57e1b4 Deleted item_prices.js 2013-06-07 11:52:15 +05:30
Saurabh
1efc8b3734 [Reprots][No Sales Order From Customer] and [Item Reorder Level] 2013-06-06 19:31:14 +05:30
Akhilesh Darjee
657f8a6677 Completed 'Item Prices' Report 2013-06-06 18:33:26 +05:30
Anand Doshi
9d04924bc2 [selling] [cleanup] rearranged fields 2013-06-05 20:46:56 +05:30
Saurabh
7b48218b6f [Reports][Reorder Level] and [No Sales Order from Customer] 2013-06-05 18:17:28 +05:30
Anand Doshi
12cea9587f [terms and conditions] removed terms html and added terms and conditions to purchase invoice 2013-06-05 14:59:28 +05:30
Anand Doshi
bf3e54a45b [issues #437] [fix] pulling terms and conditions 2013-06-05 14:11:32 +05:30
Anand Doshi
8f81623240 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-05 13:14:11 +05:30
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +05:30
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Akhilesh Darjee
6653a95767 Completed Warehouse-Wise Stock Balance 2013-06-05 11:36:24 +05:30
Akhilesh Darjee
1725315d10 Finalized batch-wise balance history 2013-06-04 19:35:28 +05:30
Nabin Hait
ad600cce22 bom exploded items grouped by items 2013-06-04 16:56:56 +05:30
Rushabh Mehta
8fefeaf1bd [ui] removed links to old search_criteria and Report2 is now Report 2013-06-04 11:23:42 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Anand Doshi
ecc28f0311 [sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice 2013-05-30 17:43:30 +05:30
Anand Doshi
200c8f7980 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	selling/doctype/sales_common/sales_common.py
 2013-05-29 12:30:54 +05:30
Anand Doshi
d0b007235d [buying/selling] fixes after responsive merge 2013-05-28 18:54:48 +05:30