Nabin Hait
|
52f7b6daf8
|
[report] purchase in transit in new style
|
2013-05-06 12:24:27 +05:30 |
|
Anand Doshi
|
0f5f584651
|
[stock entry] [test] fixes in test cases
|
2013-05-03 14:34:12 +05:30 |
|
Anand Doshi
|
9d504e4706
|
Merge branch 'price_list_country'
Conflicts:
home/page/latest_updates/latest_updates.js
setup/doctype/price_list/price_list.txt
|
2013-05-02 16:25:46 +05:30 |
|
Rushabh Mehta
|
f5f478ee78
|
[item] [naming] by series or code / [naming series] optionally set number of digits
|
2013-05-02 15:36:33 +05:30 |
|
Rushabh Mehta
|
88f6acdbe4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 14:47:10 +05:30 |
|
Rushabh Mehta
|
3487e0a0f3
|
[price list] added currency property, validates currency, duplication in Item Price
|
2013-05-02 14:46:12 +05:30 |
|
Rushabh Mehta
|
c711598940
|
[doclist] new pattern / [item] pricelist must be unique / [formatter] show null floats as empty string
|
2013-05-02 14:22:40 +05:30 |
|
Nabin Hait
|
f2edbbd5cb
|
[serial no][validation] status delivered -> in store, allowed for material receipt
|
2013-05-02 11:49:02 +05:30 |
|
Nabin Hait
|
02bc8bfe7e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 11:39:43 +05:30 |
|
Rushabh Mehta
|
ecb36f2cb0
|
[purchase] [validation] validate warehouse belongs to company if set
|
2013-05-02 11:34:37 +05:30 |
|
Nabin Hait
|
81bbfba0cc
|
[hr] allowed rename in earning and deduction type
|
2013-05-02 11:27:25 +05:30 |
|
Anand Doshi
|
91e4c14470
|
[fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal
|
2013-05-01 12:00:44 +05:30 |
|
Anand Doshi
|
d7ad13a8a7
|
[price list] [country] specify country for a price list
|
2013-04-29 19:38:34 +05:30 |
|
Nabin Hait
|
7ee7eae3ae
|
[item][validation] some validation only after saving
|
2013-04-29 15:10:39 +05:30 |
|
Nabin Hait
|
7597330cb6
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-29 11:46:42 +05:30 |
|
Nabin Hait
|
e81b0e2d66
|
[stock ageing][fixes] for serialized items
|
2013-04-29 11:45:22 +05:30 |
|
Anand Doshi
|
c9897ff533
|
Merge branch 'edge'
Conflicts:
home/page/latest_updates/latest_updates.js
|
2013-04-29 10:42:21 +05:30 |
|
Nabin Hait
|
04c1f94b4e
|
[DN][usability] copy cost center in each row
|
2013-04-26 16:27:51 +05:30 |
|
Anand Doshi
|
a536eef393
|
Merge branch 'master' into edge
|
2013-04-23 13:10:55 +05:30 |
|
Nabin Hait
|
0a480f4efd
|
fixes in item: organized code
|
2013-04-23 12:54:07 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Nabin Hait
|
81c6a3beef
|
stock uom mandatory for item
|
2013-04-23 11:39:54 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Anand Doshi
|
90c9ae713c
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
stock/doctype/delivery_note_item/delivery_note_item.txt
|
2013-04-17 18:04:08 +05:30 |
|
Anand Doshi
|
5717fe3aba
|
[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation
|
2013-04-17 18:02:52 +05:30 |
|
Nabin Hait
|
47ef15b04b
|
removed errprint
|
2013-04-17 17:35:14 +05:30 |
|
Nabin Hait
|
bd7c8d89f2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-04-17 17:22:23 +05:30 |
|
Nabin Hait
|
9a2dff6675
|
packing slip refactored
|
2013-04-17 17:21:31 +05:30 |
|
Anand Doshi
|
2b349d38d9
|
Merge branch 'master' into edge
|
2013-04-17 15:10:47 +05:30 |
|
Anand Doshi
|
96dae29144
|
[item] [fixes] don't validate for active boms for new items
|
2013-04-17 13:39:55 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Nabin Hait
|
1ef27296f4
|
fixes in packing slip
|
2013-04-16 12:29:27 +05:30 |
|
Anand Doshi
|
3b2fd6e334
|
[sql] [fix] fixed item.py injections
|
2013-04-13 15:54:38 +05:30 |
|
Nabin Hait
|
1bcd551db2
|
fixes in item
|
2013-04-12 16:51:07 +05:30 |
|
Anand Doshi
|
36ecbbd9e8
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-04-12 15:41:31 +05:30 |
|
Nabin Hait
|
bab018b759
|
fixes in item
|
2013-04-11 16:36:26 +05:30 |
|
Nabin Hait
|
d246de8417
|
[fixes][account][packing slip]
|
2013-04-11 15:31:41 +05:30 |
|
Anand Doshi
|
93b638af4d
|
Merge branch 'master' into edge
Conflicts:
patches/patch_list.py
|
2013-04-10 19:47:46 +05:30 |
|
Anand Doshi
|
cad5c3414f
|
[serial no] [fix] removed transaction date passed for creating stock ledger entry
|
2013-04-10 15:28:42 +05:30 |
|
Rushabh Mehta
|
0c1611219e
|
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
|
2013-04-10 13:54:13 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Nabin Hait
|
a477d41843
|
[aii] some fixes
|
2013-04-08 12:39:11 +05:30 |
|
Nabin Hait
|
b72af39331
|
fixes in packing slip
|
2013-04-06 08:20:35 +05:30 |
|
Nabin Hait
|
5d4758b3e6
|
[validation] fixes in item
|
2013-04-06 08:20:21 +05:30 |
|
Nabin Hait
|
38e6326677
|
[Item][Validation] if sle exists, soem fields can not be changed
|
2013-04-05 14:47:42 +05:30 |
|
Nabin Hait
|
1a738f72f4
|
match condition added in daily time log summary report
|
2013-04-04 16:34:51 +05:30 |
|
Nabin Hait
|
a8d8abc670
|
small fixes in item
|
2013-04-04 15:31:03 +05:30 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Anand Doshi
|
0b9ec8cbc1
|
[auto inventory accounting] [fix] if non stock item, dont create gl entry in delivery note and pos sales invoice
|
2013-04-03 13:45:28 +05:30 |
|
Rushabh Mehta
|
5bbe063222
|
Merge branch 'master' into edge
|
2013-04-03 10:42:12 +05:30 |
|
Nabin Hait
|
ff3106c7d4
|
[stock reco] improved validation message
|
2013-04-02 17:44:50 +05:30 |
|
Rushabh Mehta
|
5c12765313
|
[merge]
|
2013-04-02 10:51:11 +05:30 |
|
Rushabh Mehta
|
9db1a68d89
|
[website] [cleanup] moved website generic utils to framework
|
2013-04-02 10:41:37 +05:30 |
|
Anand Doshi
|
4b6052b57b
|
[stock] [fix] serial nos scrub method
|
2013-04-01 18:52:47 +05:30 |
|
Nabin Hait
|
94d1622691
|
[patch][serial no] for striped serial nos
|
2013-04-01 17:25:28 +05:30 |
|
Nabin Hait
|
2f20a7ac96
|
[patch][serial no] for striped serial nos
|
2013-04-01 17:23:43 +05:30 |
|
Nabin Hait
|
d270559fa9
|
minor fixes in stock entry
|
2013-03-30 17:48:37 +05:30 |
|
Nabin Hait
|
dc35137e20
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-30 17:47:56 +05:30 |
|
Anand Doshi
|
19acce9fa1
|
[aii] [patches] minor fixes
|
2013-03-29 20:40:23 +05:30 |
|
Anand Doshi
|
96a5f1dda0
|
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
|
2013-03-29 19:44:52 +05:30 |
|
Nabin Hait
|
86f1ca2d00
|
aii: fixes in stock reconciliation
|
2013-03-29 18:20:10 +05:30 |
|
Anand Doshi
|
82433e81c6
|
Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release
|
2013-03-29 16:47:56 +05:30 |
|
Nabin Hait
|
787c02ee42
|
aii fixes
|
2013-03-29 16:42:33 +05:30 |
|
Nabin Hait
|
acecb94a0f
|
patch: update item tax rate in json format
|
2013-03-29 10:48:41 +05:30 |
|
Anand Doshi
|
7bfa40fdd3
|
sales return validate before save/submit
|
2013-03-28 18:48:04 +05:30 |
|
Anand Doshi
|
24e0a3bb34
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-28 16:41:02 +05:30 |
|
Anand Doshi
|
8c45420f19
|
fixes in gross profit report
|
2013-03-28 16:40:30 +05:30 |
|
Rushabh Mehta
|
2fe802c81e
|
[website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..)
|
2013-03-28 16:26:11 +05:30 |
|
Nabin Hait
|
41fe3567bb
|
fixed conflict and aii check in global defaults
|
2013-03-28 15:54:11 +05:30 |
|
Anand Doshi
|
96b189c118
|
fixes in test cases and buying amount function
|
2013-03-26 18:43:10 +05:30 |
|
Nabin Hait
|
495db08104
|
copy expense account to all row if entered in one
|
2013-03-26 15:24:56 +05:30 |
|
Anand Doshi
|
ea4b05bb2c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 14:49:48 +05:30 |
|
Anand Doshi
|
40dc9e83a5
|
fixes in test cases and added fiscal year field to stock reco
|
2013-03-26 14:49:25 +05:30 |
|
Nabin Hait
|
86f5e2e564
|
aii: gl entries for serial no
|
2013-03-26 14:27:20 +05:30 |
|
Rushabh Mehta
|
06e3ef055b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-26 12:47:51 +05:30 |
|
Rushabh Mehta
|
4731fb999c
|
[feature] [fix] utilities/rename tool upgraded to upload multiple items
|
2013-03-26 12:47:19 +05:30 |
|
Anand Doshi
|
acec0227c5
|
fixes in stock entry
|
2013-03-26 12:33:43 +05:30 |
|
Anand Doshi
|
fc33ef6bfb
|
fixes in purchase invoice
|
2013-03-26 12:13:14 +05:30 |
|
Nabin Hait
|
82be7dc301
|
fixed conflict
|
2013-03-25 18:30:15 +05:30 |
|
Nabin Hait
|
557d858d89
|
aii: patches and default values fetching
|
2013-03-25 18:28:16 +05:30 |
|
Rushabh Mehta
|
06d186ba98
|
[stock] [feature] added project to stock ledger entry and updated stock balance report
|
2013-03-25 17:03:52 +05:30 |
|
Rushabh Mehta
|
c5570c6341
|
added warehouse company validation, if warehouse is added to company
|
2013-03-25 15:21:24 +05:30 |
|
Nabin Hait
|
690fefe9c1
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-25 11:07:38 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Anand Doshi
|
ceba917e86
|
Merge branch 'master' into edge
|
2013-03-22 14:16:53 +05:30 |
|
Anand Doshi
|
a47ac1bed0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-22 13:32:11 +05:30 |
|
Nabin Hait
|
9d3f0405b7
|
fixes in packing slip
|
2013-03-22 12:02:48 +05:30 |
|
Anand Doshi
|
8c5844e3fb
|
show sales invoice data in gross profit report
|
2013-03-21 20:24:10 +05:30 |
|
Anand Doshi
|
6d8d3b4cee
|
fixes in gross profit report
|
2013-03-21 18:45:02 +05:30 |
|
Nabin Hait
|
4c56220089
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-03-21 18:37:48 +05:30 |
|
Nabin Hait
|
a0e7c1539b
|
aii: book expense in delivery note instead of sales invoice
|
2013-03-21 18:37:06 +05:30 |
|
Rushabh Mehta
|
af578d73ef
|
merge
|
2013-03-21 17:40:08 +05:30 |
|
Anand Doshi
|
162a081a9f
|
unchecked Not In Create in item customer detail and item price
|
2013-03-21 17:30:22 +05:30 |
|
Rushabh Mehta
|
bed19ac4d3
|
added website pages for orders, tickets and added sales invoice print format
|
2013-03-21 17:12:25 +05:30 |
|
Nabin Hait
|
364f08a171
|
fixed conflict
|
2013-03-19 18:29:05 +05:30 |
|
Nabin Hait
|
80abad2ee0
|
aii: default account from company
|
2013-03-19 18:18:52 +05:30 |
|
Anand Doshi
|
a2b3eb17e3
|
fix in depends on of stock entry
|
2013-03-19 17:48:50 +05:30 |
|
Anand Doshi
|
9a20cc5cd8
|
Merge branch 'sales_purchase_return'
|
2013-03-19 16:23:11 +05:30 |
|
Anand Doshi
|
3e967ab9b6
|
hide Reference section break when using Sales or Purchase Return
|
2013-03-19 16:22:22 +05:30 |
|