Nabin Hait
|
89206e74d0
|
fixed merge conflict
|
2019-04-11 12:31:14 +05:30 |
|
Rushabh Mehta
|
1412a681f3
|
Revert "fix: Raise exception if apps are on incompatible branches"
|
2019-04-08 17:10:56 +05:30 |
|
Saurabh
|
00a5e7a1d0
|
bumped to version 11.1.20
|
2019-04-08 15:39:03 +06:00 |
|
Saurabh
|
63fabc3723
|
bumped to version 11.1.19
|
2019-04-05 17:29:22 +06:00 |
|
Nabin Hait
|
f86a01446f
|
Merge pull request #17086 from adityahase/check-version-hf
fix: Raise exception if apps are on incompatible branches
|
2019-04-04 11:17:04 +05:30 |
|
Aditya Hase
|
b841cb2a66
|
fix: Raise exception if apps are on incompatible branches
|
2019-04-01 11:36:57 +05:30 |
|
Saurabh
|
75b4de3e20
|
bumped to version 11.1.18
|
2019-03-30 15:30:36 +06:00 |
|
Saurabh
|
84a18f5b18
|
Merge branch 'master' into develop
|
2019-03-28 13:54:34 +05:30 |
|
Saurabh
|
f2036dd1d1
|
bumped to version 11.1.17
|
2019-03-28 14:21:58 +06:00 |
|
Frappe Bot
|
b07a5d449d
|
Merge branch 'master' into develop
|
2019-03-23 07:25:03 +00:00 |
|
Frappe Bot
|
021ccf572a
|
bumped to version 11.1.16
|
2019-03-23 07:25:02 +00:00 |
|
Saurabh
|
3c95387926
|
Merge branch 'master' into develop
|
2019-03-20 14:39:49 +05:30 |
|
Saurabh
|
83cc587f8f
|
bumped to version 11.1.15
|
2019-03-20 15:03:00 +06:00 |
|
Frappe Bot
|
7e67a400cd
|
Merge branch 'master' into develop
|
2019-03-08 09:39:33 +00:00 |
|
Frappe Bot
|
3406229152
|
bumped to version 11.1.14
|
2019-03-08 09:39:32 +00:00 |
|
Frappe Bot
|
8f0660ab31
|
Merge branch 'master' into develop
|
2019-03-01 09:22:36 +00:00 |
|
Frappe Bot
|
3ec0bb7e53
|
bumped to version 11.1.13
|
2019-03-01 09:12:25 +00:00 |
|
Frappe Bot
|
1fcae10258
|
Merge branch 'master' into develop
|
2019-02-28 10:20:48 +00:00 |
|
Frappe Bot
|
58135976dd
|
bumped to version 11.1.12
|
2019-02-28 10:08:08 +00:00 |
|
Sagar Vora
|
e0eafb1c2c
|
Merge branch 'master' into develop
|
2019-02-26 17:08:59 +05:30 |
|
Sagar Vora
|
5a14e46a1b
|
bumped to version 11.1.11
|
2019-02-26 17:28:58 +05:50 |
|
Saurabh
|
3dd7ddd838
|
Merge branch 'master' into develop
|
2019-02-21 18:25:29 +05:30 |
|
Saurabh
|
76cd402ca5
|
bumped to version 11.1.10
|
2019-02-21 18:55:28 +06:00 |
|
Saurabh
|
482ebd2c7c
|
Merge branch 'master' into develop
|
2019-02-20 18:14:18 +05:30 |
|
Saurabh
|
ada93e5d77
|
bumped to version 11.1.9
|
2019-02-20 18:44:17 +06:00 |
|
Sagar Vora
|
eba76c99a3
|
Merge branch 'master' into develop
|
2019-02-20 12:11:25 +05:30 |
|
Sagar Vora
|
d48393541d
|
bumped to version 11.1.8
|
2019-02-20 12:31:25 +05:50 |
|
Sagar Vora
|
cc6e51c62d
|
Merge branch 'master' into develop
|
2019-02-19 18:09:49 +05:30 |
|
Sagar Vora
|
f5c511c193
|
bumped to version 11.1.7
|
2019-02-19 18:14:14 +05:50 |
|
Frappe Bot
|
74fd5daeb2
|
Merge branch 'master' into develop
|
2019-02-15 10:22:33 +00:00 |
|
Frappe Bot
|
acf26c8569
|
bumped to version 11.1.6
|
2019-02-15 10:22:32 +00:00 |
|
Sagar Vora
|
551f52fd25
|
Merge branch 'master' into develop
|
2019-02-12 16:41:24 +05:30 |
|
Sagar Vora
|
6837ae3377
|
bumped to version 11.1.5
|
2019-02-12 16:54:29 +05:50 |
|
Sagar Vora
|
da1dc7fa52
|
Merge branch 'master' into develop
|
2019-02-05 18:40:39 +05:30 |
|
Sagar Vora
|
8aa34a0ce0
|
bumped to version 11.1.4
|
2019-02-05 19:00:38 +05:50 |
|
Sagar Vora
|
56cbfe4bb0
|
Merge branch 'master' into develop
|
2019-01-31 13:34:32 +05:30 |
|
Sagar Vora
|
fea55fc018
|
bumped to version 11.1.3
|
2019-01-31 13:53:07 +05:50 |
|
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 |
|