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 |
|
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 |
|