Saurabh 892a7a6980 resolved merge conflicts

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

..

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

Lint and fix JS files

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

bank_reconciliation

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

2017-08-28 11:11:36 +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

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

Lint and fix JS files

2017-05-30 12:54:42 +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

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

Warehouse Account Linking (#9292)

2017-06-15 11:09:27 +05:30

mode_of_payment_account

[fix] make grids editable

2016-07-11 13:01:58 +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

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

[fix] make grids editable

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

payment_entry

Fixes for travis (#12161)

2017-12-26 17:50:34 +05:30

payment_entry_deduction

[fix] make grids editable

2016-07-11 13:01:58 +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

Lint and fix JS files

2017-05-30 12:54:42 +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

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

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

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

Removed naming series from set_only_once in pos profile

2018-01-03 14:03:53 +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

resolved merge conflicts

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

purchase_invoice_advance

Coded column deleted, column added from UI

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

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

[WIP] Process Payroll Changes

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

sales_invoice

Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382)

2018-01-09 10:58: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

[enhance] Provision to set default mode of payment for the POS in POS profile

2017-07-27 19:17:05 +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

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

[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

[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

…