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

1107 Commits

Author SHA1 Message Date
Nabin Hait
5033ef03cf [fix] [minor] merge conflict 2013-11-26 16:04:53 +05:30
Nabin Hait
ac9bcf714d Merge pull request #1097 from akhileshdarjee/master 
[fix] fiscal year fix in setup wizard
 2013-11-26 01:57:17 -08:00
Nabin Hait
131939a742 [fix] [minor] rename and merge for customer and supplier 2013-11-26 15:03:51 +05:30
Akhilesh Darjee
b0a1b3ab47 [fix] [minor] test cases fixes 2013-11-26 14:45:27 +05:30
Nabin Hait
9f51ee4a84 [fix] [minor] serial no status update fix 2013-11-24 16:03:40 +05:30
Nabin Hait
4ccb2edbfd Merge branch 'master' of github.com:webnotes/erpnext 2013-11-22 18:10:46 +05:30
Nabin Hait
451b01cfe4 [fix] [minor] print hide for purchase net and grand total 2013-11-22 17:17:35 +05:30
Nabin Hait
1b8c444a20 [cleanup] [minor] update serial no status, sales and purchase info 2013-11-21 23:18:29 +05:30
Anand Doshi
0c8fd3408c [minor] [website] fix in container 2013-11-21 14:58:59 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
Nabin Hait
e5a1a84d8d Merge pull request #1078 from akhileshdarjee/1310 
[fix] [minor] send sms fixed for purchase module
 2013-11-20 22:27:18 -08:00
Akhilesh Darjee
0ec4bdfcb8 [fix] [minor] send sms fixed for purchase module 2013-11-21 11:55:54 +05:30
Nabin Hait
458b30b5d3 Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-20 13:51:16 +05:30
Akhilesh Darjee
20f93546eb [fix] [minor] all variance related reports fixed 2013-11-20 13:25:04 +05:30
Nabin Hait
46220f9fab Merge branch '1310' of github.com:webnotes/erpnext into 1310 2013-11-20 13:14:39 +05:30
Nabin Hait
ca471f41a1 [fix] Rename and merge rewrite 2013-11-20 13:14:12 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Rushabh Mehta
ebdddf3fb6 [website] [sitemap] cleanup 2013-11-19 14:20:52 +05:30
Akhilesh Darjee
5a1a22e907 [fix] [minor] product search to search on textbox keypress 2013-11-19 12:26:46 +05:30
Akhilesh Darjee
510a73a0de [fix] [minor] product search box fixed 2013-11-18 15:29:36 +05:30
Rushabh Mehta
04cc5155f7 Added Notification Control for caching notifications probably causing the freezing problem 2013-11-18 13:23:20 +05:30
Akhilesh Darjee
6ca0548231 [fix] [minor] stock related reports fixed for serialized item 2013-11-18 12:16:48 +05:30
Anand Doshi
0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
 2013-11-15 19:12:09 +05:30
