Commit Graph

3381 Commits

Author SHA1 Message Date
Anand Doshi
26dc1b776a fix in report: supplier quotations after merge with unicode 2012-08-07 15:17:53 +05:30
Anand Doshi
4e2feb2b28 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-07 15:14:07 +05:30
Anand Doshi
883285f503 fix in supplier quotations patch 2012-08-07 15:13:48 +05:30
Anand Doshi
e81c07ff4d appended unicode literals import after merge 2012-08-07 15:08:52 +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
f6624257ad Merge branch 'master' of github.com:webnotes/erpnext 2012-08-07 15:06:17 +05:30
Anand Doshi
e30d5f833e New Report: Supplier Quotations 2012-08-07 15:05:42 +05:30
Rushabh Mehta
6252c13ec8 added code style and mardown in todo 2012-08-07 12:53:49 +05:30
Rushabh Mehta
e6ecb06001 added markdown reference page 2012-08-07 12:48:41 +05:30
Rushabh Mehta
c7dbe293c3 updates to kb: unanswered questions show in desktop, questions query moved to server-side 2012-08-07 12:12:55 +05:30
Nabin Hait
e343393d73 add/drop index if index key not exists / exists 2012-08-07 10:53:52 +05:30
Anand Doshi
a742d32c96 added unicode literals import to supplier quotation patch 2012-08-06 20:03:49 +05:30
Anand Doshi
0d0efcfd14 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-06 19:56:03 +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
8ce2ac3f0e supplier quotation release patch 2012-08-06 19:53:31 +05:30
Anand Doshi
65078d8a2e Merge branch 'master' of github.com:webnotes/erpnext 2012-08-06 18:34:26 +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
Rushabh Mehta
aaa75496e2 added email chain on blog comment and number of comments 2012-08-06 15:22:17 +05:30
Rushabh Mehta
24fabf3b73 cleaned up source from lead 2012-08-06 15:21:35 +05:30
Nabin Hait
4e6a483bdd Merge branch 'master' of github.com:webnotes/erpnext 2012-08-06 14:32:05 +05:30
Rushabh Mehta
a146db2b58 build 2012-08-06 14:31:53 +05:30
Nabin Hait
ed8049ec19 fixes in patch: considered over delivery in reserved qty calculation 2012-08-06 14:31:45 +05:30
Rushabh Mehta
90115202f2 build 2012-08-06 14:30:56 +05:30
Rushabh Mehta
a49a552a37 merge 2012-08-06 14:30:31 +05:30
Rushabh Mehta
cea0e795b0 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-06 14:20:46 +05:30
Rushabh Mehta
5d4a9f8554 date format bug fixed 2012-08-06 14:20:15 +05:30
Rushabh Mehta
48f5f40ae2 moved recurring to daily from every time 2012-08-06 14:19:11 +05:30
Anand Doshi
a4f6529801 in item's update page name, if item name is null, create page name with only the name 2012-08-06 13:42:19 +05:30
Anand Doshi
1c2b192be6 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
2012-08-06 13:36:19 +05:30
Nabin Hait
337fef0859 call item on_update from UOM Replace Utility 2012-08-06 13:33:32 +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
Nabin Hait
fd03762445 call item on_update from UOM Replace Utility 2012-08-06 13:18:32 +05:30
Rushabh Mehta
6243f29ab3 framework updates 2012-08-06 11:15:22 +05:30
Rushabh Mehta
f83159edbe Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-08-06 10:17:38 +05:30
Anand Doshi
326f88cce6 fixed patch: repost stock due to wrong packing list 2012-08-03 19:19:23 +05:30
Anand Doshi
fea3b64dd0 fixed patch: repost stock due to wrong packing list 2012-08-03 19:14:42 +05:30
Anand Doshi
df902d1a0c patch: repost stock due to wrong packing list entries - optimized query using index and subqueries 2012-08-03 19:11:11 +05:30
Anand Doshi
786444e6bf changed document_type of 'Communication' to 'Master' to enable importing 2012-08-03 16:15:39 +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
b7cc66384d Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 14:19:36 +05:30
Anand Doshi
3d549775e1 mark 'Supplier Quotation' as a beta feature 2012-08-03 14:19:05 +05:30
Rushabh Mehta
c0fded82e6 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 14:18:05 +05:30