Saurabh 0eb622f7da [fix] resolve conflicts

2018-05-31 17:32:17 +05:30

..

__init__.py

…

add_agriculture_domain.py

…

add_default_cash_flow_mappers.py

Cutomisable Cash Flow Reports (#12969)

2018-02-22 11:08:36 +05:30

add_guardian_role_for_parent_portal.py

…

add_non_profit_domain.py

…

added_extra_gst_custom_field_in_gstr2.py

Update added_extra_gst_custom_field_in_gstr2.py

2018-02-22 18:17:57 +05:30

added_extra_gst_custom_field.py

…

copy_projects_renamed_fields.py

…

enabled_regional_print_format_based_on_country.py

…

fichier_des_ecritures_comptables_for_france.py

…

fix_reserved_qty_for_sub_contract.py

Merge branch 'master' into develop

2018-03-28 15:51:18 +05:30

item_barcode_childtable_migrate.py

fix patch that causes error on bench update (#13222)

2018-03-08 11:20:40 +05:30

migrate_daily_work_summary_settings_to_daily_work_summary_group.py

patch exception fixes (#13037)

2018-02-22 15:56:33 +05:30

remove_and_copy_fields_in_physician.py

update physician patch fail (#13277)

2018-03-12 15:21:53 +05:30

rename_offer_letter_to_job_offer.py

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

rename_price_to_rate_in_pricing_rule.py

Currency filter in Pricing Rule (#11776)

2018-02-20 11:26:46 +05:30

rename_schools_to_education.py

…

set_auto_created_serial_no_in_stock_entry.py

Patches fixes (#13163)

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

set_b2c_limit.py

Gstr reports (#12940)

2018-02-16 13:19:04 +05:30

set_currency_in_pricing_rule.py

Currency filter in Pricing Rule (#11776)

2018-02-20 11:26:46 +05:30

set_default_payment_terms_based_on_company.py

set payment term name in payment_terms (#12693)

2018-01-29 17:39:56 +05:30

set_numeric_ranges_in_template_if_blank.py

…

set_primary_contact_for_customer.py

…

set_qty_in_transactions_based_on_serial_no_input.py

[fix] if UOM and Warehouse link is invalid then set blank values

2018-05-15 14:56:18 +05:30

set_student_party_type.py

add the student as party type (#13348)

2018-03-21 10:12:27 +05:30

setup_vat_for_uae_and_saudi_arabia.py

…

show_leaves_of_all_department_members_in_calendar.py

[fix] consider user permissions in leave application calendar view (#13902)

2018-05-03 18:52:25 +05:30

taxes_issue_with_pos.py

[Fix] POS Patch

2018-04-25 12:32:22 +05:30

update_assessment_plan.py

…

update_assessment_result.py

…

update_asset_calculate_depreciation.py

…

update_hub_connector_domain.py

patch fix

2018-03-19 18:17:54 +05:30

update_lft_rgt_for_employee.py

…

update_project_in_sle.py

Update update_project_in_sle.py

2018-03-21 18:24:45 +05:30

update_reserved_qty_for_purchase_order.py

Update update_reserved_qty_for_purchase_order.py

2018-03-13 17:10:14 +05:30

update_sales_order_link_to_purchase_order.py

[fix] Patch for material request to purchase order added

2018-01-31 15:11:24 +05:30

update_status_for_multiple_source_in_po.py

[fix] use join instead of subquery

2018-03-07 12:13:32 +05:30

update_status_in_purchase_receipt.py

Update status in Purchase Receipt (#14257)

2018-05-28 18:24:28 +05:30

update_territory_and_customer_group.py

Fixed merge conflict

2018-03-05 14:54:44 +05:30

update_translatable_fields.py

Patch to enable translatable

2018-02-14 22:18:55 +05:30

update_warehouse_address_details.py

[new] Create multiple warehouse address and fetch address to stock entry (#13109)

2018-03-05 11:10:01 +05:30

workflow_expense_claim.py

[Fix] Currency field in Pricing rule (#14004)

2018-05-16 11:20:30 +05:30

workflow_leave_application.py

[Fix] Currency field in Pricing rule (#14004)

2018-05-16 11:20:30 +05:30