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 |
|
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 |
|
Nabin Hait
|
a3df58a264
|
Merge branch 'master' into perpetual
|
2013-09-18 15:22:04 +05:30 |
|
Pratik Vyas
|
5e16a69b35
|
mass replace sql with webnotes.conn.sql
|
2013-09-18 12:20:53 +05:30 |
|
Pratik Vyas
|
e55fbfc090
|
remove sql =
|
2013-09-18 11:10:59 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Anand Doshi
|
619ed5e949
|
[fix] [minor] [website]
|
2013-09-17 13:46:50 +05:30 |
|
Anand Doshi
|
ad0b05060a
|
Merge branch 'master' of github.com:webnotes/erpnext into website-wip
|
2013-09-17 11:00:24 +05:30 |
|
Nabin Hait
|
42573bcc90
|
[fix] [minor] fixed order of execution
|
2013-09-17 10:38:04 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +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 |
|
Anand Doshi
|
fb109aded0
|
[website] [minor] moving to framework
|
2013-09-11 18:58:20 +05:30 |
|
Anand Doshi
|
0748cb7d18
|
[website] [minor] moving to framework
|
2013-09-11 15:31:58 +05:30 |
|
Akhilesh Darjee
|
c3ec72c991
|
[fix] [minor] merge conflict fixed
|
2013-09-11 14:49:38 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
b0d996ffb1
|
[website] [minor] moving to framework
|
2013-09-10 18:29:39 +05:30 |
|
Anand Doshi
|
330dae90cb
|
[website] [minor] moving to framework
|
2013-09-10 13:46:28 +05:30 |
|
Rushabh Mehta
|
7c2312a74c
|
[website] [minor] moving to framework
|
2013-09-10 12:51:52 +05:30 |
|
Rushabh Mehta
|
bdb846f665
|
[website] [minor] moving to framework
|
2013-09-09 17:31:19 +05:30 |
|
Rushabh Mehta
|
e865de01ee
|
[website] [minor] moving to framework
|
2013-09-09 12:32:35 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Rushabh Mehta
|
46089dbc97
|
[website] [minor] moving website helper methods to doctypes
|
2013-09-09 11:32:24 +05:30 |
|
Nabin Hait
|
a0871cfe6a
|
[fix] [minor] Fixes for uom validation of item
|
2013-09-06 16:26:07 +05:30 |
|
Nabin Hait
|
034380b004
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-06 14:06:12 +05:30 |
|
Nabin Hait
|
78fde78405
|
[fix] [minor] changed uom replace utility message
|
2013-09-06 14:05:47 +05:30 |
|
Anand Doshi
|
a3f6fda0df
|
[fix] Hide Make Delivery Note button, if Sales Invoice is made from Delivery Note. Hide Make Invoice Button, if Delivery Note is made from Sales Invoice
|
2013-09-06 13:37:52 +05:30 |
|
Nabin Hait
|
e33d0be32c
|
[fix] [minor] changed uom replace utility message
|
2013-09-06 13:23:33 +05:30 |
|
Nabin Hait
|
ce4be997ab
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-05 17:38:52 +05:30 |
|
Nabin Hait
|
63b5ef7ecf
|
[fix] [minor] is_pos zero when mapping
|
2013-09-05 17:38:24 +05:30 |
|
Akhilesh Darjee
|
2ea7a241a3
|
[fix] purchase receipt test cases
|
2013-09-05 16:28:45 +05:30 |
|
Anand Doshi
|
ea55734df5
|
[fix] [minor] delivered items to be billed
|
2013-09-05 12:41:16 +05:30 |
|
Nabin Hait
|
bf4d27ecf1
|
[minor] repost future gl entries only for current voucher items
|
2013-09-04 17:55:45 +05:30 |
|
Anand Doshi
|
36cd22bf71
|
Merge branch 'master' into customer-login
|
2013-09-04 15:10:17 +05:30 |
|
Nabin Hait
|
2851bc0514
|
[minor] [tetscases] for serialized item
|
2013-09-04 13:02:58 +05:30 |
|
Nabin Hait
|
3e34a6d0e1
|
[fix] [minor] serial no status update for material transfer
|
2013-09-04 12:54:33 +05:30 |
|
Nabin Hait
|
3b152ba6c7
|
[fix] [minor] make bank voucher from expense claim and serial no status
|
2013-09-03 23:19:08 +05:30 |
|
Nabin Hait
|
b9b3a5377a
|
[docs] [minor] perpetual accounting
|
2013-09-03 01:07:55 +05:30 |
|
Nabin Hait
|
3f5e59eeeb
|
[minor] [cleanup] Landed cost wizard
|
2013-09-02 18:44:55 +05:30 |
|
Nabin Hait
|
678130f8db
|
[minor] [cleanup] Landed cost wizard
|
2013-09-02 18:10:36 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Nabin Hait
|
e151c1ca29
|
[docs] [minor] documentation for perpetual inventory
|
2013-09-02 11:51:02 +05:30 |
|
Anand Doshi
|
ddb7c8048e
|
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
|
2013-09-02 11:13:32 +05:30 |
|
Nabin Hait
|
94c90bdbf9
|
[fix] [minor] buying amount for sales bom item
|
2013-08-30 22:48:19 +05:30 |
|
Anand Doshi
|
c8e39b0965
|
[fix] [minor] use prop instead of attr to disable a field
|
2013-08-30 18:22:58 +05:30 |
|
Nabin Hait
|
da1e503f3d
|
[fix] [minor] removed sample item field from item
|
2013-08-30 16:24:44 +05:30 |
|
Nabin Hait
|
bb77756069
|
[fix] [minor] auto accounting for stock transactions
|
2013-08-29 18:19:37 +05:30 |
|
Nabin Hait
|
d85d63bb81
|
[minor] renamed perpetual accounting to make_accounting_entry_for_every_stock_entry
|
2013-08-28 19:24:52 +05:30 |
|