Saif Ur Rehman 398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ...

# Conflicts:
#	erpnext/patches.txt

2019-01-18 17:33:19 +05:00

..

campaign

perms: fix default import, export perms

2018-08-29 17:10:27 +05:30

customer

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12

2019-01-18 17:33:19 +05:00

industry_type

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

installation_note

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

installation_note_item

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

lead_source

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

pos_closing_voucher

Refactor Naming Series (#15070)

2018-08-28 13:44:48 +05:30

pos_closing_voucher_details

POS closing voucher (#14270)

2018-06-06 10:22:13 +05:30

pos_closing_voucher_invoices

POS closing voucher (#14270)

2018-06-06 10:22:13 +05:30

pos_closing_voucher_taxes

POS closing voucher (#14270)

2018-06-06 10:22:13 +05:30

product_bundle

Add Bundle Description Field To Product Bundle (#11122)

2017-10-25 12:22:08 +05:30

product_bundle_item

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

quotation

Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12

2019-01-10 04:23:40 +05:00

quotation_item

chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)

2019-01-07 18:19:30 +05:30

sales_order

Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12

2019-01-18 17:33:19 +05:00

sales_order_item

Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template

2019-01-08 13:41:46 +05:00

sales_partner_type

minor changes

2018-06-12 16:04:49 +05:30

sales_team

Sales person Commission Report and more (#15431)

2018-09-25 19:08:16 +05:30

selling_settings

Add configurable frequency in Selling Settings for update of project … (#14670)

2018-06-28 23:43:23 +05:30

sms_center

fix(sms-center): Fix db query (#15774)

2018-10-31 18:04:30 +05:30

__init__.py

…