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
|
a1e8e07fde
|
added number format to global defaults
|
2013-01-21 16:39:24 +05:30 |
|
Rushabh Mehta
|
9700bafbdb
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-21 16:29:05 +05:30 |
|
Rushabh Mehta
|
4e03ce2107
|
added number formatter
|
2013-01-21 16:28:37 +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 |
|
Nabin Hait
|
30b142b563
|
removed unwanted import
|
2013-01-21 14:12:36 +05:30 |
|
Nabin Hait
|
ec44cd763e
|
in payment matching tool only show outstanding invoices
|
2013-01-21 12:29:20 +05:30 |
|
Nabin Hait
|
8f4c78c4bf
|
in payment matching tool only show outstanding invoices
|
2013-01-21 11:57:03 +05:30 |
|
Rushabh Mehta
|
1a6220a332
|
Merge branch 'master' into edge
|
2013-01-21 10:33:22 +05:30 |
|
Rushabh Mehta
|
d9cfee58a1
|
added patch
|
2013-01-21 10:32:49 +05:30 |
|
Rushabh Mehta
|
4ef3a28450
|
journal voucher difference fix
|
2013-01-21 10:32:28 +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 |
|
Rushabh Mehta
|
3ab6c5fca9
|
appraisal, don't validate points for self-appraisal
|
2013-01-19 10:54:03 +05:30 |
|
Nabin Hait
|
f2223102e2
|
removed supplier account field from jv
|
2013-01-18 17:45:24 +05:30 |
|
Nabin Hait
|
1022198cc8
|
fixes in purchase price list
|
2013-01-18 16:47:39 +05:30 |
|
Nabin Hait
|
396f47d029
|
fixes in purchase price list
|
2013-01-18 16:29:30 +05:30 |
|
Nabin Hait
|
5b66f9592b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-18 16:05:45 +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 |
|
Anand Doshi
|
2dab2862a0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-18 15:59:33 +05:30 |
|
Anand Doshi
|
9985699247
|
add to holiday list sorted by idx
|
2013-01-18 15:57:13 +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 |
|
Nabin Hait
|
b9b1e67c7d
|
made c-form submittable
|
2013-01-18 12:58:21 +05:30 |
|
Anand Doshi
|
2865571cb9
|
Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
patches/patch_list.py
|
2013-01-18 12:32:00 +05:30 |
|
Nabin Hait
|
dc84d410bc
|
fixes in employee master
|
2013-01-18 11:39:24 +05:30 |
|
Nabin Hait
|
a642ae14eb
|
updated gl mapper for tds entry
|
2013-01-18 10:49:39 +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 |
|
Nabin Hait
|
16546d25e7
|
gl control cleanup[
|
2013-01-17 18:43:54 +05:30 |
|
Nabin Hait
|
274de5462b
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-01-17 18:27:20 +05:30 |
|
Nabin Hait
|
1efaf841c4
|
payment reconciliation fixes
|
2013-01-17 18:26:58 +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
|
a81010a5b3
|
removed debug mode
|
2013-01-17 17:25:55 +05:30 |
|
Nabin Hait
|
144ba186d3
|
fixes in c-form
|
2013-01-17 17:21:29 +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
|
80c681294c
|
fixes in website page naming
|
2013-01-17 13:24:51 +05:30 |
|
Nabin Hait
|
feee252093
|
fixes in website page_name for item
|
2013-01-17 13:03:30 +05:30 |
|
Nabin Hait
|
35b6d94c06
|
automatic purchase request from production planning tool
|
2013-01-17 12:31:09 +05:30 |
|