Nabin Hait f4068fd6f1 Fixed merge conflict

2016-11-01 15:06:55 +05:30

..

__init__.py

fixes test cases, added patch

2016-08-26 13:18:14 +05:30

add_field_for_task_dependent.py

[gantt] Gantt fixes (#6490)

2016-10-10 14:32:35 +05:30

fix_link_for_customer_from_lead.py

[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051

2016-09-19 15:03:57 +05:30

move_sales_invoice_from_parent_to_child_timesheet.py

rename total_billing_amount to total_billable_amount in timesheet doctype

2016-09-12 19:06:41 +05:30

rename_field_timesheet.py

rename total_billing_hours to total_billable_hours in timesheet doctype

2016-09-12 23:00:24 +05:30

save_stock_settings.py

Update save_stock_settings.py

2016-10-29 14:43:58 +05:30

set_prefered_contact_email.py

Set prefered contact email in Employee

2016-10-19 18:26:01 +05:30

set_student_guardian.py

Update set_student_guardian.py

2016-09-08 17:57:55 +05:30

set_total_amount_currency_in_je.py

[fix] currency symbol for total amount in JE

2016-10-04 11:29:26 +05:30

update_component_type.py

[Patch] Fixed error unknown column 'type' in 'field list'

2016-08-30 01:41:35 +05:30

update_lead_source.py

[fix] [patch] update_lead_source

2016-09-21 12:00:58 +05:30

update_portal_roles.py

[minor] [patch] ignore_validate in update_portal_role

2016-09-24 00:21:53 +05:30

update_total_billing_hours.py

rename total_billing_hours to total_billable_hours in timesheet doctype

2016-09-12 23:00:24 +05:30