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

43 Commits

Author SHA1 Message Date
Anand Doshi
b03f870441 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-04 15:22:50 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
 2013-11-04 13:14:39 +05:30
Akhilesh Darjee
e158cea77a [cleanup] [minor] replaced for territory to applicable territory 2013-10-31 19:50:51 +05:30
Anand Doshi
7944ea3067 [minor] [fix] plugin patch 2013-10-31 19:07:05 +05:30
Akhilesh Darjee
0b39e95011 [cleanup] moved for territory, price list and item price doctype from setup to stock 2013-10-31 12:35:52 +05:30
Pratik Vyas
297041ed3e Merge remote-tracking branch 'upstream/wsgi' into HEAD 
Conflicts:
	public/js/complete_setup.js
	setup/doctype/setup_control/setup_control.py
 2013-10-25 14:07:48 +05:30
Anand Doshi
7fa2ec40e1 Removed Update Manager 2013-10-24 20:47:35 +05:30
Nabin Hait
96333b6bc7 [minor] try block in serial no status patch 2013-10-24 17:41:52 +05:30
Nabin Hait
e36edc14f6 [minor] try block in serial no status patch 2013-10-24 17:30:20 +05:30
Nabin Hait
8f185b7d3b [fix] [minor] patches 2013-10-24 14:55:29 +05:30
Akhilesh Darjee
3d0af67799 [fix] [minor] add time zone and country to global defaults 2013-10-24 12:37:43 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Akhilesh Darjee
b558ff68b9 [fix] added country and time zone to global defaults 2013-10-23 20:09:08 +05:30
Nabin Hait
688c2ef588 [patch] delete gl entries for cancelled vouchers 2013-10-23 00:26:53 +05:30
Nabin Hait
145e5e26fa [patch] delete gl entries for cancelled vouchers 2013-10-22 23:51:41 +05:30
Nabin Hait
1500c83cce -am 2013-10-22 11:42:50 +05:30
Nabin Hait
6a589be1c5 [patch] remove sales and purchase return tool 2013-10-22 10:54:59 +05:30
Rushabh Mehta
70d7c481e9 [naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854 2013-10-18 17:27:45 +05:30
Nabin Hait
5566bcaa0e [cleanup] purchase common 2013-10-18 17:01:56 +05:30
Akhilesh Darjee
fcd70d04f3 [item price] item price made as an individual master and removed from price list 2013-10-18 14:24:21 +05:30
Nabin Hait
d05a3b3b5c [Rename] Delivery Note Packing Item -> Packed Item 2013-10-18 12:50:28 +05:30
Anand Doshi
7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py
 2013-10-15 12:18:46 +05:30
Anand Doshi
3510764e7c [minor] plugin architecture, first cut 2013-10-14 18:59:16 +05:30
Anand Doshi
6bc48070a1 Moved Custom Server Scripts to custom_scripts/doctype_name.py 2013-10-14 15:48:57 +05:30
Nabin Hait
eea2b34f4b [production] update planned and produced ty 2013-10-11 18:31:33 +05:30
Nabin Hait
2658384edd [fix] [minor] repost order qty patch 2013-10-10 19:07:42 +05:30
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +05:30
Anand Doshi
7798934989 [minor] fixed globals and patch for wsgi migration 2013-10-10 12:03:11 +05:30
Nabin Hait
609046990b [fix] [minor] fix in serial no 2013-10-08 17:58:41 +05:30
Nabin Hait
77f37e6b7c Update Serial No details through serial_no controller 2013-10-08 17:11:33 +05:30
Nabin Hait
fb0274b249 [patch] [minor] fix serial no status 2013-10-05 14:56:53 +05:30
Nabin Hait
5f8477d4ef [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 15:29:36 +05:30
Nabin Hait
27c9ecc538 [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 14:41:41 +05:30
Nabin Hait
b646b3b3e6 [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 14:30:33 +05:30
Rushabh Mehta
28eb2bffa4 Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-04 13:33:45 +05:30
Rushabh Mehta
acc876e0d7 [minor] [fix] status updater, only change communication status when called explicitly 2013-10-04 13:33:24 +05:30
Nabin Hait
b4212a5672 [patch] [minor] perpetua inventory utility patch 2013-10-04 12:54:16 +05:30
Anand Doshi
3ab6a65743 [minor] [fix] communication status patch 2013-10-03 19:32:23 +05:30
Rushabh Mehta
6856d74a1b [minor] fixes to crm patch 2013-10-03 18:12:36 +05:30
Rushabh Mehta
800b3aa437 [crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order 2013-10-03 17:26:33 +05:30
Rushabh Mehta
f1b6f67a98 [Delivery Note] Moved prevdoc to Sales Order and Sales Invoice so links will work webnotes/erpnext#868 2013-10-03 12:22:52 +05:30
Nabin Hait
efa94ce1bf [fix] [minor] fixe in patch 2013-10-02 16:40:14 +05:30
Nabin Hait
a1d1c980bc [minor] fixes in stock balance report, bin uom and sle is_cancelled 2013-10-02 16:29:45 +05:30