Nabin Hait
e505fbea54 [fix] [minor] stock balance report for serialized item 2013-11-15 13:38:23 +05:30
Nabin Hait
e83069cb32 [fix] update future gl entries for stock 2013-11-14 18:40:08 +05:30
Anand Doshi
89844f803d [minor] check permission for editable web page 2013-11-13 17:34:21 +05:30
Anand Doshi
4a67d36735 [minor] removed remark field from auto material request 2013-11-13 17:34:21 +05:30
Rushabh Mehta
4f642e7670 [cleanup] Fixed title bars, toolbars in all pages, added default background 2013-11-13 16:58:18 +05:30
Rushabh Mehta
515636f24c Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-11-08 16:28:12 +05:30
Rushabh Mehta
7d8b189c8f [cleanup] UI Fixes 2013-11-08 16:27:18 +05:30
Anand Doshi
ed1679a1c5 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-07 20:49:13 +05:30
Akhilesh Darjee
e3af1eaf47 [fix] fixed landed cost wizard for cancel_pr() 2013-11-06 16:59:38 +05:30
Rushabh Mehta
a063b4d50e [cleanup] UI Fixes, minor 2013-11-06 11:29:47 +05:30
Anand Doshi
b03f870441 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-04 15:22:50 +05:30
Anand Doshi
3673a25176 [minor] fixes after item price move 2013-11-04 15:14:57 +05:30
Anand Doshi
2ced381976 [minor] fixes in test cases and demo 2013-11-04 14:37:29 +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
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30
Rushabh Mehta
ef5845589d [cleanup] [minor] finishing styles, labels, descriptions 2013-11-02 14:47:11 +05:30
Akhilesh Darjee
e158cea77a [cleanup] [minor] replaced for territory to applicable territory 2013-10-31 19:50:51 +05:30
Rushabh Mehta
bed14d7fa4 Merge branch 'master' of github.com:webnotes/erpnext into cleanup 2013-10-31 15:16: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
Anand Doshi
fec52b5a8f [minor] fixed stock entry and demo 2013-10-28 19:59:45 +05:30
Nabin Hait
a5bd3dd207 [fix] [minor] update finished goods against production order 2013-10-28 19:59:43 +05:30
Rushabh Mehta
069672e197 [minor] cleanup start 2013-10-28 18:21:07 +05:30
Nabin Hait
bd071b9543 [fix] [minor] update finished goods against production order 2013-10-25 15:39:17 +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
Nabin Hait
3898777c9f [minor] validation message in serial no 2013-10-24 17:36:02 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Akhilesh Darjee
97e55710da [fix] [minor] get_items function fix 2013-10-23 15:22:22 +05:30
Akhilesh Darjee
2cdeb3bb7a [fix] [minor] if difference account blank then fetch from company 2013-10-23 14:46:07 +05:30
Akhilesh Darjee
d32b6a8d32 [fix] production order transfer raw material to fetch all necessary data 2013-10-23 14:03:46 +05:30
Nabin Hait
953d0a955f [feature] Replace Company Abbr 2013-10-21 12:53:10 +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
f295692937 [fix] [minor] item price added in setup page and stock 2013-10-18 16:21:32 +05:30
Anand Doshi
0bc5ae55d8 [minor] fixes in data import, serial no and setup wizard 2013-10-18 16:07:47 +05:30
Akhilesh Darjee
cd80d86dbb [fix] [minor] renamed edit prices button from price list and item 2013-10-18 15:35:13 +05:30
Akhilesh Darjee
2d82f26976 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-18 15:28:15 +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
89ad6f2dab [fix] [conflict] 2013-10-18 12:55:59 +05:30
Nabin Hait
d1fd1e2d89 [Cleanup] Sales Common deprecated 2013-10-18 12:50:28 +05:30
Nabin Hait
d05a3b3b5c [Rename] Delivery Note Packing Item -> Packed Item 2013-10-18 12:50:28 +05:30
Nabin Hait
096d363087 [fix] fixed merge conflict 2013-10-18 12:50:28 +05:30
Rushabh Mehta
46eaa55f06 [editable] [minor] made item, item_group pages editable 2013-10-18 12:17:20 +05:30
Anand Doshi
6294452435 [minor] removed references to server.py 2013-10-17 20:00:52 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Bárbara Perretti
3da50f0960 Fix translate stock/page/stock_home/stock_home.js 2013-10-15 18:34:18 -03:00
Bárbara Perretti
f007dd4e5f Fix translate stock/page/stock_ageing/stock_ageing.js 2013-10-15 18:32:38 -03:00
Anand Doshi
a295bf5421 [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:52:29 +05:30
Nabin Hait
b6f37b8195 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:55:54 +05:30
Nabin Hait
b338b6ed24 [fix] [minor] validate converion rate 2013-10-15 16:55:24 +05:30
Akhilesh Darjee
8f90e1c8f4 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 16:26:38 +05:30
Akhilesh Darjee
dd6ebc1a4d [cleanup] comminified copy_account_in_all_row and removed conversion rate from pos setting 2013-10-15 15:54:31 +05:30
Akhilesh Darjee
1dfcc7557a [fix] fetch difference account and cost center on selecting item in stock entry 2013-10-15 13:54:39 +05:30
Anand Doshi
8ae6520129 Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	stock/doctype/stock_entry/test_stock_entry.py
 2013-10-15 13:02:23 +05:30
Nabin Hait
5101098020 [fix] [minor] fixes in testcases 2013-10-15 13:00:53 +05:30
Anand Doshi
21abc706b0 Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/sales_invoice/test_sales_invoice.py
	buying/doctype/purchase_order/test_purchase_order.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_entry/test_stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py
 2013-10-15 13:00:49 +05:30
Nabin Hait
3ceba11208 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 12:19:47 +05:30
Nabin Hait
f8924bcf6f [fix] [minor] update serial no in sle while creating auto serial no 2013-10-15 12:19:25 +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
Akhilesh Darjee
1c7e5725a3 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-14 13:43:11 +05:30
Nabin Hait
eea2b34f4b [production] update planned and produced ty 2013-10-11 18:31:33 +05:30
Rushabh Mehta
56bc5c0ea6 [material request] Added feature to pull items from BOM 2013-10-11 14:34:46 +05:30
Akhilesh Darjee
1797cfef63 [fix] removed validation of conversion rate equals 1 from all transaction 2013-10-11 13:34:10 +05:30
Nabin Hait
93c836c86d [fix] [minor] validate warehouse user 2013-10-10 19:15:58 +05:30
Nabin Hait
0948b2a9d3 [fix] [minor] repost order qty patch 2013-10-10 19:04:18 +05:30
Anand Doshi
9106221ea4 [minor] fixes after merge with master 2013-10-10 18:44:26 +05:30
Rushabh Mehta
2eec1eb9a6 [minor] removed prevdoc_date 2013-10-10 17:08:19 +05:30
Rushabh Mehta
f56d73c9bc [minor] removed get_rate 2013-10-10 17:07:53 +05:30
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +05:30
Anand Doshi
b604eddbfd [minor] [fixes] view in website and other fixes 2013-10-10 15:43:32 +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
8f05c05bfb Validate warehouse for allowed users and matched company 2013-10-07 13:08:13 +05:30
Nabin Hait
842e9d60cc [fix] [minor] serial no update 2013-10-05 19:57:39 +05:30
Nabin Hait
ac90ecf946 [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 15:36:29 +05:30
Nabin Hait
5f8477d4ef [patch] [minor] perpetual inventory stock transfer utility 2013-10-04 15:29:36 +05:30