Nabin Hait c9f9e5235b Fixed merge conflict

2017-09-28 12:31:33 +05:30

..

repair_tools

…

v4_0

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v4_1

…

v4_2

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v4_4

old style exception, raise --> new style for Python 3 (#10082)

2017-07-27 10:38:35 +05:30

v5_0

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v5_1

…

v5_2

…

v5_4

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v5_7

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v5_8

…

v6_0

…

v6_2

…

v6_3

…

v6_4

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v6_5

…

v6_6

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v6_8

…

v6_10

…

v6_12

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v6_16

…

v6_19

…

v6_20

…

v6_20x

changed doctype name userrole to has role

2017-03-06 14:24:39 +05:30

v6_21

…

v6_23

…

v6_24

…

v6_27

…

v7_0

Python 3 compatibility syntax error fixes (#10519)

2017-08-28 18:17:36 +05:30

v7_1

[fix] unknown column in production order (#10828)

2017-09-18 16:48:45 +05:30

v7_2

[Fix] Module error during patch execution

2017-06-28 17:31:59 +05:30

v8_0

check the instructor table before querying (#10754)

2017-09-12 15:49:36 +05:30

v8_1

Delete GST related doctypes and reports if account is from outside India (#10808)

2017-09-18 13:16:04 +05:30

v8_3

[hotfix] set_restrict_to_domain_for_module_def patch fixes (#9921)

2017-07-18 15:09:30 +05:30

v8_4

Patch was faling, reload doc was missing (#10072)

2017-07-25 11:39:46 +05:30

v8_5

Merge branch 'master' into staging

2017-08-04 14:08:57 +05:30

v8_6

Update BOM cost in all BOMs based on latest rm rate

2017-08-22 10:49:57 +05:30

v8_7

Re-order patch sequence (#10936)

2017-09-27 17:11:40 +05:30

v8_8

Enhance Currency Exchange Management (#10482)

2017-09-21 14:50:39 +05:30

v8_9

Fixed merge conflict

2017-09-28 12:31:33 +05:30

v9_0

Move subscription module to accounts (#10772)

2017-09-18 17:23:00 +05:30

__init__.py

…