Sagar Vora
|
7a1c40c7c1
|
Merge branch 'master' into develop
|
2019-01-30 20:09:45 +05:30 |
|
Sagar Vora
|
664e21acbf
|
bumped to version 11.1.2
|
2019-01-30 20:29:45 +05:50 |
|
Saurabh
|
a342138625
|
Merge branch 'master' into develop
|
2019-01-30 12:38:58 +05:30 |
|
Saurabh
|
bb2031941e
|
bumped to version 11.1.1
|
2019-01-30 13:08:00 +06:00 |
|
Sagar Vora
|
1c44a6a0ba
|
fix: set version to 11.1.0, remove staging_version
|
2019-01-29 18:52:50 +05:30 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Sagar Vora
|
f3cfad7595
|
Merge branch 'master' into staging-fixes
|
2019-01-29 17:20:46 +05:30 |
|
Sagar Vora
|
b32d9458b5
|
bumped to version 10.1.81
|
2019-01-29 17:30:19 +05:50 |
|
Frappe Bot
|
e415cce1a9
|
Merge branch 'staging' into develop
|
2019-01-23 08:19:00 +00:00 |
|
Frappe Bot
|
34121bc81a
|
Merge branch 'master' into staging-fixes
|
2019-01-23 08:08:55 +00:00 |
|
Frappe Bot
|
342854f6f2
|
bumped to version 10.1.80
|
2019-01-23 08:08:53 +00:00 |
|
Sagar Vora
|
c4bda9fac3
|
Merge branch 'staging' into develop
|
2019-01-22 18:17:09 +05:30 |
|
Sagar Vora
|
c84e3fe21b
|
Merge branch 'master' into staging-fixes
|
2019-01-22 18:16:13 +05:30 |
|
Sagar Vora
|
2a9a867f05
|
bumped to version 10.1.79
|
2019-01-22 18:35:44 +05:50 |
|
Sagar Vora
|
4d1a9b10ed
|
Merge branch 'staging' into develop
|
2019-01-22 15:56:39 +05:30 |
|
Sagar Vora
|
ceacacc320
|
Merge branch 'master' into staging-fixes
|
2019-01-22 15:37:05 +05:30 |
|
Sagar Vora
|
1e61dd024b
|
bumped to version 10.1.78
|
2019-01-22 15:53:48 +05:50 |
|
Nabin Hait
|
bef2c22d23
|
Fix: merge conflict
|
2019-01-18 10:15:47 +05:30 |
|
Saurabh
|
7d630b3e29
|
Merge branch 'master' into staging-fixes
|
2019-01-15 19:41:09 +05:30 |
|
Saurabh
|
529cc1ca51
|
bumped to version 10.1.77
|
2019-01-15 19:46:36 +06:00 |
|
Frappe Bot
|
9e09b3adbe
|
Merge branch 'staging' into develop
|
2018-12-26 12:16:20 +00:00 |
|
Frappe Bot
|
e8c2fdfb8c
|
Merge branch 'master' into staging-fixes
|
2018-12-26 11:44:09 +00:00 |
|
Frappe Bot
|
9a9c9c2ba3
|
bumped to version 10.1.76
|
2018-12-26 11:09:34 +00:00 |
|
Frappe Bot
|
65a9991d84
|
bumped to version 10.1.75
|
2018-12-10 12:14:33 +00:00 |
|
Frappe Bot
|
7c2a5bddb1
|
Merge branch 'staging' into develop
|
2018-12-06 09:50:25 +00:00 |
|
Frappe Bot
|
ee5d7e6d0f
|
Merge branch 'master' into staging-fixes
|
2018-12-06 09:26:42 +00:00 |
|
Frappe Bot
|
be0a349a52
|
bumped to version 10.1.74
|
2018-12-06 09:14:35 +00:00 |
|
Ameya Shenoy
|
fe1f532bc0
|
Merge branch 'staging' into develop
|
2018-11-28 08:28:37 +00:00 |
|
Ameya Shenoy
|
2806d83362
|
Merge branch 'master' into staging-fixes
|
2018-11-28 08:12:48 +00:00 |
|
Ameya Shenoy
|
e3136c38e1
|
bumped to version 10.1.73
|
2018-11-28 07:57:27 +00:00 |
|
Frappe Bot
|
eb4969d24f
|
Merge branch 'staging' into develop
|
2018-11-15 09:26:03 +00:00 |
|
Frappe Bot
|
98b4a1bc81
|
Merge branch 'master' into staging-fixes
|
2018-11-15 09:12:04 +00:00 |
|
Frappe Bot
|
2426d00dd6
|
bumped to version 10.1.72
|
2018-11-15 09:04:14 +00:00 |
|
Frappe Bot
|
b5c7b96a73
|
Merge branch 'staging' into develop
|
2018-11-13 11:33:31 +00:00 |
|
Frappe Bot
|
88c88d6e7c
|
Merge branch 'master' into staging-fixes
|
2018-11-13 10:59:05 +00:00 |
|
Frappe Bot
|
6b78e520d2
|
bumped to version 10.1.71
|
2018-11-13 10:55:31 +00:00 |
|
Himanshu Mishra
|
35b2627112
|
Item qty based tax (CESS) calculation support (#15456)
* fix conflicts
* added test case for qty cess
* use company specified in document to get region
|
2018-11-13 11:13:04 +05:30 |
|
Frappe Bot
|
4df671585b
|
Merge branch 'master' into staging-fixes
|
2018-11-09 10:11:27 +00:00 |
|
Frappe Bot
|
f8a5cfe8d8
|
bumped to version 10.1.70
|
2018-11-09 10:09:04 +00:00 |
|
Frappe Bot
|
823e754565
|
Merge branch 'master' into staging-fixes
|
2018-11-07 11:26:11 +00:00 |
|
Frappe Bot
|
7f37d26f05
|
bumped to version 10.1.69
|
2018-11-07 11:26:10 +00:00 |
|
Ameya Shenoy
|
65797bca64
|
Merge branch 'master' into staging-fixes
|
2018-11-06 11:02:08 +00:00 |
|
Ameya Shenoy
|
a97a520aa8
|
bumped to version 10.1.68
|
2018-11-06 11:02:04 +00:00 |
|
Ameya Shenoy
|
4a75d58d89
|
Merge branch 'master' into staging-fixes
|
2018-11-05 06:45:04 +00:00 |
|
Ameya Shenoy
|
59f16bc942
|
bumped to version 10.1.67
|
2018-11-05 06:40:25 +00:00 |
|
Ameya Shenoy
|
961849beb4
|
Merge branch 'master' into staging-fixes
|
2018-10-31 13:43:12 +00:00 |
|
Ameya Shenoy
|
b4bff7e298
|
bumped to version 10.1.66
|
2018-10-31 13:35:58 +00:00 |
|
Ameya Shenoy
|
6178b79555
|
Merge branch 'master' into staging-fixes
|
2018-10-30 12:48:45 +00:00 |
|
Ameya Shenoy
|
1f7a5dcd07
|
bumped to version 10.1.65
|
2018-10-30 12:48:42 +00:00 |
|
Ameya Shenoy
|
3643e7b1b4
|
Merge branch 'master' into staging-fixes
|
2018-10-23 12:52:48 +00:00 |
|
Ameya Shenoy
|
2a98e59bd4
|
bumped to version 10.1.64
|
2018-10-23 12:52:46 +00:00 |
|
Ameya Shenoy
|
ca66c7ba14
|
Merge branch 'master' into staging-fixes
|
2018-10-23 08:01:13 +00:00 |
|
Ameya Shenoy
|
ac64b39562
|
bumped to version 10.1.63
|
2018-10-23 07:58:11 +00:00 |
|
Ameya Shenoy
|
a0e533ede5
|
Merge branch 'master' into staging-fixes
|
2018-10-22 10:37:14 +00:00 |
|
Ameya Shenoy
|
c365ce8f21
|
bumped to version 10.1.62
|
2018-10-22 10:34:35 +00:00 |
|
Ameya Shenoy
|
bbfdc13ab7
|
Merge branch 'master' into staging-fixes
|
2018-10-19 12:48:18 +00:00 |
|
Ameya Shenoy
|
24fe7286fc
|
bumped to version 10.1.61
|
2018-10-19 12:48:16 +00:00 |
|
Ameya Shenoy
|
77b60928bf
|
Merge branch 'master' into staging-fixes
|
2018-10-17 09:39:31 +00:00 |
|
Ameya Shenoy
|
bb1b6b42e2
|
bumped to version 10.1.60
|
2018-10-17 09:04:11 +00:00 |
|
Nabin Hait
|
3c29967d27
|
Fixed merge conflict
|
2018-10-15 15:43:21 +05:30 |
|
Nabin Hait
|
d2c643eb0b
|
bumped to version 10.1.59
|
2018-10-15 16:11:25 +06:00 |
|
Saurabh
|
99c064305f
|
Merge branch 'master' into staging-fixes
|
2018-10-09 17:55:33 +05:30 |
|
Saurabh
|
2dc8972794
|
bumped to version 10.1.58
|
2018-10-09 18:25:32 +06:00 |
|
Ameya Shenoy
|
ecba14e6cf
|
Merge branch 'master' into staging-fixes
|
2018-10-08 09:39:49 +00:00 |
|
Ameya Shenoy
|
b509b06edf
|
bumped to version 10.1.57
|
2018-10-08 09:37:37 +00:00 |
|
Ameya Shenoy
|
ad908779be
|
Merge branch 'master' into staging-fixes
|
2018-10-05 08:54:58 +00:00 |
|
Ameya Shenoy
|
97dbb4d125
|
bumped to version 10.1.56
|
2018-10-05 08:54:46 +00:00 |
|
Ameya Shenoy
|
7d929c508f
|
Merge branch 'master' into staging-fixes
|
2018-10-04 09:25:07 +00:00 |
|
Ameya Shenoy
|
79dc8ac9cc
|
bumped to version 10.1.55
|
2018-10-04 09:11:50 +00:00 |
|
Ameya Shenoy
|
9d3a97fd15
|
Merge branch 'master' into staging-fixes
|
2018-09-26 07:28:53 +00:00 |
|
Ameya Shenoy
|
e04431ea5c
|
bumped to version 10.1.54
|
2018-09-26 07:26:49 +00:00 |
|
Saurabh
|
75d90b9d8f
|
a[resolved] merge-conflicts
|
2018-09-20 13:28:23 +05:30 |
|
Saurabh
|
3b281a0a1b
|
bumped to version 10.1.53
|
2018-09-20 13:52:36 +06:00 |
|
Saurabh
|
393dd4286a
|
[resolved] merge-conflicts
|
2018-09-12 14:48:30 +05:30 |
|
Saurabh
|
6d5a29af6a
|
bumped to version 10.1.52
|
2018-09-12 15:14:25 +06:00 |
|
Saurabh
|
1fe1884b73
|
Merge branch 'master' into develop
|
2018-09-03 17:00:17 +05:30 |
|
Saurabh
|
4bd562d669
|
bumped to version 10.1.51
|
2018-09-03 17:30:15 +06:00 |
|
Saurabh
|
5c3590fa8d
|
Merge branch 'master' into develop
|
2018-08-31 11:29:14 +05:30 |
|
Saurabh
|
648191b9e8
|
bumped to version 10.1.50
|
2018-08-31 11:59:13 +06:00 |
|
Nabin Hait
|
a804d6d487
|
Fixed merge conflict
|
2018-08-29 13:34:58 +05:30 |
|
Nabin Hait
|
af497ef669
|
bumped to version 10.1.49
|
2018-08-29 13:43:53 +06:00 |
|
Saurabh
|
ddbf3aaccb
|
Merge branch 'master' into develop
|
2018-08-13 13:15:58 +05:30 |
|
Saurabh
|
cd6b955b99
|
bumped to version 10.1.48
|
2018-08-13 13:45:56 +06:00 |
|
Saurabh
|
20fb443f0c
|
[Resolved] merge conflicts
|
2018-08-10 17:11:30 +05:30 |
|
Saurabh
|
57d3c93e6b
|
bumped to version 10.1.47
|
2018-08-10 17:37:01 +06:00 |
|
Nabin Hait
|
2a774fa0ac
|
minor fix
|
2018-08-09 11:50:34 +05:30 |
|
Rushabh Mehta
|
708e47aadf
|
optimize(various)
|
2018-08-08 16:37:31 +05:30 |
|
Saurabh
|
824b388631
|
Resolved merge conflicts
|
2018-08-07 13:01:11 +05:30 |
|
Saurabh
|
6ec558bd59
|
bumped to version 10.1.46
|
2018-08-07 13:25:51 +06:00 |
|
Nabin Hait
|
eed3d4c1b3
|
Fixed Merge Conflict
|
2018-07-31 12:36:16 +05:30 |
|
Nabin Hait
|
e9afbfde76
|
bumped to version 10.1.45
|
2018-07-31 12:48:22 +06:00 |
|
Nabin Hait
|
fa06ee80e9
|
Fixed merge conflict
|
2018-07-27 12:54:00 +05:30 |
|
Nabin Hait
|
584153a1b1
|
bumped to version 10.1.44
|
2018-07-27 13:05:42 +06:00 |
|
Saurabh
|
d7897f1c53
|
Resolved merge conflicts
|
2018-07-18 17:08:16 +05:30 |
|
Saurabh
|
6c46b4edc4
|
bumped to version 10.1.43
|
2018-07-18 16:54:54 +06:00 |
|
Saurabh
|
db7324890f
|
Merge branch 'master' into develop
|
2018-07-09 15:53:51 +05:30 |
|
Saurabh
|
07bb1811af
|
bumped to version 10.1.42
|
2018-07-09 16:23:50 +06:00 |
|
Saurabh
|
1cfcf70905
|
Resolved merge conflicts
|
2018-07-06 13:18:44 +05:30 |
|
Saurabh
|
778e06d0ee
|
bumped to version 10.1.41
|
2018-07-06 13:32:57 +06:00 |
|
Ameya Shenoy
|
4e96f55eff
|
Merge branch 'master' into develop
|
2018-06-22 05:10:29 +00:00 |
|