Nabin Hait 4d22b6db30 Fixed Merge Conflict

2017-10-25 14:09:46 +05:30

..

__init__.py

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

add_healthcare_domain.py

[patch] To add healthcare domain (#11105)

2017-10-09 12:43:36 +05:30

copy_old_fees_field_data.py

copy the older total amount field and corrsp. changes in report (#11322)

2017-10-25 12:13:42 +05:30

fix_subscription_next_date.py

Subscription fixes (#11292)

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

remove_subscription_module.py

Move subscription module to accounts (#10772)

2017-09-15 16:16:36 +05:30

set_schedule_date_for_material_request_and_purchase_order.py

Cleanup of PO schedule date pull requests

2017-10-05 19:51:10 +05:30

set_uoms_in_variant_field.py

Make Variant does not copy UOM properties (#10887) (#11261)

2017-10-25 11:57:10 +05:30

set_variant_item_description.py

[minor-fix] patch fix

2017-10-18 16:14:20 +05:30

student_admission_childtable_migrate.py

test, patch, docs for student admission (#11075)

2017-10-09 12:41:24 +05:30