Nabin Hait 5e63c265db Fixed merge conflict

2018-03-09 17:34:39 +05:30

..

account

Validate Bank name in Setup wizard on the same slide (#12968)

2018-02-16 14:44:42 +05:30

accounts_settings

Cutomisable Cash Flow Reports (#12969)

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

bank_guarantee

Lint and fix JS files

2017-05-30 12:54:42 +05:30

bank_reconciliation

Fixed merge conflict

2018-03-09 17:34:39 +05:30

bank_reconciliation_detail

[minor] Fix grid column of the Bank Reconciliation

2017-06-23 12:10:21 +05:30

budget

[Fix] Budget against the field in the validation message

2017-07-10 17:06:54 +05:30

budget_account

Currency symbol for budget amount based on company

2017-01-02 17:21:34 +05:30

c_form

remove erroneous column breaks (#11522)

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

c_form_invoice_detail

[fix] make grids editable

2016-07-11 13:01:58 +05:30

cash_flow_mapper

Cutomisable Cash Flow Reports (#12969)

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

cash_flow_mapping

Cutomisable Cash Flow Reports (#12969)

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

cash_flow_mapping_accounts

Cutomisable Cash Flow Reports (#12969)

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

cash_flow_mapping_template

Cutomisable Cash Flow Reports (#12969)

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

cash_flow_mapping_template_details

Cutomisable Cash Flow Reports (#12969)

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

cheque_print_template

[minor][fix] show date in user format

2017-01-11 15:50:09 +05:30

cost_center

[feature] Opening Invoice Creation Tool (#11589)

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

fiscal_year

self.assertEqual

2018-02-28 21:13:51 +05:30

fiscal_year_company

[fix] make grids editable

2016-07-11 13:01:58 +05:30

gl_entry

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

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

gst_account

Gstr reports (#12940)

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

journal_entry

self.assertEqual

2018-02-28 21:13:51 +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

Credit card default account should be debtors #12989 (#13029)

2018-02-22 10:51:57 +05:30

mode_of_payment_account

Credit card default account should be debtors #12989 (#13029)

2018-02-22 10:51:57 +05:30

monthly_distribution

Lint and fix JS files

2017-05-30 12:54:42 +05:30

monthly_distribution_percentage

[fix] make grids editable

2016-07-11 13:01:58 +05:30

opening_invoice_creation_tool

[fix] Validate Party in not present in Party Type (#12910)

2018-02-16 13:13:37 +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

[fix] make grids editable

2016-07-11 13:01:58 +05:30

payment_entry

Fixed merge conflict

2018-03-09 17:34:39 +05:30

payment_entry_deduction

Editable unallocated amount in pe (#13130)

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

payment_entry_reference

Update payment_entry_reference.json

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

payment_gateway_account

Removed Administrator role from Doctypes

2016-07-25 11:39:23 +05:30

payment_reconciliation

Payment reco auto allocation and maintain same order of records (#12963)

2018-02-16 13:14:20 +05:30

payment_reconciliation_invoice

[fix] make grids editable

2016-07-11 13:01:58 +05:30

payment_reconciliation_payment

[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568

2017-01-30 13:22:51 +05:30

payment_request

Fixed merge conflict

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

payment_schedule

[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243)

2018-03-09 12:23:53 +05:30

payment_term

[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243)

2018-03-09 12:23:53 +05:30

payment_terms_template

[fix] enable rename for payment terms and payment term template

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

payment_terms_template_detail

[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243)

2018-03-09 12:23:53 +05:30

period_closing_voucher

remove erroneous column breaks (#11522)

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

pos_customer_group

Added item groups, customer groups in the POS profile.

2016-11-18 15:32:48 +05:30

pos_item_group

Added item groups, customer groups in the POS profile.

2016-11-18 15:32:48 +05:30

pos_profile

self.assertEqual

2018-02-28 21:13:51 +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

self.assertEqual

2018-02-28 21:13:51 +05:30

purchase_invoice

self.assertEqual

2018-02-28 21:13:51 +05:30

purchase_invoice_advance

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

purchase_invoice_item

Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043)

2018-03-07 15:39:40 +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

[WIP] Process Payroll Changes

2016-09-28 15:14:41 +05:30

sales_invoice

Fixed merge conflict

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

sales_invoice_advance

Coded column deleted, column added from UI

2016-08-26 14:32:38 +05:30

sales_invoice_item

Rearranged fields due to merge conflict messup

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

sales_invoice_payment

Bank POS transactions in bank reconciliation (#13225)

2018-03-08 16:22:39 +05:30

sales_invoice_timesheet

Added fields in global search

2017-02-20 13:38:31 +05:30

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

share_balance

Shareholder and related doctypes (#12215)

2018-02-12 11:32:47 +05:30

share_transfer

Fixed translations and tests (#12900)

2018-02-14 17:44:06 +05:30

share_type

Shareholder and related doctypes (#12215)

2018-02-12 11:32:47 +05:30

shareholder

Fixed translations and tests (#12900)

2018-02-14 17:44:06 +05:30

shipping_rule

Use range instead xrange (#13128)

2018-02-28 16:12:51 +05:30

shipping_rule_condition

[fix] make grids editable

2016-07-11 13:01:58 +05:30

shipping_rule_country

[fix] make grids editable

2016-07-11 13:01:58 +05:30

subscription

self.assertEqual

2018-02-28 21:13:51 +05:30

tax_rule

[FIX] use text_type instead of unicode, use cmp from past.builtins

2018-03-08 12:55:41 +05:30

__init__.py

…