Nabin Hait
|
5c6d13a0df
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:18:16 +05:30 |
|
Nabin Hait
|
719f2803b3
|
Fixed conflict while merging with develop branch
|
2014-01-20 17:01:28 +05:30 |
|
Nabin Hait
|
dc15b4fa8a
|
Fixed conflict while merging with develop brnach
|
2014-01-20 16:48:49 +05:30 |
|
Akhilesh Darjee
|
529709e08b
|
patch for enabling all price list
|
2014-01-20 16:39:03 +05:30 |
|
Akhilesh Darjee
|
e82eee512b
|
Enabled feature in Price List
|
2014-01-20 16:09:45 +05:30 |
|
Nabin Hait
|
ee0c623760
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-20 10:57:12 +05:30 |
|
Nabin Hait
|
dbb4955483
|
Merge pull request #1332 from akhileshdarjee/hotfix
decimal places fix in item prices report
|
2014-01-17 20:18:30 -08:00 |
|
Akhilesh Darjee
|
ed87335513
|
decimal places fix in item prices report
|
2014-01-17 18:57:21 +05:30 |
|
Akhilesh Darjee
|
8a4111fe0e
|
decimal places fixed in item prices report
|
2014-01-17 18:50:44 +05:30 |
|
Pratik Vyas
|
4bfa8d560b
|
Merge branch 'develop'
|
2014-01-17 16:56:31 +05:30 |
|
Pratik Vyas
|
96db41d996
|
bumped to version 3.6.3
|
2014-01-17 17:26:31 +06:00 |
|
Nabin Hait
|
9a74330d6f
|
Merge pull request #1330 from pdvyas/fix-mysql-installer
remove mysql-python pinning to 1.2.4
|
2014-01-17 02:37:25 -08:00 |
|
Nabin Hait
|
1951baca57
|
Merge pull request #1319 from pdvyas/about-version
update about erpnext with version number
|
2014-01-17 02:36:11 -08:00 |
|
Pratik Vyas
|
da08124df2
|
remove mysql-python pinning to 1.2.4
|
2014-01-17 15:27:19 +05:30 |
|
Nabin Hait
|
2aecc5a717
|
Merge pull request #1329 from nabinhait/hotfix
Patch for updating billing status for old zero value order
|
2014-01-17 01:41:40 -08:00 |
|
Nabin Hait
|
a37ffe162b
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-17 12:05:06 +05:30 |
|
Nabin Hait
|
bc99c9d6e0
|
Priority to user's deafult price list over customer's default price list
|
2014-01-17 12:04:24 +05:30 |
|
Nabin Hait
|
f32314dd0b
|
Do not set income/expense account automatically in company master
|
2014-01-17 11:53:25 +05:30 |
|
Nabin Hait
|
7e73f35916
|
Merge pull request #1327 from akhileshdarjee/hotfix
Allow renaming of campaign
|
2014-01-16 21:48:10 -08:00 |
|
Akhilesh Darjee
|
e1e63a91d6
|
Allow renaming of campaign
|
2014-01-17 11:12:20 +05:30 |
|
Nabin Hait
|
9a05aad8ea
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-17 10:31:43 +05:30 |
|
Nabin Hait
|
f6b77479d7
|
Patch: Update billing status for zero value order
|
2014-01-16 18:18:49 +05:30 |
|
Pratik Vyas
|
3c279163fc
|
Merge branch 'develop'
|
2014-01-16 16:29:22 +05:30 |
|
Pratik Vyas
|
6933617538
|
bumped to version 3.6.2
|
2014-01-16 16:59:22 +06:00 |
|
Nabin Hait
|
2648661757
|
Merge pull request #1326 from nabinhait/hotfix
Calculate taxes and charges total in server side
|
2014-01-16 01:28:33 -08:00 |
|
Nabin Hait
|
e31a97f355
|
Calculate taxes and charges total in server side
|
2014-01-16 14:24:32 +05:30 |
|
Nabin Hait
|
6bdb73c392
|
Merge pull request #1324 from nabinhait/hotfix
Minor Fix
|
2014-01-15 22:44:25 -08:00 |
|
Nabin Hait
|
deda7e2c75
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-16 12:08:36 +05:30 |
|
Nabin Hait
|
5cdb8cea13
|
Reset filters in Item Price report on each route
|
2014-01-16 12:08:12 +05:30 |
|
Nabin Hait
|
90a8c9e636
|
Merge pull request #1323 from nabinhait/hotfix
Billing status for zero value SO/PO
|
2014-01-15 05:20:51 -08:00 |
|
Nabin Hait
|
c0c951b6a9
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-15 17:36:34 +05:30 |
|
Nabin Hait
|
39eb7faeb9
|
Update billing percentage and status from SI/PI in SO/PO, when net total is zero
|
2014-01-15 17:36:18 +05:30 |
|
Nabin Hait
|
4829ad3eb8
|
Merge pull request #1321 from akhileshdarjee/hotfix
Hide fields fix
|
2014-01-15 03:17:23 -08:00 |
|
Akhilesh Darjee
|
a682d45846
|
webnotes/erpnext # 1320 - hide fields fix
|
2014-01-15 16:39:01 +05:30 |
|
Pratik Vyas
|
76dd468f0e
|
update about erpnext with version number
|
2014-01-15 14:23:38 +05:30 |
|
Nabin Hait
|
a6df26839d
|
Higher priority to user's default price list over customer's default price list
|
2014-01-15 12:21:14 +05:30 |
|
Akhilesh Darjee
|
2a79b00700
|
minor fix
|
2014-01-15 11:54:05 +05:30 |
|
Akhilesh Darjee
|
6a749e3a8e
|
removed while loop
|
2014-01-15 11:43:47 +05:30 |
|
Nabin Hait
|
c5d4fc38aa
|
Fixes in monthly salary register
|
2014-01-15 10:54:07 +05:30 |
|
Pratik Vyas
|
02f7e83bd1
|
Merge branch 'develop'
|
2014-01-14 18:49:14 +05:30 |
|
Pratik Vyas
|
f55d9414cd
|
bumped to version 3.6.1
|
2014-01-14 19:19:14 +06:00 |
|
Nabin Hait
|
5644ed37a4
|
Merge pull request #1316 from nabinhait/hotfix
rounding and divisional loss
|
2014-01-14 05:05:33 -08:00 |
|
Nabin Hait
|
ee6200576a
|
Highest priority to user properties while fetching warehouse from item
|
2014-01-14 18:34:10 +05:30 |
|
Nabin Hait
|
eeb8ba18cd
|
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
|
2014-01-14 17:44:47 +05:30 |
|
Nabin Hait
|
3a19370892
|
Rounding issue and divisional loss adjustment
|
2014-01-14 17:44:34 +05:30 |
|
Nabin Hait
|
6dc1ba6f7f
|
Merge pull request #1314 from nabinhait/hotfix
comment fix
|
2014-01-14 02:29:39 -08:00 |
|
Nabin Hait
|
d91af2853e
|
Allowed import for customer issue
|
2014-01-14 15:56:52 +05:30 |
|
Nabin Hait
|
d23ae108ae
|
Fixes in Comment, if comment by not mentioned, consider owner
|
2014-01-14 15:52:09 +05:30 |
|
Anand Doshi
|
b9b6a6cea5
|
Moved webnotes scheduler event hooks
|
2014-01-13 21:22:23 +05:30 |
|
Pratik Vyas
|
72f8ae2d5a
|
Merge branch 'develop'
|
2014-01-13 18:37:07 +05:30 |
|