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
|
efa94ce1bf
|
[fix] [minor] fixe in patch
|
2013-10-02 16:40:14 +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 |
|
Nabin Hait
|
49e71400ac
|
[patch] [minor] fix wrong customers in pos
|
2013-10-01 15:20:06 +05:30 |
|
Nabin Hait
|
d780baeacc
|
[fix] [minor] fixes in old patch
|
2013-10-01 11:22:51 +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
|
c6871dc194
|
[patch] [minor] unsubmit serial nos if submitted
|
2013-09-25 14:44:06 +05:30 |
|
Nabin Hait
|
52f6b5a6e8
|
[fix] [minor] fixes in old patches
|
2013-09-25 12:52:28 +05:30 |
|
Nabin Hait
|
c5f9dcfc70
|
[fix] [minor] fixes in old patches
|
2013-09-25 12:43:14 +05:30 |
|
Pratik Vyas
|
a80f2e4431
|
refactor site_path
|
2013-09-25 12:40:33 +05:30 |
|
Nabin Hait
|
4a1008829b
|
[fix] [minor] fixes in old patches
|
2013-09-25 12:37:13 +05:30 |
|
Nabin Hait
|
37ba2a2486
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-25 12:17:47 +05:30 |
|
Nabin Hait
|
04a3feecf6
|
[minor] perpetual inventory fix
|
2013-09-24 15:16:01 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Pratik Vyas
|
517b30a11d
|
fix for new wnf path stuff
|
2013-09-24 12:29:35 +05:30 |
|
Nabin Hait
|
01e6a9cf1e
|
Frozen Accounts Modifier setting in Accounts Settings
|
2013-09-24 12:08:31 +05:30 |
|
Nabin Hait
|
7031ea72ca
|
Frozen Accounts Modifier setting in Accounts Settings
|
2013-09-24 12:04:07 +05:30 |
|
Priya
|
b36e617316
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-09-23 11:42:44 +05:30 |
|
Anand Doshi
|
f0fc9a54ee
|
[minor] [patch] removed patches from march to august 2012
|
2013-09-21 13:43:48 +05:30 |
|
Anand Doshi
|
7cd7fc94ad
|
[minor] [patch] change serial no status only if serial no exists
|
2013-09-21 13:36:55 +05:30 |
|
Anand Doshi
|
417b23740a
|
[fix] [minor] reload style settings
|
2013-09-19 13:44:52 +05:30 |
|
Anand Doshi
|
20a8b1302d
|
[fix] [minor] price list patch
|
2013-09-17 17:19:03 +05:30 |
|
Priya
|
1aeaa14b4b
|
[docs] Customize and tools docs completed
|
2013-09-17 16:20:07 +05:30 |
|
Anand Doshi
|
83de391efc
|
Merge branch 'akhileshdarjee-master' into website-wip
|
2013-09-17 16:09:15 +05:30 |
|
Anand Doshi
|
2840620070
|
[fix] [minor] [website]
|
2013-09-17 15:28:58 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Akhilesh Darjee
|
0dc627d9b1
|
[fix] [minor] price list patch fixed
|
2013-09-17 13:52:22 +05:30 |
|
Akhilesh Darjee
|
06713d997e
|
[fix] [minor] price list patch of june 2013 update fixed
|
2013-09-17 13:44:22 +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
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Akhilesh Darjee
|
c96c13af4e
|
[fix] make demo for price list
|
2013-09-12 19:19:46 +05:30 |
|
Anand Doshi
|
31f1f005dd
|
[minor] [patch] fixed old patch
|
2013-09-12 17:43:38 +05:30 |
|
Anand Doshi
|
94d62a8d9f
|
[minor] [patch] fixed old patch
|
2013-09-12 17:39:36 +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 |
|
Nabin Hait
|
16447005bf
|
[fix] [minor] fixes in old patch
|
2013-09-12 16:58:54 +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 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Rushabh Mehta
|
13bbf6536b
|
[minor] webutils moved to lib
|
2013-09-10 14:44:36 +05:30 |
|
Anand Doshi
|
330dae90cb
|
[website] [minor] moving to framework
|
2013-09-10 13:46:28 +05:30 |
|
Rushabh Mehta
|
bdb846f665
|
[website] [minor] moving to framework
|
2013-09-09 17:31:19 +05:30 |
|
Rushabh Mehta
|
c59c4e0699
|
[website] [minor] moving to framework
|
2013-09-09 12:17:45 +05:30 |
|
Anand Doshi
|
f6e62c94ff
|
[fix] [minor] removed pos view check patch
|
2013-09-05 17:11:52 +05:30 |
|
Akhilesh Darjee
|
a7b7d2559e
|
[fix] merge conflict
|
2013-09-05 13:18:22 +05:30 |
|
Akhilesh Darjee
|
38e8f989fa
|
[fix] [patch] fixed paid_amount & patch for default pos view check in features setup
|
2013-09-05 12:59:33 +05:30 |
|
Nabin Hait
|
a653cd3608
|
[minor] fixed conflict while merging with master
|
2013-09-05 10:56:44 +05:30 |
|
Nabin Hait
|
2162fee396
|
Merge pull request #792 from akhileshdarjee/master
[pos][fix] fixed pos view in sales_invoice.js
|
2013-09-04 22:03:42 -07:00 |
|
Nabin Hait
|
4e8216696f
|
[minor] [fix] patch name changed
|
2013-09-04 19:04:00 +05:30 |
|
Nabin Hait
|
526eaaa208
|
[minor] [fix] patch name changed
|
2013-09-04 18:43:44 +05:30 |
|