mbauskar f3be738b68 resolved merge conflicts

2017-08-04 11:07:07 +05:30

..

__init__.py

Itemised tax breakup fix in docs other than invoice (#9961)

2017-07-20 13:32:01 +05:30

fix_tax_breakup_for_non_invoice_docs.py

Itemised tax breakup fix in docs other than invoice (#9961)

2017-07-20 13:32:01 +05:30

remove_project_type_property_setter.py

[fix] remove property setter for project type (#10277)

2017-08-04 10:50:56 +05:30

remove_quotations_route_in_sidebar.py

[minor] moved the patch to v8_5 and other minor fixes (#10012)

2017-07-21 15:19:47 +05:30

set_default_mode_of_payment.py

[enhance] Provision to set default mode of payment for the POS in POS profile

2017-07-27 19:17:05 +05:30

update_customer_group_in_POS_profile.py

merged hotfix branch into staging (#10191)

2017-08-01 11:06:41 +05:30

update_existing_data_in_project_type.py

Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929)

2017-07-26 17:55:25 +05:30