181 Commits

Author SHA1 Message Date
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
2014-01-24 21:44:36 +05:30
Nabin Hait
4ba95d0b7a Fix in testcases 2014-01-23 16:45:22 +05:30
Rushabh Mehta
f96bcf943b added explicit delete perimssions 2014-01-20 17:52:13 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
2013-12-26 19:12:51 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Anand Doshi
06f4c1a55f if last purchase not found, take last purchase rate from item 2012-09-19 11:29:32 +05:30
Anand Doshi
8c3cfe076e get last purchase rate from item if not found from purchase order or receipt 2012-09-18 13:56:47 +05:30
Anand Doshi
ce946afb67 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	public/js/all-app.js
2012-09-10 14:18:17 +05:30
Nabin Hait
6c8504877b Fixes in item wise purchase details report 2012-09-10 12:23:06 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
e642805882 changed date displayed in transaction listing from modified date to transaction/posting date 2012-09-03 13:32:25 +05:30
Anand Doshi
5fc48f566f Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
2012-08-17 11:48:34 +05:30
Nabin Hait
daba7c40a6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-17 11:00:42 +05:30
Nabin Hait
0170b2b4bc default purchase taxes and charges master will be automatically fetched in pur transactions 2012-08-17 11:00:15 +05:30
Anand Doshi
6547375a2b Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/buying/doctype/purchase_common/purchase_common.js
2012-08-10 15:42:50 +05:30
Anand Doshi
544b0f64d1 cascade project name to other items, if selected in one item during purchase cycle 2012-08-10 15:37:54 +05:30
Anand Doshi
7b64b96676 renamed report folder 2012-08-07 15:30:40 +05:30
Anand Doshi
26dc1b776a fix in report: supplier quotations after merge with unicode 2012-08-07 15:17:53 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
Anand Doshi
e30d5f833e New Report: Supplier Quotations 2012-08-07 15:05:42 +05:30
Anand Doshi
b8219aa4f0 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	public/js/all-app.js
	public/js/fields.js
2012-08-06 19:55:43 +05:30
Anand Doshi
3e92c00dd9 removed stock uom related fields from supplier quotation item, as there is no need to track stock uom details in a suppleir quoation 2012-08-06 18:29:46 +05:30
Anand Doshi
793ec9f857 removed method get_uom_details from Supplier Quotation, as there is no need to track Stock UOM in a quotation 2012-08-06 18:29:03 +05:30
Anand Doshi
6ea82c07fe added button, method in Purchase Request form to make Supplier Quotation 2012-08-06 18:27:58 +05:30
Anand Doshi
72f5a05ac0 added fields 'Supplier Quotation' and 'Supplier Quotation Item' in Purchase Order Item to track parent 2012-08-06 18:27:11 +05:30
Anand Doshi
b6029d2d13 added button, method in Purchase Order to fetch Supplier Quotation Items 2012-08-06 18:26:07 +05:30
Anand Doshi
da85a8363f call set missing values on load and contact section toggle on refresh of purchase order form 2012-08-06 18:24:56 +05:30
Anand Doshi
280e0ce263 added function to hide/unhide contact section of a buying form 2012-08-06 18:23:45 +05:30
Anand Doshi
41c4d19279 added button to make Purchase Order from Supplier Quotation 2012-08-06 18:22:59 +05:30
Anand Doshi
26e5f3dec0 DocType Mappers: Purchase Request-Supplier Quotation and Supplier Quotation-Purchase Order 2012-08-06 18:20:08 +05:30
Anand Doshi
e64d900322 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Anand Doshi
3d549775e1 mark 'Supplier Quotation' as a beta feature 2012-08-03 14:19:05 +05:30
Anand Doshi
a67a74fee1 supplier quotation, project shift patch 2012-08-02 18:53:00 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
2012-07-18 20:31:37 +05:30
Anand Doshi
249659d673 Changed file names from listview.js to doctype_name_list.js 2012-07-18 20:25:58 +05:30
Anand Doshi
f2f5c94c41 Default Currency specification for Customer and Supplier
This will get fetched in sales and purchase transactions respectively.
Fix in sales order list view
2012-07-18 20:13:52 +05:30
Nabin Hait
a25ebe3dbf Conversion rate fieldtype set as float (from currency) 2012-07-16 16:34:28 +05:30
Anand Doshi
d383e573fc contact, address list views and allow their deletion from customer / supplier form 2012-07-02 19:45:35 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30