brotherton-erpnext

account

resolved merge conflicts

2018-01-09 12:05:20 +05:30

accounts_settings

[Enhance] Provision to show inclusive tax in print (#12345 )

2018-01-08 15:20:15 +05:30

bank_guarantee

…

bank_reconciliation

[UI Test] UI Test Added for Bank Reconciliation (#10563 )

2017-08-28 11:11:36 +05:30

bank_reconciliation_detail

…

budget

…

budget_account

…

c_form

remove erroneous column breaks (#11522 )

2017-11-10 18:54:03 +05:30

c_form_invoice_detail

…

cheque_print_template

…

cost_center

[feature] Opening Invoice Creation Tool (#11589 )

2017-11-15 16:29:53 +05:30

fiscal_year

…

fiscal_year_company

…

gl_entry

Reverted gl entry splitting based on payment terms (#12117 )

2017-12-21 11:37:18 +05:30

gst_account

GSTR1 for B2B (#12296 )

2018-01-10 17:48:03 +05:30

journal_entry

Reverted gl entry splitting based on payment terms (#12117 )

2017-12-21 11:37:18 +05:30

journal_entry_account

Reverted gl entry splitting based on payment terms (#12117 )

2017-12-21 11:37:18 +05:30

mode_of_payment

…

mode_of_payment_account

…

monthly_distribution

…

monthly_distribution_percentage

…

opening_invoice_creation_tool

set the mandatory field in the backend (#12102 )

2017-12-20 12:03:19 +05:30

opening_invoice_creation_tool_item

set the mandatory field in the backend (#12102 )

2017-12-20 12:03:19 +05:30

party_account

…

payment_entry

add posting_date/transaction_date to list_view (#12453 )

2018-01-12 16:27:29 +05:30

payment_entry_deduction

…

payment_entry_reference

Update payment_entry_reference.json

2017-10-16 12:58:32 +05:30

payment_gateway_account

…

payment_reconciliation

…

payment_reconciliation_invoice

…

payment_reconciliation_payment

…

payment_request

Translate payment request subject

2018-01-22 23:23:31 +01:00

payment_schedule

Multiple fixes related to payment terms (#12115 )

2017-12-20 12:24:59 +05:30

payment_term

rewrite Supplier test cases

2017-09-04 19:37:54 +01:00

payment_terms_template

fix bug: cast to flt

2017-09-25 23:24:32 +01:00

payment_terms_template_detail

disable some Payment Schedule fields

2017-09-26 10:25:49 +01:00

period_closing_voucher

remove erroneous column breaks (#11522 )

2017-11-10 18:54:03 +05:30

pos_customer_group

…

pos_item_group

…

pos_profile

[Fix] Wrong batch showing in the popup (#12421 )

2018-01-12 16:22:33 +05:30

pos_profile_user

Refactor multi pos profile selection in the pos invoice (#11721 )

2017-11-28 16:11:15 +05:30

pos_settings

[fix] POS redirect issue

2017-11-17 13:52:11 +05:30

pricing_rule

Merge branch 'develop' into payment-terms

2017-10-19 17:47:31 +01:00

purchase_invoice

add posting_date/transaction_date to list_view (#12453 )

2018-01-12 16:27:29 +05:30

purchase_invoice_advance

…

purchase_invoice_item

Rearranged fields due to merge conflict messup

2017-11-30 14:29:10 +05:30

purchase_taxes_and_charges

Fixed merge conflict

2017-12-06 14:17:51 +05:30

purchase_taxes_and_charges_template

Companywise default tax template (#12290 )

2018-01-05 12:42:02 +05:30

salary_component_account

…

sales_invoice

Fixed merge conflict

2018-01-17 18:56:02 +05:30

sales_invoice_advance

…

sales_invoice_item

Rearranged fields due to merge conflict messup

2017-11-30 14:29:10 +05:30

sales_invoice_payment

…

sales_invoice_timesheet

…

sales_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

sales_taxes_and_charges_template

Companywise default tax template (#12290 )

2018-01-05 12:42:02 +05:30

shipping_rule

[fix] Missing value Net Weight Added in Calculate Based On select field (#11883 )

2017-12-08 11:35:18 +05:30

shipping_rule_condition

…

shipping_rule_country

…

subscription

[minor] cleanup code (#11331 )

2017-10-25 17:03:49 +05:30

tax_rule

Companywise default tax template (#12290 )

2018-01-05 12:42:02 +05:30

__init__.py

…