Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Rushabh Mehta
|
6e252d64aa
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-16 10:04:45 +05:30 |
|
Nabin Hait
|
f32a4643e5
|
[fix] [minor] reload shopping_cart_price_list
|
2013-08-15 14:39:12 +05:30 |
|
Nabin Hait
|
3ead4a6e08
|
[fix] [minor] reload event on birthday patch
|
2013-08-15 14:30:46 +05:30 |
|
Anand Doshi
|
894341be72
|
[fix] [minor] price list rename patch
|
2013-08-14 19:24:36 +05:30 |
|
Rushabh Mehta
|
170be3b717
|
[minor] merge master
|
2013-08-14 18:41:42 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Anand Doshi
|
0b6fa018d6
|
[fix] [minor] create birthday event only for active employees, else delete it
|
2013-08-14 10:54:16 +05:30 |
|
Anand Doshi
|
05a340e764
|
[fix] [minor] fixes after merging akhilesh's changes
|
2013-08-12 20:01:55 +05:30 |
|
Anand Doshi
|
9e59aff54e
|
Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
accounts/doctype/pos_setting/pos_setting.txt
patches/patch_list.py
|
2013-08-12 20:00:33 +05:30 |
|
Anand Doshi
|
f066f7166b
|
[minor] [fix] [patch] rename price list
|
2013-08-12 12:29:36 +05:30 |
|
Nabin Hait
|
4af2dbf84d
|
[perpetual accounting] [minor] patch for intial setup
|
2013-08-12 12:24:08 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Rushabh Mehta
|
0b9954059c
|
[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)
|
2013-08-09 15:30:11 +05:30 |
|
Akhilesh Darjee
|
44b2e23eba
|
[fix] pos settings - replace customer account with customer
|
2013-08-09 12:43:57 +05:30 |
|
Nabin Hait
|
8daa702a90
|
Merge branch 'master' into perpetual
|
2013-08-07 12:46:50 +05:30 |
|
Anand Doshi
|
5e4e5d78df
|
[minor] [fix] bring back onload_post_render in transaction.js - ref: a9b1c09166
|
2013-08-06 17:23:44 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Nabin Hait
|
939b1523e9
|
[patch] perpetual accounting patch
|
2013-08-06 15:55:44 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
e79d57ca19
|
[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285
|
2013-08-02 19:31:41 +05:30 |
|