Rushabh Mehta
|
3525b62842
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-25 06:44:01 +01:00 |
|
Nabin Hait
|
27b4a92b02
|
error fixed in recurring invoices
|
2013-01-25 11:10:29 +05:30 |
|
Rushabh Mehta
|
4e01011669
|
added language to pages
|
2013-01-24 19:31:55 +05:30 |
|
Rushabh Mehta
|
317177afd2
|
updated languages
|
2013-01-24 18:18:39 +05:30 |
|
Rushabh Mehta
|
ad14943c3f
|
added arabic
|
2013-01-24 17:37:43 +05:30 |
|
Rushabh Mehta
|
4c17718b4c
|
added portuguese
|
2013-01-24 16:31:23 +05:30 |
|
Rushabh Mehta
|
877a1a9274
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-24 15:56:15 +05:30 |
|
Rushabh Mehta
|
908d09d058
|
added spanish
|
2013-01-24 15:55:30 +05:30 |
|
Rushabh Mehta
|
27254d9440
|
added spanish
|
2013-01-24 15:55:08 +05:30 |
|
Rushabh Mehta
|
46e8084aea
|
fixes to language
|
2013-01-24 15:22:06 +05:30 |
|
Nabin Hait
|
8cf90f18f0
|
check item/item group with same name while creating item group/item
|
2013-01-24 14:58:21 +05:30 |
|
Nabin Hait
|
1290284c80
|
validation fixes in mantenance schedule and error fixes in setting serial no warranty expiry date
|
2013-01-24 13:23:20 +05:30 |
|
Nabin Hait
|
a4a20cbf7b
|
issue fixed in packing slip
|
2013-01-24 12:37:50 +05:30 |
|
Nabin Hait
|
fd23153f50
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-24 11:03:24 +05:30 |
|
Nabin Hait
|
8df3f125e5
|
stripped serial nos before processing
|
2013-01-24 11:02:48 +05:30 |
|
Rushabh Mehta
|
9c77a25cd3
|
merge
|
2013-01-23 19:44:35 +05:30 |
|
Rushabh Mehta
|
597d470e63
|
added format_currency and added options to all currency fields
|
2013-01-23 19:39:51 +05:30 |
|
Nabin Hait
|
291e8c2545
|
removed landed cost master
|
2013-01-23 16:06:44 +05:30 |
|
Rushabh Mehta
|
5842ee0918
|
removed amendment_date mandatory validation from purchase cucle
|
2013-01-23 09:17:51 +01:00 |
|
Rushabh Mehta
|
6382a42dbe
|
more fixes to perms, floats and default enabled / disabled in search
|
2013-01-23 10:09:28 +05:30 |
|
Nabin Hait
|
92a0218091
|
added uom column in stock reports
|
2013-01-22 17:52:43 +05:30 |
|
Nabin Hait
|
bf95405c6d
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-22 16:50:23 +05:30 |
|
Nabin Hait
|
6e9756b8bb
|
valuation rate mandatory for opening stock reco
|
2013-01-22 16:49:55 +05:30 |
|
Rushabh Mehta
|
efe8102351
|
merge
|
2013-01-22 15:23:58 +05:30 |
|
Rushabh Mehta
|
cd4a854a28
|
converted currency to float and removed level 1 permissions
|
2013-01-22 15:10:25 +05:30 |
|
Nabin Hait
|
319fb92d18
|
consider global val method if not specified in item master and apply zero filters
|
2013-01-22 14:40:20 +05:30 |
|
Nabin Hait
|
025e01322c
|
stock balance report: qty and value in same page, valuation method from item master
|
2013-01-22 14:03:34 +05:30 |
|
Nabin Hait
|
ec52db8490
|
commonified in_words function and introduced selling_controller
|
2013-01-22 11:53:14 +05:30 |
|
Nabin Hait
|
5b4c294b40
|
commonified in_words function
|
2013-01-22 11:12:02 +05:30 |
|
Rushabh Mehta
|
a495b86848
|
description in stock level
|
2013-01-21 18:48:26 +05:30 |
|
Rushabh Mehta
|
70d4fbb7ea
|
changed item from select to link in stock ledger and stock level
|
2013-01-21 18:19:52 +05:30 |
|
Nabin Hait
|
223897f145
|
fixes merge conflict
|
2013-01-21 17:30:35 +05:30 |
|
Nabin Hait
|
d3b625035c
|
fixes in total_in_words
|
2013-01-21 17:24:31 +05:30 |
|
Rushabh Mehta
|
bb9968491b
|
added report permissions to txt files
|
2013-01-21 14:22:07 +05:30 |
|
Nabin Hait
|
aeb992a4fd
|
get_query for item code in batch master
|
2013-01-21 14:20:02 +05:30 |
|
Rushabh Mehta
|
861b3d6092
|
merge
|
2013-01-21 10:23:21 +05:30 |
|
Rushabh Mehta
|
f5b04cff8b
|
added number format, sent country info in boot, link options not extracted from cache
|
2013-01-21 10:14:10 +05:30 |
|
Nabin Hait
|
f947368881
|
added validation for sales return and purchase return
|
2013-01-18 16:04:51 +05:30 |
|
Anand Doshi
|
75c85a0ff5
|
Merge branch 'master' into edge
|
2013-01-18 16:01:53 +05:30 |
|
Nabin Hait
|
e5f1152c01
|
fixes in stock entry
|
2013-01-18 15:17:40 +05:30 |
|
Nabin Hait
|
dad280ed8e
|
fixes in stock entry
|
2013-01-18 15:01:30 +05:30 |
|
Anand Doshi
|
35af9ba4e6
|
Merge branch 'master' into edge
|
2013-01-18 14:50:25 +05:30 |
|
Nabin Hait
|
a1716543c2
|
fixes in stock entry
|
2013-01-18 14:26:43 +05:30 |
|
Anand Doshi
|
a81370f2a3
|
added description to Price List field. added in latest updates
|
2013-01-18 13:26:54 +05:30 |
|
Anand Doshi
|
8b940ee451
|
fixes after merge
|
2013-01-18 13:07:02 +05:30 |
|
Anand Doshi
|
ef02ddfc40
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
accounts/doctype/gl_control/gl_control.py
|
2013-01-17 20:31:41 +05:30 |
|
Anand Doshi
|
8957bf9e09
|
print hide price list related fields
|
2013-01-17 20:29:28 +05:30 |
|
Anand Doshi
|
f8f0c0d089
|
updates in purchase cycle's price list
|
2013-01-17 20:20:56 +05:30 |
|
Rushabh Mehta
|
8af47e8413
|
Merge branch 'edge'
|
2013-01-17 18:24:09 +05:30 |
|
Rushabh Mehta
|
80721518e3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-17 18:23:07 +05:30 |
|
Rushabh Mehta
|
db7139a649
|
started fresh install and added country_info
|
2013-01-17 18:22:22 +05:30 |
|
Nabin Hait
|
1b4f56c57f
|
fixes in c-form
|
2013-01-17 17:01:51 +05:30 |
|
Anand Doshi
|
9d9aec1ed4
|
shifted get_company_currency from transaction base to setup/utils.py
|
2013-01-17 15:44:57 +05:30 |
|
Nabin Hait
|
feee252093
|
fixes in website page_name for item
|
2013-01-17 13:03:30 +05:30 |
|
Nabin Hait
|
64d7c4b2d5
|
fixes in get_incoming_rate
|
2013-01-17 12:22:59 +05:30 |
|
Anand Doshi
|
03fa78597d
|
Merge branch 'master' into purchase_price_list
|
2013-01-17 10:58:41 +05:30 |
|
Rushabh Mehta
|
6f9915cd17
|
install from txt files, part 1
|
2013-01-16 17:48:17 +05:30 |
|
Nabin Hait
|
6b1f21d1bb
|
fixes in get_incoming_rate
|
2013-01-16 17:17:17 +05:30 |
|
Nabin Hait
|
831207ff54
|
incoming rate for sales return as per delivery note outgoing rate
|
2013-01-16 14:15:48 +05:30 |
|
Nabin Hait
|
44ffd4360c
|
reorder level and qty added in stock level report
|
2013-01-16 11:16:21 +05:30 |
|
Nabin Hait
|
c57c0d4e1d
|
item name and description added in stock ageing report
|
2013-01-16 10:31:55 +05:30 |
|
Anand Doshi
|
8ec06aed5c
|
only allow upto 100 rows in stock reco
|
2013-01-15 18:54:16 +05:30 |
|
Anand Doshi
|
756dca719b
|
refactored purchase cycle's get item details and update item details functions and started with purchase price list
|
2013-01-15 18:39:21 +05:30 |
|
Anand Doshi
|
5c03869472
|
fixed stock reco json to long text
|
2013-01-15 12:26:28 +05:30 |
|
Anand Doshi
|
62af43c9ff
|
changed reconciliation json to long text
|
2013-01-15 12:25:02 +05:30 |
|
Anand Doshi
|
3817f2b9ba
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-15 12:00:44 +05:30 |
|
Anand Doshi
|
4fc5d92ac5
|
fixes in stock ledger report
|
2013-01-15 11:58:19 +05:30 |
|
Nabin Hait
|
d09d091db1
|
test case added for stock reco
|
2013-01-15 11:24:48 +05:30 |
|
Nabin Hait
|
e998ccd82a
|
stock reco fises
|
2013-01-15 11:14:17 +05:30 |
|
Rushabh Mehta
|
ed34ab43e8
|
stock_ledger, removed un-necessary incoming_rate calculation
|
2013-01-15 10:42:39 +05:30 |
|
Rushabh Mehta
|
aae09ce82c
|
updates to datetime.js
|
2013-01-14 18:17:58 +05:30 |
|
Rushabh Mehta
|
1cfde3ed41
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-14 16:11:30 +05:30 |
|
Rushabh Mehta
|
3c5161113e
|
merge
|
2013-01-14 16:11:03 +05:30 |
|
Anand Doshi
|
9437f39c86
|
fixes in stock reco
|
2013-01-14 15:52:22 +05:30 |
|
Rushabh Mehta
|
be9ef4ac89
|
added code to update timestamps in Task, Customer Issue and Support Ticket
|
2013-01-14 15:48:00 +05:30 |
|
Anand Doshi
|
c313d662df
|
-m
|
2013-01-14 15:46:17 +05:30 |
|
Anand Doshi
|
6c5262abb1
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
patches/patch_list.py
stock/report/stock_ledger/stock_ledger.txt
|
2013-01-14 13:28:31 +05:30 |
|
Nabin Hait
|
914c6df478
|
testcase for stock reco
|
2013-01-14 13:15:42 +05:30 |
|
Rushabh Mehta
|
0c42dc4c22
|
updated is_custom='Yes' in standard reports
|
2013-01-14 10:49:29 +05:30 |
|
Nabin Hait
|
ac53b11969
|
stock reco fixes with testcases
|
2013-01-11 19:25:46 +05:30 |
|
Anand Doshi
|
4dc7caadf2
|
use for update lock when updating stock entries
|
2013-01-11 11:44:49 +05:30 |
|
Rushabh Mehta
|
4f5b89934b
|
stock uom replace bugfix
|
2013-01-11 10:50:54 +05:30 |
|
Anand Doshi
|
1b531866e0
|
fixes in stock reco, test case for serial no stock entry
|
2013-01-10 19:29:51 +05:30 |
|
Anand Doshi
|
ad13b4a716
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
|
2013-01-10 14:38:08 +05:30 |
|
Rushabh Mehta
|
846678a1e4
|
added links to open count in module + other minor fixes
|
2013-01-10 12:25:25 +05:30 |
|
Nabin Hait
|
9514d170c2
|
stock reco testcases
|
2013-01-10 10:40:37 +05:30 |
|
Rushabh Mehta
|
978d4e87c9
|
updated setup
|
2013-01-09 17:23:45 +05:30 |
|
Rushabh Mehta
|
be0b7df27e
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-01-09 16:41:01 +05:30 |
|
Rushabh Mehta
|
ce1d5276ff
|
added moduleview
|
2013-01-09 16:39:27 +05:30 |
|
Nabin Hait
|
3e28f8f54b
|
Merge branch 'stock_reco' of github.com:webnotes/erpnext into stock_reco
|
2013-01-09 15:23:43 +05:30 |
|
Nabin Hait
|
26d46556a4
|
first cut error fixes
|
2013-01-09 15:23:05 +05:30 |
|
Nabin Hait
|
f8c6531c3d
|
set as default button in fiscal year
|
2013-01-09 14:44:24 +05:30 |
|
Nabin Hait
|
0f61b476a2
|
toggle display of contact info based on customer
|
2013-01-09 12:50:43 +05:30 |
|
Nabin Hait
|
dc8913e132
|
toggle display of contact info based on customer and conatct, address query based on customer
|
2013-01-09 12:35:24 +05:30 |
|
Anand Doshi
|
435fd1426b
|
Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
|
2013-01-09 11:25:34 +05:30 |
|
Nabin Hait
|
902e8609e5
|
stock reco and utility function of stocks
|
2013-01-08 18:29:24 +05:30 |
|
Anand Doshi
|
c2e3f347ea
|
fix in stock entry.py -- dictionary size should not change when looping
|
2013-01-08 17:07:00 +05:30 |
|
Nabin Hait
|
418d580a8b
|
fifo part of stock reconciliation
|
2013-01-07 19:35:20 +05:30 |
|
Nabin Hait
|
9d0f636c46
|
stock reconciliation - rewrite in progress
|
2013-01-07 18:51:11 +05:30 |
|
Rushabh Mehta
|
996c30a575
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-01-07 17:43:52 +05:30 |
|
Rushabh Mehta
|
143ea718c3
|
commified item_code query
|
2013-01-07 17:03:11 +05:30 |
|
Rushabh Mehta
|
523aec499a
|
bootstrapped language and added 'hi'
|
2013-01-07 15:39:54 +05:30 |
|
Nabin Hait
|
ea09dbcfbb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-07 15:00:08 +05:30 |
|
Nabin Hait
|
8bacc3443e
|
added columns and moved serial no related reports to stock module
|
2013-01-07 14:59:07 +05:30 |
|
Anand Doshi
|
e80b9c6ee9
|
closing = opening + diff for stock balance report
|
2013-01-07 13:28:40 +05:30 |
|
Anand Doshi
|
1d55c72d8b
|
added .py~ to gitignore
|
2013-01-07 12:54:10 +05:30 |
|
Anand Doshi
|
68d1023624
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-04 13:17:03 +05:30 |
|
Anand Doshi
|
62299260dc
|
shifted UOM field to after qty field in purchase cycle
|
2013-01-04 13:16:34 +05:30 |
|
Nabin Hait
|
0b65700ef8
|
serial No Status report
|
2013-01-04 12:06:54 +05:30 |
|
Anand Doshi
|
cec918f9ce
|
fix in stock level report
|
2013-01-02 16:00:25 +05:30 |
|
Anand Doshi
|
946442d7a5
|
added new item-wise pricelist report and deprecated search criteria of Stock module
|
2013-01-02 13:51:29 +05:30 |
|
Nabin Hait
|
6072a682bc
|
added description in stock level and balance report
|
2012-12-31 17:16:23 +05:30 |
|
Anand Doshi
|
025d741ecf
|
fix in stock balance report
|
2012-12-31 12:43:36 +05:30 |
|
Anand Doshi
|
751af41a94
|
temporarily removed status validation for serial no
|
2012-12-30 16:43:04 +05:30 |
|
Anand Doshi
|
f9a3c8fcdc
|
added status validation
|
2012-12-28 19:42:49 +05:30 |
|
Nabin Hait
|
e606e7850a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-28 16:51:55 +05:30 |
|
Nabin Hait
|
6850b4c572
|
added footnote to stock level report explaining the various columns
|
2012-12-28 16:44:52 +05:30 |
|
Nabin Hait
|
30f5346184
|
stock level report
|
2012-12-28 15:39:55 +05:30 |
|
Nabin Hait
|
5d273df92e
|
changes in layout of module home page
|
2012-12-28 15:39:21 +05:30 |
|
Anand Doshi
|
391b6b7a0f
|
fixes validation in item master
|
2012-12-28 15:30:21 +05:30 |
|
Rushabh Mehta
|
43eb513a43
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-27 16:50:55 +05:30 |
|
Rushabh Mehta
|
1b1517155b
|
added about us page and settings
|
2012-12-27 16:50:24 +05:30 |
|
Anand Doshi
|
b420e88955
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-27 15:36:30 +05:30 |
|
Anand Doshi
|
b62c4edf02
|
added is_item_table_empty validation in submit event of purchase common
|
2012-12-27 15:35:58 +05:30 |
|
Nabin Hait
|
562de92070
|
removed project related doctype mapper
|
2012-12-27 15:14:27 +05:30 |
|
Rushabh Mehta
|
5f1d57ecb7
|
address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner
|
2012-12-27 14:05:02 +05:30 |
|
Anand Doshi
|
b2c3e81e55
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-25 18:35:39 +05:30 |
|
Anand Doshi
|
4279dec000
|
fixed wn.require path for stock analytics and stock balance
|
2012-12-25 18:35:12 +05:30 |
|
Rushabh Mehta
|
4ce83836b3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-25 18:23:37 +05:30 |
|
Rushabh Mehta
|
7edf899706
|
added wesite slideshow and attributions on website
|
2012-12-25 18:18:17 +05:30 |
|
Nabin Hait
|
bfe864e11a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-25 18:17:16 +05:30 |
|
Nabin Hait
|
ce159ab66b
|
stock balance report and inclusion of filter on brand in all stock reports
|
2012-12-25 18:04:10 +05:30 |
|
Rushabh Mehta
|
f50c012808
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-25 15:09:58 +05:30 |
|
Rushabh Mehta
|
7837d80716
|
fixes to website, item (added table for cross listing), modules_setup and form_header
|
2012-12-25 15:09:14 +05:30 |
|
Nabin Hait
|
ed92841868
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-24 18:47:57 +05:30 |
|
Nabin Hait
|
68431e9cb3
|
restored 'use multi level bom' in production order
|
2012-12-24 18:47:18 +05:30 |
|
Anand Doshi
|
b9314da054
|
validate is stock item in stock entry
|
2012-12-24 18:38:32 +05:30 |
|
Anand Doshi
|
a0713196d2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-24 18:08:16 +05:30 |
|
Anand Doshi
|
f5d90abe92
|
addchild will never save added doc
|
2012-12-24 17:02:38 +05:30 |
|
Rushabh Mehta
|
6f65de15ae
|
appframe fixes
|
2012-12-22 13:50:35 +05:30 |
|
Anand Doshi
|
c3e485b705
|
fixed remove from locals
|
2012-12-21 16:02:36 +05:30 |
|
Nabin Hait
|
dff6ed880b
|
cleanup for stock entry - remove production order from locals
|
2012-12-21 14:42:00 +05:30 |
|
Nabin Hait
|
079f5e0773
|
For Material Transfer against Production Order, fetch quantity pending to be transferred for each item.
|
2012-12-21 14:14:07 +05:30 |
|
Anand Doshi
|
be8af5b7ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-20 18:34:09 +05:30 |
|
Anand Doshi
|
d566a10f55
|
validate warehouses for manufacture/repack only if bom is used
|
2012-12-20 18:33:04 +05:30 |
|
Rushabh Mehta
|
88a4c44cfa
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-20 17:12:59 +05:30 |
|
Rushabh Mehta
|
fc19f25c88
|
updates to item, item_group and website
|
2012-12-20 17:11:51 +05:30 |
|
Nabin Hait
|
b5d23ee554
|
hide display of from/to warehouse based on purpose
|
2012-12-20 15:33:59 +05:30 |
|
Anand Doshi
|
6c92a56cae
|
changed description in production order, syntax fix in stock entry.py
|
2012-12-20 13:57:43 +05:30 |
|
Nabin Hait
|
6435437e5b
|
updates in manufacturing module
|
2012-12-19 19:33:41 +05:30 |
|
Nabin Hait
|
4ecc785aab
|
fixed conflict
|
2012-12-19 12:18:15 +05:30 |
|
Nabin Hait
|
1a6a94b760
|
stock entry cleanup
|
2012-12-18 18:42:02 +05:30 |
|
Rushabh Mehta
|
647e0d1164
|
updates to product_page (search) and kb fix
|
2012-12-18 14:47:54 +05:30 |
|
Nabin Hait
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +05:30 |
|
Nabin Hait
|
5c2bb9d9ed
|
sales order linked with project
|
2012-12-18 10:44:01 +05:30 |
|
Nabin Hait
|
7c59c68434
|
stock entry cleanp
|
2012-12-18 10:28:36 +05:30 |
|
Rushabh Mehta
|
a93ba77918
|
added item specification, bugfix for form grid
|
2012-12-17 16:02:04 +05:30 |
|
Rushabh Mehta
|
0e9e848cfc
|
added item specification, bugfix for form grid
|
2012-12-17 16:00:34 +05:30 |
|
Anand Doshi
|
834adfab60
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-17 14:13:59 +05:30 |
|
Anand Doshi
|
1b8918a192
|
do not copy uom details in item
|
2012-12-17 14:12:47 +05:30 |
|
Rushabh Mehta
|
6fa388c3d4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-17 12:53:20 +05:30 |
|
Anand Doshi
|
09f799bc98
|
show message on removing attachment used in description html
|
2012-12-17 12:12:01 +05:30 |
|
Nabin Hait
|
5ca0f44890
|
bom cleanup
|
2012-12-14 19:00:42 +05:30 |
|
Rushabh Mehta
|
173a0fd4b7
|
refactored web / all-app now linked in app. no wnframework in website
|
2012-12-14 16:39:27 +05:30 |
|
Nabin Hait
|
13d2e74886
|
bom cleanup
|
2012-12-14 14:29:12 +05:30 |
|
Nabin Hait
|
3adaf607f0
|
bom cleanup
|
2012-12-14 14:25:51 +05:30 |
|
Nabin Hait
|
fce76cd5b2
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-14 13:21:52 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Rushabh Mehta
|
a59aa68eac
|
added new reports
|
2012-12-14 10:27:10 +05:30 |
|
Rushabh Mehta
|
e848e9c4c3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-13 13:14:22 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Nabin Hait
|
d8e5dcc6f8
|
accepted qty = received qty, if not accepted qty
|
2012-12-12 16:52:23 +05:30 |
|
Rushabh Mehta
|
4b8f90c5b4
|
permission, user_default fix
|
2012-12-12 16:28:21 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|
Rushabh Mehta
|
74aebf0965
|
added Communication to Selling and refactored module pages a bit
|
2012-12-12 11:03:51 +05:30 |
|
Nabin Hait
|
c52edd1e59
|
production cleanup
|
2012-12-11 18:38:58 +05:30 |
|
Rushabh Mehta
|
38b6af97e5
|
updates to attachment
|
2012-12-11 16:19:14 +05:30 |
|
Rushabh Mehta
|
24a69613e0
|
update file urls
|
2012-12-11 15:58:19 +05:30 |
|
Anand Doshi
|
c3b9a00c53
|
changed old type txt to new type txtt
|
2012-12-11 15:20:53 +05:30 |
|
Anand Doshi
|
c551964d5d
|
Merge branch 'master' into production
Conflicts:
patches/patch_list.py
production/doctype/bom_explosion_item/bom_explosion_item.txt
|
2012-12-11 14:59:19 +05:30 |
|
Anand Doshi
|
36bf910563
|
removed Standard from default print format
|
2012-12-11 14:01:59 +05:30 |
|
Nabin Hait
|
05de088473
|
merge, fixed production cleanup patch
|
2012-12-10 19:28:38 +05:30 |
|
Anand Doshi
|
89e2dd8dbb
|
rename Production --> Manufacturing and delete old patches
|
2012-12-10 19:01:31 +05:30 |
|
Nabin Hait
|
5999944a5c
|
bom cleanup: update cost and flat bom by traversing full tree
|
2012-12-10 18:11:42 +05:30 |
|
Rushabh Mehta
|
af63b16be8
|
f
|
2012-12-10 13:41:10 +05:30 |
|
Rushabh Mehta
|
0db74a7ebd
|
cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification
|
2012-12-07 15:47:32 +05:30 |
|
Nabin Hait
|
9b924ce695
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-07 14:43:40 +05:30 |
|
Nabin Hait
|
2ce027fc9f
|
floating point issue in percentage delivered/billed
|
2012-12-07 14:43:06 +05:30 |
|
Rushabh Mehta
|
571377a313
|
added html to tinymce + moved website/web_cache.py > website/utils.py
|
2012-12-07 11:00:26 +05:30 |
|
Anand Doshi
|
a367bfe059
|
fixes after website refactor
|
2012-12-06 18:26:09 +05:30 |
|
Anand Doshi
|
0e0b2317e1
|
fixes in item after change in website
|
2012-12-06 18:18:58 +05:30 |
|
Rushabh Mehta
|
df0b00a981
|
refactored website
|
2012-12-06 16:15:38 +05:30 |
|
Anand Doshi
|
8e6ab709f5
|
fix in delivery note unhide of adj_rate and ref_rate
|
2012-12-06 11:55:41 +05:30 |
|
Anand Doshi
|
2249d9d858
|
fixes in packing slip - packed qty validation
|
2012-12-05 19:57:27 +05:30 |
|
Anand Doshi
|
0a32ed3219
|
allow changing the uom conversion factor in purchase cycle
|
2012-12-05 16:50:49 +05:30 |
|
Anand Doshi
|
d3b82cf9de
|
fixes in tax controller and test purchase receipt
|
2012-12-04 11:49:37 +05:30 |
|
Nabin Hait
|
ff438b8cee
|
rejected serial no
|
2012-12-03 18:35:17 +05:30 |
|
Nabin Hait
|
1d15c704af
|
rejected serial no fixes
|
2012-12-03 18:14:16 +05:30 |
|
Nabin Hait
|
23aac61bbf
|
removed basic info section
|
2012-12-03 17:27:21 +05:30 |
|
Nabin Hait
|
4c70cd974a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-03 15:58:37 +05:30 |
|
Nabin Hait
|
dd4c679899
|
stock entry incoming rate fixes and batch no get_query
|
2012-12-03 15:57:50 +05:30 |
|
Rushabh Mehta
|
7dd13a45f6
|
chart of account fixes, added delete, rename
|
2012-12-03 14:11:24 +05:30 |
|
Rushabh Mehta
|
833f070991
|
added allow_rename and also fix in autonotification
|
2012-12-03 11:33:08 +05:30 |
|
Rushabh Mehta
|
08a437bad7
|
removed schedule date mandatory from purchase receipt
|
2012-12-03 10:21:52 +05:30 |
|
Anand Doshi
|
9760aebdf9
|
ported test data and test purchase receipt from aii
|
2012-11-30 19:46:11 +05:30 |
|
Anand Doshi
|
9021ef75d1
|
minor fixes
|
2012-11-30 19:45:51 +05:30 |
|
Anand Doshi
|
d8b85073cd
|
removed old tests.py
|
2012-11-30 19:45:39 +05:30 |
|
Anand Doshi
|
ea61d8cf99
|
replaced set
|
2012-11-30 17:18:45 +05:30 |
|
Anand Doshi
|
535fbb1b00
|
replaced get_value
|
2012-11-30 17:16:03 +05:30 |
|
Anand Doshi
|
0fd99e7536
|
removed unnecessary imports
|
2012-11-30 16:38:04 +05:30 |
|
Nabin Hait
|
3e0612db83
|
fixed conflict
|
2012-11-30 15:02:20 +05:30 |
|
Nabin Hait
|
faf251a53e
|
Production cleanup with linking with sales order
|
2012-11-30 14:36:01 +05:30 |
|
Rushabh Mehta
|
35c017a78f
|
cleanup of notification control: now in boot
|
2012-11-30 10:57:28 +05:30 |
|
Anand Doshi
|
88d522aa51
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-11-28 17:14:23 +05:30 |
|
Anand Doshi
|
01bf10b8b6
|
changed default to Monthly in new grid reports
|
2012-11-28 17:12:18 +05:30 |
|
Nabin Hait
|
c4fb30dc8d
|
Removed basic info section
|
2012-11-28 16:49:18 +05:30 |
|
Anand Doshi
|
ca868e42ae
|
added module icons in grid reports
|
2012-11-26 18:47:54 +05:30 |
|
Rushabh Mehta
|
de91a21946
|
commonified naming_series
|
2012-11-26 11:58:22 +05:30 |
|
Rushabh Mehta
|
7d665818b5
|
moved delivered_items_to_be_billed from stock to accounts
|
2012-11-23 17:56:30 +05:30 |
|
Rushabh Mehta
|
78d4b49e62
|
introducing model 3.0, refactored import module
|
2012-11-23 17:53:43 +05:30 |
|
Anand Doshi
|
83350bc946
|
supplier can now be searched using name
|
2012-11-22 17:39:19 +05:30 |
|
Anand Doshi
|
93a35cab19
|
added customer get_query to allow search based on customer name. also don't show name again if id naming is based on customer name and not series
|
2012-11-21 18:02:22 +05:30 |
|
Anand Doshi
|
f26511e466
|
refactored customer and supplier details fetch for sales and purchase return stock entry
|
2012-11-19 13:59:25 +05:30 |
|
Rushabh Mehta
|
dc06be26c6
|
docperm fix for appraisal, removed validation in item
|
2012-11-16 16:52:02 +05:30 |
|
Rushabh Mehta
|
ce4ed265d2
|
fixes to rename_tool, added serial no for rename
|
2012-11-16 14:25:03 +05:30 |
|
Rushabh Mehta
|
188185f3a3
|
help link fixes in lead, opportunity; delete cancelled sles for item
|
2012-11-16 12:39:05 +05:30 |
|
Rushabh Mehta
|
ab55e6b252
|
upgraded tinymce to 3.5.7
|
2012-11-12 19:13:28 +05:30 |
|
Rushabh Mehta
|
fe7b444903
|
reportview, grid_report part of build and separate default dates
|
2012-11-12 15:39:47 +05:30 |
|
Anand Doshi
|
5e1a16c95c
|
fix in stock reconciliation cancel
|
2012-11-09 15:33:57 +05:30 |
|
Anand Doshi
|
63fd4f4e82
|
fixed stock reconciliation cancellation
|
2012-11-09 13:13:38 +05:30 |
|
Anand Doshi
|
396d424ab4
|
fixes in stock reco cancellation
|
2012-11-09 12:09:01 +05:30 |
|
Nabin Hait
|
25b8ce45a6
|
stock ledger report fixed
|
2012-11-06 10:39:51 +05:30 |
|
Nabin Hait
|
39cfc5865e
|
reorder level fixes
|
2012-10-30 12:54:13 +05:30 |
|
Nabin Hait
|
03d957027c
|
reorder level fixes
|
2012-10-30 12:43:04 +05:30 |
|
Nabin Hait
|
d921e4db52
|
removed serial no vs bin qty validation
|
2012-10-29 17:17:28 +05:30 |
|
Anand Doshi
|
548eb7b1c3
|
change project get_query to include projects with status other than Completed and Cancelled
|
2012-10-29 14:26:38 +05:30 |
|
Nabin Hait
|
44dacca0ff
|
Valuation Method restored
|
2012-10-26 16:44:39 +05:30 |
|
Nabin Hait
|
ca77c6b0b7
|
warehouse merged message
|
2012-10-26 14:55:14 +05:30 |
|
Nabin Hait
|
981d48339a
|
Warehouse merging feature and update_bin cleanup
|
2012-10-26 14:42:48 +05:30 |
|
Anand Doshi
|
b77ee2f3a7
|
fixes in stock ageing report
|
2012-10-17 11:09:13 +05:30 |
|
Nabin Hait
|
6425542d8f
|
field toggle enabled if stock ledger entry exists
|
2012-10-16 12:28:30 +05:30 |
|
Anand Doshi
|
1aace542c9
|
removed import error bypass and added missing py files for each doctype
|
2012-10-10 14:26:23 +05:30 |
|
Anand Doshi
|
a49475dc72
|
fixes in grid reports
|
2012-10-05 20:33:47 +05:30 |
|
Anand Doshi
|
727643210c
|
fixes in stock reconciliation and price list csv reading
|
2012-10-05 11:38:06 +05:30 |
|
Anand Doshi
|
cdba51c5a9
|
added page permissions, modified report listing links
|
2012-10-04 18:11:29 +05:30 |
|
Rushabh Mehta
|
e7ccc317de
|
dynamic loading for reports
|
2012-10-04 09:57:01 +05:30 |
|
Nabin Hait
|
9462ce9aef
|
Taxes and charges category issue fixed
|
2012-10-03 11:54:06 +05:30 |
|
Anand Doshi
|
05aaae33ae
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
accounts/doctype/account/account.py
erpnext/accounts/doctype/journal_voucher/journal_voucher.py
patches/patch_list.py
startup/event_handlers.py
|
2012-10-02 14:35:20 +05:30 |
|
Anand Doshi
|
3245a15cb7
|
added future imports
|
2012-10-01 11:35:49 +05:30 |
|
Anand Doshi
|
fdbc730821
|
merged deprecate account balance
|
2012-10-01 11:30:00 +05:30 |
|
Anand Doshi
|
8bde7cb8db
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
|
2012-09-28 12:36:22 +05:30 |
|
Anand Doshi
|
3c4238fc9c
|
Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
public/js/all-app.js
public/js/all-web.js
|
2012-09-26 12:24:28 +05:30 |
|
Rushabh Mehta
|
7c454b3039
|
dont save duplicate files
|
2012-09-25 18:20:36 +05:30 |
|
Rushabh Mehta
|
0152b12e75
|
__session_cache removed and introducted memcache for caching
|
2012-09-25 14:22:23 +05:30 |
|
Rushabh Mehta
|
707932da0c
|
updated paths
|
2012-09-25 10:42:00 +05:30 |
|
Rushabh Mehta
|
2fa2f7178d
|
moved directory structure
|
2012-09-24 19:13:42 +05:30 |
|
Rushabh Mehta
|
66ac2b018a
|
first cut for lazy loading framework
|
2011-09-05 18:43:09 +05:30 |
|
Brahma K
|
83e783dcd4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-31 15:47:21 +05:30 |
|
Nabin Hait
|
30174d27dc
|
sent bin qty vs serial no mail only if admin_email_notification
|
2011-08-31 15:03:01 +05:30 |
|
Brahma K
|
3c9a6a19e8
|
Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut
|
2011-08-31 12:55:41 +05:30 |
|
Nabin Hait
|
8e0f15a8b1
|
fixed repost function in warehouse
|
2011-08-29 13:17:19 +05:30 |
|
Nabin Hait
|
1d5cab8745
|
is_cancelled always no in sle if voucher type = serial no
|
2011-08-29 13:16:52 +05:30 |
|
Nabin Hait
|
982763cbfa
|
set is_cancelled=no when serial no deleted
|
2011-08-26 18:53:27 +05:30 |
|
Nabin Hait
|
2c03015537
|
same from and to flds deleted from mapper
|
2011-08-25 19:41:24 +05:30 |
|
Brahma K
|
82187cefe8
|
Delivery Note added with Packing Details
1. Pack No
2. Pack Nett Wt
3. Pack Gross Wt
4. Pack Weight UOM
Item is added with
1. Customer, Code Table
2. Nett Weight
3. Gross Weight
4. Weight UOM
5. customer_code (for search in quotes etc)
Quotation is added with
1. item search displays customer code
|
2011-08-23 15:42:34 +05:30 |
|
Brahma K
|
c77a54ee40
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-23 12:13:24 +05:30 |
|
Nabin Hait
|
7a39c67858
|
Merge pull request #47 from nabinhait/master
hotpatch: serial no/bin qty integrity
|
2011-08-22 02:13:27 -07:00 |
|
Nabin Hait
|
fbe3f18d24
|
Check serial no/bin qty integrity only if actual_qty > 0
|
2011-08-22 14:41:28 +05:30 |
|
Nabin Hait
|
9537446aa6
|
Permission given to material user for production material issue and back flush
|
2011-08-22 14:40:11 +05:30 |
|
Brahma K
|
44e719cced
|
Pulled and merged from master
|
2011-08-22 12:27:26 +05:30 |
|
Brahma K
|
28a7b2800f
|
Delivery Note changes 1.Net Wt, Gross Wt at packing slip level
|
2011-08-22 12:23:53 +05:30 |
|
Nabin Hait
|
291b426990
|
Merge pull request #46 from nabinhait/master
check actual qty with total number of serial no in store
|
2011-08-18 01:57:22 -07:00 |
|
Nabin Hait
|
41743524a3
|
validate wh for serial no only in submit
|
2011-08-18 14:26:27 +05:30 |
|
Nabin Hait
|
821fe55c52
|
check fn actual qty with total number of serial no in store
|
2011-08-18 14:25:10 +05:30 |
|
Nabin Hait
|
a891bd445b
|
Merge pull request #45 from nabinhait/master
Serial No Issues
|
2011-08-18 00:25:00 -07:00 |
|
Nabin Hait
|
5fb2b70136
|
Fixed MTN and Sales Return cancellation issue related to serial no
|
2011-08-18 12:51:39 +05:30 |
|
Nabin Hait
|
94d158852a
|
Fixed MTN and Sales Return cancellation issue related to serial no
|
2011-08-18 12:50:46 +05:30 |
|
Nabin Hait
|
b1196bcd22
|
Make stock ledger entry only on first time saving
|
2011-08-18 12:49:21 +05:30 |
|
Nabin Hait
|
1ca982055b
|
Made some fields read only after saving
|
2011-08-18 12:48:09 +05:30 |
|
Nabin Hait
|
d075a6c53d
|
Removed cstr in return for get_server_fields()
|
2011-08-17 10:50:57 +05:30 |
|
Brahma K
|
fce442ebca
|
1. Patches ":" missing bug
2. Purchase Receipt ".get_bin_details(arg)f" is changed to ".get_bin_details(arg)"
|
2011-08-16 14:48:46 +05:30 |
|
Brahma K
|
8703734087
|
Development is merged into Master
|
2011-08-16 14:33:32 +05:30 |
|
Brahma K
|
b77bfdb990
|
BOM Related changes (1.Unset as Default BOM, 2.Flat BOM Repair 3.delete_doc issue)
|
2011-08-16 12:10:51 +05:30 |
|
Rushabh Mehta
|
89717292b7
|
fixed get_server_values to make them utf-8 friendly
|
2011-08-12 10:55:43 +05:30 |
|
Nabin Hait
|
76980b0e55
|
update billed_amt, per billed and billing status based on amount
|
2011-08-10 16:35:25 +05:30 |
|
Nabin Hait
|
bff6e2873d
|
removed uncompleted testcase for delivery note
|
2011-08-05 11:17:40 +05:30 |
|
Nabin Hait
|
a819f6f8ab
|
rename function added in item
|
2011-08-05 11:09:25 +05:30 |
|
Nabin Hait
|
4a2f8c8179
|
serial no removed from mandatory
|
2011-08-05 11:07:45 +05:30 |
|
Nabin Hait
|
587ac5c941
|
fixed conflict
|
2011-07-26 15:46:10 +05:30 |
|
nabinhait
|
1458af0691
|
Index patch released and doctype updated based on index
|
2011-07-20 10:31:19 +05:30 |
|
Ravi Dey
|
6c174a6e35
|
company default currency fix
|
2011-07-11 16:40:49 +05:30 |
|
Nabin Hait
|
e079a6eb26
|
reload stock entry
|
2011-07-10 14:15:52 +05:30 |
|
Nabin Hait
|
1cb786b123
|
fixed order fn calling in stock entry
|
2011-07-10 13:55:38 +05:30 |
|
Nabin Hait
|
2acac4b9d2
|
function name corrected in stock entry 'get current stock' button
|
2011-07-10 13:52:05 +05:30 |
|
Nabin Hait
|
12b58ec5cc
|
make sensitive fields read only in item master if sle exists
|
2011-07-10 12:48:13 +05:30 |
|
nabinhait
|
5deab24401
|
fixed conflict while merging with webnotes repo
|
2011-07-06 09:23:02 +05:30 |
|
nabinhait
|
7f339e0a6d
|
removed landed cost wizard link
|
2011-07-05 15:43:17 +05:30 |
|
nabinhait
|
1bd56b1c08
|
removed get_tips() from js file
|
2011-07-05 14:41:36 +05:30 |
|
nabinhait
|
c297df5b16
|
Removed Tips Common from each js file
|
2011-07-05 10:54:05 +05:30 |
|
nabinhait
|
b0c3bfc454
|
delete mapper b4 doctype
|
2011-07-04 12:18:24 +05:30 |
|