Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Tax Category and Item Tax Template (v12) #16377

Merged
merged 30 commits into from
Feb 2, 2019
Merged

feat: Tax Category and Item Tax Template (v12) #16377

merged 30 commits into from
Feb 2, 2019

Commits on Dec 21, 2018

  1. Add and Modified DocTypes for Item Tax Template

    @SaiFi0102
    SaiFi0102 committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    8ac2617 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2018

  1. More work on Tax Category and Item Tax Template

    @SaiFi0102
    SaiFi0102 committed Dec 26, 2018
    Configuration menu
    Copy the full SHA
    6778668 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2018

  1. feat: add_taxes_from_item_tax_template

    @SaiFi0102
    SaiFi0102 committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    aca374e View commit details
    Browse the repository at this point in the history

  2. fix: Run get_item_tax_info and set_taxes serially

    @SaiFi0102
    SaiFi0102 committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    e414a92 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. feat: Tax Category based on Address

    @SaiFi0102
    SaiFi0102 committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    fd531a6 View commit details
    Browse the repository at this point in the history

  2. fix: Only load transaction's company's tax accounts in item tax map

    @SaiFi0102
    SaiFi0102 committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    eeead1d View commit details
    Browse the repository at this point in the history

  3. fix: update item_tax_template account_type server-side validation

    @SaiFi0102
    SaiFi0102 committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    f6a83da View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2019

  1. Force item_tax_rate on setting item details server-side

    @SaiFi0102
    SaiFi0102 committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    648bd15 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2019

  1. fix: Test Records

    Saif Ur Rehman committed Jan 5, 2019
    Configuration menu
    Copy the full SHA
    b1288b7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template

# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/stock/doctype/item/item.json
    Saif Ur Rehman committed Jan 5, 2019
    Configuration menu
    Copy the full SHA
    7ea6554 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. Fix tests

    Saif Ur Rehman committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    13a6c0a View commit details
    Browse the repository at this point in the history

  2. Added test for Tax Rule based on Tax Category

    Saif Ur Rehman committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    f484f0d View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Added patch for Item Tax Template

    Saif Ur Rehman committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    848bbac View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git … 

    …into Item-Tax-Template

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/item/item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
    @SaiFi0102
    SaiFi0102 committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    380b4b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2019

  1. test: Added test for get_item_tax_template and get_item_tax_map

    @SaiFi0102
    SaiFi0102 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    091cfba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git … 

    …into Item-Tax-Template

# Conflicts:
#	erpnext/patches.txt
    @SaiFi0102
    SaiFi0102 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    eb7277d View commit details
    Browse the repository at this point in the history

  3. chore: Updated item.json, no changes

    @SaiFi0102
    SaiFi0102 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    edd0e24 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpn… 

    …ext.git into Item-Tax-Template-V12

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
    @SaiFi0102
    SaiFi0102 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    8d61794 View commit details
    Browse the repository at this point in the history

  5. chore: Move Item Tax Template patch to v12

    @SaiFi0102
    SaiFi0102 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    fc5c9b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. test: fix for Item Tax Template v12

    @SaiFi0102
    SaiFi0102 committed Jan 10, 2019
    Configuration menu
    Copy the full SHA
    5085673 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2019

  1. test: test_tax_calculation_with_item_tax_template

    @SaiFi0102
    SaiFi0102 committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    bbd1e47 View commit details
    Browse the repository at this point in the history

  2. test: test_party_details_tax_category

    @SaiFi0102
    SaiFi0102 committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    502f15b View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. Merge branch 'develop' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template-V12

# Conflicts:
#	erpnext/patches.txt
    @SaiFi0102
    SaiFi0102 committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    398f593 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Merge branch 'develop' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template-V12

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
    @SaiFi0102
    SaiFi0102 committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    74a3370 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. Merge branch 'staging' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
#	erpnext/selling/doctype/sales_order/sales_order.json
    @SaiFi0102
    SaiFi0102 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    d5c7410 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template-V12

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
    @SaiFi0102
    SaiFi0102 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    3d275af View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiF… 

    …i0102/erpnext.git into Item-Tax-Template-V12

# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
    @SaiFi0102
    SaiFi0102 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    37d7b80 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2019

  1. Merge branch 'develop' into Item-Tax-Template-V12

    @nabinhait
    nabinhait committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    f05d91d View commit details
    Browse the repository at this point in the history

  2. fix(Item Tax Patch): Converted global variables to local

    @SaiFi0102
    SaiFi0102 committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    392d019 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2019

  1. Merge branch 'develop' of https://github.com/frappe/erpnext.git into … 

    …Item-Tax-Template-V12

# Conflicts:
#	erpnext/patches.txt
    @SaiFi0102
    SaiFi0102 committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    1a441b2 View commit details
    Browse the repository at this point in the history