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 |
|
Nabin Hait
|
2e296fa46f
|
[fix] [minor] Repost future gl entries and testcases
|
2013-08-28 18:53:11 +05:30 |
|
Rushabh Mehta
|
993c5c3bd7
|
[fix] [minor]
|
2013-08-28 14:06:15 +05:30 |
|
Rushabh Mehta
|
a65253b5d5
|
[stock] [minor] Added Warehouse User check in Sales Order
|
2013-08-27 10:32:56 +05:30 |
|
Nabin Hait
|
92b0e777e8
|
[fix] [minor] merged with master
|
2013-08-26 16:55:42 +05:30 |
|
Nabin Hait
|
27994c216a
|
[perpetual accounting] gl entries based on stock_value difference in sl entries
|
2013-08-26 16:53:30 +05:30 |
|
Anand Doshi
|
cf343174a4
|
[fix] removed purchase order no from purchase list view, since it does not show purchase receipt when the form doesn't have any purchase receipt items
|
2013-08-23 19:53:41 +05:30 |
|
Anand Doshi
|
4d47b007aa
|
[fix] [minor] fix in re-order query
|
2013-08-23 16:54:31 +05:30 |
|
Nabin Hait
|
aeba24ee81
|
[minor] make gl entry through bean and testcases
|
2013-08-23 15:17:36 +05:30 |
|
Nabin Hait
|
f3075e19dc
|
Merge branch 'master' of github.com:webnotes/erpnext into perpetual
|
2013-08-22 14:42:20 +05:30 |
|
Nabin Hait
|
328fc095a0
|
[fix] [minor] fixes in item merging
|
2013-08-22 10:48:41 +05:30 |
|
Nabin Hait
|
11bd44e447
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:51:46 +05:30 |
|
Nabin Hait
|
f68d563a68
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:49:26 +05:30 |
|
Anand Doshi
|
4cfb779d93
|
[fix] [permissions] Serial No - Read, Write permission for Accounts User
|
2013-08-21 13:37:55 +05:30 |
|
Nabin Hait
|
72c9aa083a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-21 11:29:35 +05:30 |
|
Nabin Hait
|
945aff1468
|
[fix] [minor] fiscal year deleted from serial no
|
2013-08-21 11:28:45 +05:30 |
|
Rushabh Mehta
|
8331bbfc92
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-21 11:21:01 +05:30 |
|
Rushabh Mehta
|
82e54c8293
|
[minor] fix to purchase receipt button, make_demo
|
2013-08-21 11:19:15 +05:30 |
|
Nabin Hait
|
691096d8b1
|
[fix] [minor] duplicate stock entry against production order
|
2013-08-21 11:07:24 +05:30 |
|
Nabin Hait
|
7bd850a133
|
[patch] [minor] fix sle against cancelled stock entry for production
|
2013-08-20 17:40:26 +05:30 |
|
Nabin Hait
|
4aeee45530
|
[fix] [minor] get items from bom on material transfer against production order
|
2013-08-20 17:09:05 +05:30 |
|
Nabin Hait
|
bd0277f4d2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-20 16:13:43 +05:30 |
|
Nabin Hait
|
a7a919d721
|
[fix] [minor] set warranty expiry date on serial no from delivery note
|
2013-08-20 16:13:23 +05:30 |
|
Nabin Hait
|
9653f60e89
|
[fix] [minor] insert cancelled sl entry for serialized inventory and at the end delete
|
2013-08-20 15:37:33 +05:30 |
|
Rushabh Mehta
|
20a109452a
|
[buying] [manufacturing] Added new Reports and fixes for demo
|
2013-08-20 15:18:42 +05:30 |
|
Nabin Hait
|
c13c193bbc
|
[fix] [minor] update reserved qty
|
2013-08-20 12:28:44 +05:30 |
|
Nabin Hait
|
4ae729bfd2
|
[cleanup] [minor] deprecated cancelled stock ledger entry
|
2013-08-20 12:04:46 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Rushabh Mehta
|
d8982d4af4
|
[serial no] [minor] fix - set Available status after insert on creation
|
2013-08-19 22:00:25 +05:30 |
|
Anand Doshi
|
b02fba9c77
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-19 20:03:51 +05:30 |
|
Anand Doshi
|
2e31e097fa
|
[fix] [minor] _round function - implement round halfs to nearest even number
|
2013-08-19 19:58:23 +05:30 |
|
Nabin Hait
|
76273ebfbc
|
[merge] [minor] Fixed conflict while merging serial_no branch with master
|
2013-08-19 16:26:13 +05:30 |
|
Nabin Hait
|
74c281cc55
|
[cleanup] [minor] On cancellation of transation, do not post cancelled sl entries, delete allexisting sl entries against that transaction
|
2013-08-19 16:17:18 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Nabin Hait
|
c46d044efe
|
[fix] [minor] [stock entry] call get_items even if item exists and on saved document
|
2013-08-17 12:38:23 +05:30 |
|