Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
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
