Saurabh 34a0e90115 [fix] merge conflicts

2017-11-30 16:45:01 +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

moved from MySQLdb to pymysql (#11462)

2017-11-08 11:33:24 +05:30

v5_7

moved from MySQLdb to pymysql (#11462)

2017-11-08 11:33:24 +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

…

v6_21

…

v6_23

…

v6_24

…

v6_27

…

v7_0

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

v7_1

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

v7_2

Minor fix in patch

2017-11-23 17:57:33 +05:30

v8_0

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

v8_1

Update set_delivery_date_in_so_item.py

2017-11-30 15:52:47 +05:30

v8_3

[added] hospitality domain (#11020)

2017-10-17 12:30:34 +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

Subscription fixes (#11292)

2017-10-25 12:10:44 +05:30

v8_8

Enhance Currency Exchange Management (#10482)

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

v8_9

Letterhead in user progress (#11679)

2017-11-28 16:09:58 +05:30

v8_10

Cleanup and fixes of payment terms feature

2017-11-21 19:58:16 +05:30

v9_0

Refactor multi pos profile selection in the pos invoice (#11721)

2017-11-28 16:11:15 +05:30

v9_1

[minor] fix-patch

2017-11-21 15:18:47 +05:30

v9_2

[patch] Patch added to rename net_weight field (#11798)

2017-11-30 13:52:30 +05:30

v10_0

Employee tree (#11667)

2017-11-29 18:44:02 +05:30

__init__.py

…