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

984 Commits

Author SHA1 Message Date
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
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
Bárbara Perretti
7ce0267f8f fix translate warehouse_wise_stock_balance.js 2013-10-03 17:36:12 -03:00
Bárbara Perretti
d2cdf7a2db Fix translate itemwise_recommended_reorder_level.js 2013-10-03 17:33:33 -03:00
Bárbara Perretti
7090383de4 Fix translate batch_wise_balance_history.js 2013-10-03 17:32:34 -03:00
Bárbara Perretti
301ce71c01 Fix translate stock_level.js 2013-10-03 17:28:23 -03:00
Bárbara Perretti
65122328eb Fix translate stock_ledger.js 2013-10-03 16:37:38 -03:00
Bárbara Perretti
ebb8dcf6f0 fix translate stock_balance.js 2013-10-03 16:03:59 -03:00
Bárbara Perretti
18f91ea7de fix translate stock_analytics.js 2013-10-03 15:41:49 -03:00
Bárbara Perretti
0cd1bcf44f Fix translate stock_ageing.js 2013-10-03 15:32:35 -03:00
Bárbara Perretti
dfe053fccd Fix translate warehouse.js 2013-10-03 15:26:36 -03:00
Bárbara Perretti
8252f2a34f Fix translate stock_reconciliation.js 2013-10-03 15:15:01 -03:00
Bárbara Perretti
995994f7c4 fix translate stock_entry.js 2013-10-03 14:57:34 -03:00
Bárbara Perretti
d538f1249f Fix translate purchase_receipt.js 2013-10-03 14:18:12 -03:00
Bárbara Perretti
1395dafb12 Fix translate packing_slip.js 2013-10-03 14:12:43 -03:00
Bárbara Perretti
eb331c225e Fix translate material_request.js 2013-10-03 14:03:07 -03:00
Bárbara Perretti
cf0f3a02d4 Fix translate item.js 2013-10-03 13:58:56 -03:00
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
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
 2013-10-02 16:52: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
Rushabh Mehta
24ca7e4e2e Added Transactions for Import webnotes/erpnext#911 2013-10-02 14:25:36 +05:30
Bárbara Perretti
e17417af43 Fix translate delivery_note.js 2013-10-01 19:14:55 -03:00
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master 
[feature] pos view added in all sales & purchase cycle
 2013-09-27 00:05:15 -07:00
Nabin Hait
ca77574a66 [fix] [minor] only post sl entries if stock item exists 2013-09-26 16:16:44 +05:30
Anand Doshi
f879a9dc2e [minor] wnf refactor, fixes in demo 2013-09-26 15:56:54 +05:30