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

383 Commits

Author SHA1 Message Date
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
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
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
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
Akhilesh Darjee
4ceef34c74 [report] created new item-wise price list rate report 2013-10-18 15:24:53 +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
d1fd1e2d89 [Cleanup] Sales Common deprecated 2013-10-18 12:50:28 +05:30
Nabin Hait
1c62cbe1fc Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-10-15 12:53:46 +05:30
Nabin Hait
f0feb73ded [minor] bypass plugin field related operational error 2013-10-15 12:22:41 +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
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
0948b2a9d3 [fix] [minor] repost order qty patch 2013-10-10 19:04:18 +05:30
Anand Doshi
7798934989 [minor] fixed globals and patch for wsgi migration 2013-10-10 12:03:11 +05:30
Rushabh Mehta
8c5a5f1ed5 New Setup Wizard 2013-10-08 17:59:11 +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
a1d1c980bc [minor] fixes in stock balance report, bin uom and sle is_cancelled 2013-10-02 16:29:45 +05:30
Nabin Hait
49e71400ac [patch] [minor] fix wrong customers in pos 2013-10-01 15:20:06 +05:30
Nabin Hait
c6871dc194 [patch] [minor] unsubmit serial nos if submitted 2013-09-25 14:44:06 +05:30
Nabin Hait
04a3feecf6 [minor] perpetual inventory fix 2013-09-24 15:16:01 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Nabin Hait
01e6a9cf1e Frozen Accounts Modifier setting in Accounts Settings 2013-09-24 12:08:31 +05:30
Nabin Hait
7031ea72ca Frozen Accounts Modifier setting in Accounts Settings 2013-09-24 12:04:07 +05:30
Anand Doshi
f0fc9a54ee [minor] [patch] removed patches from march to august 2012 2013-09-21 13:43:48 +05:30
Anand Doshi
417b23740a [fix] [minor] reload style settings 2013-09-19 13:44:52 +05:30
Anand Doshi
83de391efc Merge branch 'akhileshdarjee-master' into website-wip 2013-09-17 16:09:15 +05:30
Nabin Hait
5cd1d54347 [minor] merged with master branch 2013-09-17 10:30:24 +05:30
Anand Doshi
155d985cd4 Merge branch 'master' of github.com:webnotes/erpnext into website-wip 
Conflicts:
	patches/patch_list.py
 2013-09-12 17:03:21 +05:30
Akhilesh Darjee
b9c12eff17 [fix] [minor] merge conflict fixed 2013-09-12 14:02:37 +05:30
Nabin Hait
6656acff52 [minor] [fix] set stock uom in stock ledger entry through stock reconciliation 2013-09-12 11:46:09 +05:30
Akhilesh Darjee
db59ffb76d [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
Rushabh Mehta
c59c4e0699 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30
Anand Doshi
f6e62c94ff [fix] [minor] removed pos view check patch 2013-09-05 17:11:52 +05:30
Akhilesh Darjee
a7b7d2559e [fix] merge conflict 2013-09-05 13:18:22 +05:30
Akhilesh Darjee
38e8f989fa [fix] [patch] fixed paid_amount & patch for default pos view check in features setup 2013-09-05 12:59:33 +05:30
Nabin Hait
a653cd3608 [minor] fixed conflict while merging with master 2013-09-05 10:56:44 +05:30
Nabin Hait
2162fee396 Merge pull request #792 from akhileshdarjee/master 
[pos][fix] fixed pos view in sales_invoice.js
 2013-09-04 22:03:42 -07:00
Nabin Hait
4e8216696f [minor] [fix] patch name changed 2013-09-04 19:04:00 +05:30
Nabin Hait
526eaaa208 [minor] [fix] patch name changed 2013-09-04 18:43:44 +05:30
Nabin Hait
bf4d27ecf1 [minor] repost future gl entries only for current voucher items 2013-09-04 17:55:45 +05:30
Nabin Hait
3e34a6d0e1 [fix] [minor] serial no status update for material transfer 2013-09-04 12:54:33 +05:30
Akhilesh Darjee
7a274e4d2f [pos] [minor] pos print format & pos setting cancel function allowed 2013-09-02 18:53:09 +05:30
Akhilesh Darjee
12425ce85e [pos] [minor] pos completed 2013-09-02 18:48:39 +05:30
Nabin Hait
3f5e59eeeb [minor] [cleanup] Landed cost wizard 2013-09-02 18:44:55 +05:30