Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
4ae089d6a1
Provision to deduct TDS on Advance
2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18
tds fixed for PI
2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group
2018-05-14 20:39:01 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period
...
Accounting Period
2018-05-14 20:33:09 +05:30
Rohit Waghchaure
16bc853f6a
Reschedule for future depreciations and booked difference amount in accumulated depreciation account
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a
Commonify get_asset_category_account and get_fixed_asset_account method
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191
Added default asset accounts in COA, CWIP account in asset category
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
af05995418
Asset accounting
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4
Added account fields in the company, fixes in auto creation of the asset from PR
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188
Asset linked to purchase receipt and serial no
2018-05-14 19:07:39 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number
...
Cost center number
2018-05-14 18:35:38 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop
...
Bank Statement Import
2018-05-14 18:27:53 +05:30
Gaurav Naik
21b2df41ac
[Fix] len() instead of .length
2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a
[WIP] Accounting Period Test cases
2018-05-14 18:11:09 +05:30
Gaurav Naik
52571a80da
Bootstrap documents for closing (js)
2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5
Bootstrap documents for closing
2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c
[Fix] Indentation for accounting_period overlap
2018-05-14 18:02:24 +05:30
Zlash65
890707854d
config/utility level changes
2018-05-14 11:45:38 +05:30
Zlash65
0a50554417
doctype level changes
2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18
json level changes
2018-05-14 11:45:38 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue
...
Fixed spelling
2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe
Fixed spelling
2018-05-13 16:17:18 +05:30
Gaurav Naik
9502476c67
Accounting Period overlap validation
2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226
Accounting Period autoname
2018-05-11 07:52:50 +05:30
Nabin Hait
b9fed2aa38
Removed company from Finance Book and related changes
2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f
Added finance book filtering logic to financial_statements.py
2018-05-09 15:03:40 +05:30
Gaurav Naik
40559d5f5c
Added finance book filter logic to ReceivablePayable
2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51
Added finance book filter in accounts_receivable.js
2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f
Added finance book filter in accounts_payable.js
2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c
Added finance book filter logic in general_ledger.py
2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d
Added finance book filter to General Ledger
2018-05-09 14:57:36 +05:30
Gaurav Naik
a6d3cbfbc5
Added finance book field to GL Entry doctype
2018-05-09 14:56:52 +05:30
Gaurav Naik
30f9e0f547
Set finance book in make_gl_entries
2018-05-09 14:56:39 +05:30
Gaurav Naik
a948726ddd
Added Finance Book doctype
2018-05-09 14:53:51 +05:30
Manas Solanki
fbe548e4be
[Enterprise] Bank Guarantee Enhancements ( #13960 )
2018-05-09 14:49:53 +05:30
Nabin Hait
b2800eeb2a
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-05-08 16:34:35 +05:30
Nabin Hait
9036b9ee85
Merge branch 'master' into develop
2018-05-08 16:31:42 +05:30
Zarrar
f2df7f32fa
update subscription to auto_repeat across dashboards ( #13956 )
2018-05-08 16:06:36 +05:30
Saurabh
b36517158b
[fix] cheque print template coordinates ( #13959 )
2018-05-08 15:23:29 +05:30
Nabin Hait
330fae8652
minor fixes
2018-05-07 16:11:35 +05:30
Nabin Hait
fdc67a577f
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
2018-05-07 13:12:16 +05:30
Rah Yuliantoro
b3882cacd9
update coa and company default ( #13937 )
...
* Update standard_chart_of_accounts.py
adding account for employee advances
* Update standard_chart_of_accounts_with_account_number.py
adding account for employee advances
* Update company.py
adding accounts for default fields in company doctypes
* Update company.py
Missing some default accounts for fields in company doctype
2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation ( #13932 )
...
* Added account data on child table
* Added Journal Entry button and functionality
* Add docs
* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Nabin Hait
338e1b6e91
Merge branch 'master' into develop
2018-05-05 14:33:35 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py
2018-05-05 14:32:31 +05:30
Nabin Hait
4bbe5fbefc
Fixes related to auto repeat
2018-05-05 12:32:59 +05:30
Nabin Hait
abd0325acd
Fixed merge conflict
2018-05-05 12:19:14 +05:30
