Nabin Hait a804d6d487 Fixed merge conflict

2018-08-29 13:34:58 +05:30

..

accounts_payable

Trial balance and payable accounts reports and sales return fixes (#15000)

2018-08-20 17:58:28 +05:30

accounts_payable_summary

Trial balance and payable accounts reports and sales return fixes (#15000)

2018-08-20 17:58:28 +05:30

accounts_receivable

Fixed merge conflict

2018-08-29 13:34:58 +05:30

accounts_receivable_summary

ran 2to3, evaluation (#13499)

2018-05-23 11:31:24 +05:30

asset_depreciation_ledger

Changed condition of finance book in reports

2018-05-18 09:10:07 +05:30

asset_depreciations_and_balances

To fixed if if no schedule and disposal is NOT within the period. (#14637)

2018-06-25 15:05:26 +05:30

balance_sheet

optimize(various)

2018-08-08 16:37:31 +05:30

bank_clearance_summary

Lint and fix JS files

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

bank_reconciliation_statement

fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106)

2018-08-14 10:56:18 +05:30

budget_variance_report

Resolved merge conflicts

2018-07-06 13:18:44 +05:30

cash_flow

optimize(various)

2018-08-08 16:37:31 +05:30

consolidated_financial_statement

Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report

2018-08-15 19:41:41 +05:30

delivered_items_to_be_billed

Nestedset model fixes for changing parent and renaming (#11467)

2017-11-10 11:12:43 +05:30

general_ledger

[Enhance] Multiselect for Cost Center and Project (#15208)

2018-08-27 12:08:53 +05:30

gross_profit

optimize(various)

2018-08-08 16:37:31 +05:30

item_wise_purchase_register

Display rate on the basis of stock UOM (#14246)

2018-05-28 11:50:28 +05:30

item_wise_sales_register

Resolved merge conflicts

2018-08-07 13:01:11 +05:30

ordered_items_to_be_billed

Nestedset model fixes for changing parent and renaming (#11467)

2017-11-10 11:12:43 +05:30

payment_period_based_on_invoice_date

Query report print (#14935)

2018-07-18 09:28:44 +05:30

profit_and_loss_statement

[Enhance] Multiselect for Cost Center and Project (#15208)

2018-08-27 12:08:53 +05:30

profitability_analysis

optimize(various)

2018-08-08 16:37:31 +05:30

purchase_invoice_trends

Add total row in all trends reports (#13010)

2018-02-21 14:46:07 +05:30

purchase_order_items_to_be_billed

added roles in the report

2017-03-06 14:26:09 +05:30

purchase_register

optimize(various)

2018-08-08 16:37:31 +05:30

received_items_to_be_billed

[fix] Column Heading in received item to be billed report (#12083)

2017-12-19 11:23:34 +05:30

sales_invoice_trends

Add total row in all trends reports (#13010)

2018-02-21 14:46:07 +05:30

sales_partners_commission

Fix english typo in source code

2018-01-06 04:04:06 +01:00

sales_payment_summary

POS closing voucher (#14270)

2018-06-06 10:22:13 +05:30

sales_register

optimize(various)

2018-08-08 16:37:31 +05:30

share_balance

Shareholder and related doctypes (#12215)

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

share_ledger

Shareholder and related doctypes (#12215)

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

trial_balance

Trial balance and payable accounts reports and sales return fixes (#15000)

2018-08-20 17:58:28 +05:30

trial_balance_for_party

optimize(various)

2018-08-08 16:37:31 +05:30

unpaid_expense_claim

added roles in the report

2017-03-06 14:26:09 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

financial_statements.html

fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106)

2018-08-14 10:56:18 +05:30

financial_statements.py

[Enhance] Multiselect for Cost Center and Project (#15208)

2018-08-27 12:08:53 +05:30

non_billed_report.py

[Enhancement] Consolidated billed report, changed type from query to script

2017-01-02 16:20:43 +05:30

utils.py

rounding off fixes and conversion fix (#15140)

2018-08-14 16:28:14 +05:30