Prateeksha Singh a5f6e54b70 fix merge conflict

2018-08-06 13:56:53 +05:30

..

repair_tools

…

v4_0

remove apply user permission (#13505)

2018-04-05 12:10:46 +05:30

v4_1

…

v4_2

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

v4_4

Updated Python 3 fixes

2018-02-15 11:31:05 +05:30

v5_0

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

v5_1

Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)

2018-01-29 16:07:21 +05:30

v5_2

…

v5_4

moved from MySQLdb to pymysql (#11462)

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

v5_7

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

v5_8

Reserve for subcontracting (#13195)

2018-03-12 14:12:12 +05:30

v6_0

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

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

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

v6_21

…

v6_23

…

v6_24

…

v6_27

…

v7_0

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

v7_1

Fix patches for Travis

2018-05-21 15:04:13 +05:30

v7_2

Invalid date value comparison, fixes for mariadb 10.2.3+

2018-01-31 15:30:03 +05:30

v8_0

Fix patches for Travis

2018-05-21 15:04:13 +05:30

v8_1

code review: revert changes

2018-04-17 11:30:35 +01:00

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

[ Enhance ] Production to Work Order (#12902)

2018-03-20 12:38:43 +05:30

v8_7

[minor] fixes + patch (#14937)

2018-07-17 18:22:51 +05:30

v8_8

Enhance Currency Exchange Management (#10482)

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

v8_9

minor patch fixes

2018-06-28 23:42:55 +05:30

v8_10

Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685)

2018-01-29 16:07:21 +05:30

v9_0

Fix patches for Travis

2018-05-21 15:04:13 +05:30

v9_1

[minor] fix-patch

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

v9_2

Fixed merge conflict

2018-04-13 14:38:57 +05:30

v10_0

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

v10_1

Merge patch and delete fields from subscription (#14941)

2018-07-19 14:33:31 +05:30

v11_0

fix merge conflict

2018-08-06 13:56:53 +05:30

__init__.py

…