1017 Commits

Author SHA1 Message Date
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
Nabin Hait
16ec14f9ab [fix] set missing values on creation of stock entry from material request 2013-09-26 14:08:09 +05:30
Nabin Hait
1ec5109a1a Reduce ordered qty in Purchase Receipt based on PO warehouse 2013-09-25 19:58:32 +05:30
Anand Doshi
5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
2013-09-25 19:55:41 +05:30
Nabin Hait
7496b528a1 [fix] [minor] validate parent account for warehouse account 2013-09-25 17:32:33 +05:30
Nabin Hait
ee60763b45 [fix] [minor] negative stock balance for batch 2013-09-25 15:59:35 +05:30
Nabin Hait
5c464e4a01 [fix] [minor] uom conversion factor mandatory check 2013-09-25 13:24:00 +05:30
Nabin Hait
373b53f222 [fix] [minor] create account for warehouse if not exists with same name 2013-09-25 12:50:46 +05:30
Nabin Hait
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Nabin Hait
11f41955c9 [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
Akhilesh Darjee
e318c93405 [fix] patch merge conflict fixed 2013-09-23 12:34:22 +05:30
Nabin Hait
2b9cfcbe0b [fix] [minor] rejected warehouse in purchase receipt item now editable 2013-09-20 11:50:06 +05:30
Anand Doshi
12144f339e Merge branch 'website-wip' 2013-09-19 12:27:11 +05:30
Nabin Hait
068ef97032 -am 2013-09-19 10:27:18 +05:30
Nabin Hait
752067c8f1 [fix] [minor] make debit note from purchase return 2013-09-18 23:25:50 +05:30
Akhilesh Darjee
f83576bf9c [pos] pos.js included in all selling & purchase cycle 2013-09-18 18:35:12 +05:30
Pratik Vyas
16371b7212 refactor stock ledger to be thread safe 2013-09-18 18:31:03 +05:30
Anand Doshi
e122121dc4 [fix] [minor] stock uom and price list currency in webshop 2013-09-18 17:28:06 +05:30