Saif Ur Rehman 8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ...

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json

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

..

batch

perms: fix default import, export perms

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

bin

Refactor Naming Series (#15070)

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

customs_tariff_number

Allow Rename for Custom Tariff (#15389)

2018-09-12 17:13:12 +05:30

delivery_note

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

delivery_note_item

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

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

delivery_settings

[Feature] Route optimization for Delivery Trip stops (#15566)

2018-11-08 11:57:05 +05:30

delivery_stop

Update Delivery Trip status based on visited stops (#15723)

2018-11-13 12:22:17 +05:30

delivery_trip

Revert "fix(delivery): update package total on validate (#16131)"

2018-12-10 20:27:14 +05:30

item

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

item_alternative

Avoid multiple escapes (#15509)

2018-09-27 15:39:34 +05:30

item_attribute

[minor] remove in_dialog old property

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

item_attribute_value

[minor] remove in_dialog old property

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

item_barcode

fix(field property): Made barcode field non-mandatory in item

2018-11-13 16:48:59 +05:30

item_customer_detail

[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198)

2018-03-21 11:17:49 +05:30

item_default

Set ignore_user_permission 1 for Company field in Item Default (#16167)

2018-12-24 14:48:09 +05:30

item_price

perms: fix default import, export perms

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

item_quality_inspection_parameter

[minor] remove in_dialog old property

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

item_reorder

[minor] remove in_dialog old property

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

item_supplier

[minor] remove in_dialog old property

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

item_tax

More work on Tax Category and Item Tax Template

2018-12-27 02:11:07 +05:00

item_variant

[minor] remove in_dialog old property

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

item_variant_attribute

reinitialize variant attribute table, fixes #11900 (#11921)

2017-12-11 12:22:28 +05:30

item_variant_settings

Allow Item variant Rename (#13161)

2018-03-07 15:31:08 +05:30

item_website_specification

[minor] remove in_dialog old property

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

landed_cost_item

[Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320)

2017-08-10 11:32:59 +05:30

landed_cost_purchase_receipt

[minor] remove in_dialog old property

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

landed_cost_taxes_and_charges

convert html into text in the taxes description as it can break the reports (#11603)

2017-11-16 14:11:39 +05:30

landed_cost_voucher

fix(translations): Replace translations by keyword with indexed version (#15426)

2018-09-19 13:13:59 +05:30

manufacturer

[Minor] Country field name should be country

2017-08-03 10:18:43 +05:30

material_request

Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes

2018-12-27 09:05:25 +05:30

material_request_item

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

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

packed_item

Merge branch 'master' into staging-fixes

2018-11-28 08:12:48 +00:00

packing_slip

Refactor Naming Series (#15070)

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

packing_slip_item

Merge branch 'master' into develop

2018-06-06 05:53:19 +00:00

price_list

perms: fix default import, export perms

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

price_list_country

[minor] remove in_dialog old property

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

purchase_receipt

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

purchase_receipt_item

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

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

quality_inspection

feat(quality): Check quality status before receipt/delivery (#16169)

2018-12-24 14:54:42 +05:30

quality_inspection_reading

[minor] remove in_dialog old property

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

quality_inspection_template

[Enhance] Quality Inspection Template (#12988)

2018-02-22 11:03:48 +05:30

sales_bom

…

sales_bom_item

Sales BOM renamed to Product Bundle

2015-07-13 12:41:27 +05:30

serial_no

Merge branch 'staging' into develop

2019-01-08 17:09:36 +05:30

stock_entry

Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes

2018-12-27 09:05:25 +05:30

stock_entry_detail

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

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

stock_ledger_entry

Merge branch 'staging' into develop

2019-01-08 17:09:36 +05:30

stock_reconciliation

fix: set fieldname for frappe prompt (#16198)

2018-12-24 14:54:06 +05:30

stock_reconciliation_item

edit Doctypes to use company currency

2017-08-03 00:05:56 +01:00

stock_settings

Merge branch 'staging' into develop

2018-11-13 11:33:31 +00:00

uom_category

[Enhancement] UOM Conversion Factors (#13853)

2018-06-06 09:44:46 +05:30

uom_conversion_detail

[minor] remove in_dialog old property

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

variant_field

[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated

2017-09-21 15:41:57 +05:30

warehouse

fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled (#15743)

2018-10-19 18:03:13 +05:30

__init__.py

…