Rohit Waghchaure
02ae934d5c
feat: added cost center in the opening invoice creation tool
2019-06-13 12:00:30 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards
...
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
...
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b
fix: requested changes
2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
...
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:15:43 +05:30
Deepesh Garg
ebeafa55ca
fix: Total Amount fix in journal entry ( #17880 )
2019-06-10 17:42:52 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Anurag Mishra
fd19678bc7
fix: show cost center in print fromat of report trial balance
2019-06-06 18:37:10 +05:30
Prasann Shah
829172c267
[Add] GSTIN filters in hsn wise summary and itemised reports
2019-06-06 12:08:09 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print ( #17860 )
2019-06-05 20:29:24 +05:30
Aditya Hase
811bed32c1
fix(naming): Limit number of docs to be renamed to 50000 per doctype ( #17827 )
...
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error
This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Mangesh-Khairnar
da2e009990
fix(payment-order): filter already created payment entries ( #17843 )
2019-06-05 10:22:05 +05:30
deepeshgarg007
1831844fcf
fix: Dashboard for cost center
2019-06-03 21:53:58 +05:30
Rohit Waghchaure
8309582cca
fix: report Payment Period Based On Invoice Date not working
2019-06-03 18:23:54 +05:30
deepeshgarg007
290847df46
fix: Fixes in accounting doctype dashboards
2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1
fix: Remove diemnsion from value list if present
2019-06-01 23:26:42 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785
fix: Update function name
2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-06-01 22:57:51 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Rohit Waghchaure
840244c562
fix: pricing rule is applying on the incorrect item
2019-05-31 12:16:35 +05:30
deepeshgarg007
480586152b
fix: Label translations
2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70
fix: Add translations for missing labels in AR report
2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d
fix: pricing rule not exists issue
2019-05-30 22:24:24 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
deepeshgarg007
a9b2e4e4a8
fix: White space in subscription plan dashboard
2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754
fix: Tax category dashboard
2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596
fix: Dashboards for doctypes in accounting modules
2019-05-30 11:53:12 +05:30
deepeshgarg007
c97c7c51a9
fix: Test cases for accounting dimension
2019-05-28 18:51:10 +05:30
deepeshgarg007
233b88dc52
fix: Test case fixes
2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4
fix: Remove print statements
2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
rohitwaghchaure
0c2e3c77a3
fix: range 4 for ageing filter added in the AP/AR report ( #17715 )
2019-05-23 15:27:47 +05:30
Saurabh
ba04c3e5bb
fix: table name alias ( #17706 )
2019-05-23 14:16:56 +05:30
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
deepeshgarg007
ff717a7c16
fix: List view button for dimensions
2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
...
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716
feat(Communication): Move Timeline DocType and Name to Dynamic Links ( #17593 )
...
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Rohit Waghchaure
97d2a46052
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:28:57 +05:30
deepeshgarg007
4541605e27
fix: Test Case for accounting dimension
2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e
fix: Rename function in accounting dimension
2019-05-19 11:13:21 +05:30
deepeshgarg007
3d11ac0e75
fix: Accounting dimensions for child tables
2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017
fix: Ability to disable dimensions
2019-05-18 23:47:42 +05:30
Anurag Mishra
fc86df6453
fix: Allow return if delivery note or sales order is required in selling settings(v12) ( #17631 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:03:08 +05:30
deepeshgarg007
a4c9134d33
fix: Inactive Sales Item report fixes
2019-05-17 16:19:15 +05:30
deepeshgarg007
705c03c093
fix: Added dashboard and module links for accounting dimensions
2019-05-17 10:23:00 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev
...
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
Nabin Hait
ab1c43dbee
fix: To allow creation of sales invoice without customer
2019-05-16 13:45:36 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766
fix: Create property setter for budget if dimension is created
2019-05-15 12:20:37 +05:30
Mohamed Al Zubaidi
4c0f754a96
Fix typos ( #17601 )
2019-05-15 11:38:56 +05:30
rohitwaghchaure
32d91b2c00
fix: not able to create the sales invoice without item code ( #17612 )
2019-05-15 07:41:44 +05:30
Mangesh-Khairnar
cf71a84976
style: formatting changes
2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736
fix: reload doc on generation of text file
2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6
feat: add account field in payment order
2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
d9140dc772
feat: add party bank account field
2019-05-14 18:28:24 +05:30
deepeshgarg007
60f4dd0736
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-14 15:51:12 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216
fix: Commified function to get dimensions
2019-05-14 08:50:45 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
...
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
deepeshgarg007
0c874d915b
fix: Indentation fixes
2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63
fix: Show all territories and items in inactive sales item report
2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1
fix: Added dimensions in financial reports and general ledger
2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
cd4289e10e
feat: remove button on import of an order
2019-05-11 20:04:03 +05:30
Suraj Shetty
b68ae15dec
fix: Check permissions before renaming the account
2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05
fix: Show "Merge Account" button only to users with write access
2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382
fix: test cases
2019-05-10 14:31:07 +05:30
deepeshgarg007
9a05ce10d9
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-09 14:43:45 +05:30
Mangesh-Khairnar
644e181729
feat: remove first row if empty
2019-05-08 16:17:31 +05:30
Mangesh-Khairnar
3ca8976037
feat: add validation for fetching doc status
2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805
feat: add status field to create payment order
2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858
feat: assign pe status on creation of payment order
2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf
fix: display generate txt on submission
2019-05-08 15:58:26 +05:30
Rohit Waghchaure
7bee502d72
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d
feat: Get invoiced item's gross margin using API
2019-05-08 15:38:05 +05:30
Mangesh-Khairnar
b8d0dec7f5
feat: filter bank from company account
2019-05-07 11:29:20 +05:30
Mangesh-Khairnar
e8bea2e936
feat: set payment order type on mapping
2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce
feat: show generate txt button for payment entry
2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
525d8cefc1
fix: post process mapping
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b
feat: generate file name
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b
feat: check bulk update option
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8
feat: add advice row
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb
fix: pass account paid information to postprocess
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2
feat: add payment entry field
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364
perf: improve mapping function speed
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478
feat: add generate txt file button for india region
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c
feat: add mapping logic for creating payment order
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189
feat: create payment order from payment entry
2019-05-05 22:37:20 +05:30
Himanshu
5cf12a4640
fix(Purchase Order): fetch payment terms ( #17121 )
...
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
2019-05-04 22:37:35 +05:30
deepeshgarg007
b4ad5c0158
feat: Ability to add custom dimensions
2019-05-04 20:29:21 +05:30
deepeshgarg007
6c6b24011f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop
2019-05-02 23:03:59 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev
2019-05-02 12:01:46 +05:30
Rushabh Mehta
27a30c842d
fix: simplify sort condition
2019-05-02 09:23:56 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting
2019-05-02 00:58:56 +05:30
Nabin Hait
9d04b67f46
fix: Validate parent account of child company while creating new account based on parent company
2019-05-01 20:26:36 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
deepeshgarg007
1cfe96193f
Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop
2019-05-01 18:14:07 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
...
fix: Always fetch exchange rate from ref document
2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc
...
fix: Python 3 compatibility fixes
2019-05-01 16:45:11 +05:30
Nabin Hait
6d9334810e
fix: reverted fetch from as the field does not exists for some ref doctypes
2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0
fix: Always fetch exchange rate from ref document
2019-05-01 15:37:03 +05:30
deepeshgarg007
db999e293b
fix: Rename Inactive Items report to Inactive Sales Item
2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11
fix(minor): chart of accounts sorting and message
2019-05-01 13:53:05 +05:30
Nabin Hait
316c3b3f9d
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:34:17 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc
2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c
fix: Python 3 compatibility fixes
...
import reduce from functools
Undefined variable
2019-05-01 11:52:37 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
...
fix: allow_import_of_bank_account_by_account_manager
2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values
...
fix: show only party_type doctypes in Party Type field of bank account
2019-05-01 11:15:02 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts ( #17077 )
...
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
ashish-greycube
e4e8197f46
codacy review
2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03
fix : allow_import_of_bank_account_by_account_manager
2019-04-26 12:42:14 +05:30
ashish-greycube
467609b193
show only party_type doctypes in Party Type field of bank account
2019-04-26 11:35:04 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po
...
feat: Automatic inter company Sales and Purchase order
2019-04-26 00:24:08 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
...
fix: Trial balance finance book issue
2019-04-25 20:34:38 +05:30
Rohit Waghchaure
c181064782
fix: Trial balance finance book issue
2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8
fix: Don't allocate advance if pos
2019-04-25 17:49:38 +05:30
deepeshgarg007
f34e4f0e36
fix: Test case for inter-company-transaction
2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Nabin Hait
aa028d7856
fix: don't allocate advances if POS
2019-04-23 21:44:21 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes
...
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Saif Ur Rehman
a216844d2c
fix: Set Allocate Advance Automatically disabled by default
2019-04-22 12:10:40 +05:00
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes ( #17242 )
...
- Rename Server to Jinja
- Rename Js to JS
2019-04-22 12:08:18 +05:30
Nabin Hait
d21bacfc21
fix: Total row alignment in AR report
2019-04-20 10:58:58 +05:30
Nabin Hait
c8b1351e87
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes
...
fix: Close loan considering latest invoice outstanding balance
2019-04-19 21:27:02 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes
...
Invoice discounting fixes
2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd
fix: Close loan considering latest inv outstanding balance
2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7
fix: test cases
2019-04-19 15:10:02 +05:30
Prasad R
e1a6022c8c
fix: Allow system manager to access share ledger
2019-04-19 10:57:21 +05:30
Rohit Waghchaure
376db4f6b7
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger
2019-04-18 22:06:22 +05:30
Nabin Hait
c99c712913
fix: Validate and update invoice discounting status on JE submit/cancel
2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf
fix: Don't fetch already discounted invoice
2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2
fix: Added invoice discounting dashboard
2019-04-18 14:47:44 +05:30
Rohit Waghchaure
7aee809571
fix: If finance book filter is not set then show all the entries
2019-04-16 19:35:18 +05:30
Rushabh Mehta
59c5a16037
fix(account_balance_timeline): remove unused import
2019-04-16 15:11:45 +05:30
Rushabh Mehta
1c2eb51a91
fix(api)
2019-04-16 11:12:34 +05:30
Rushabh Mehta
6dff8038e6
fix(account_balance_timeline)
2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d
fix(account_balance_timeline)
2019-04-16 09:33:21 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting
...
Invoice Discounting
2019-04-15 21:14:19 +05:30
Nabin Hait
076cc38c29
fix: Outstanding amount on making payment against discounted invoice
2019-04-15 18:42:10 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor
...
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43
Fixed merge conflict
2019-04-15 16:16:25 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix
...
fix: handle for party type member in payment entry (v12)
2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
...
feat: Added bank account no in bank reconcilliation
2019-04-14 16:10:19 +05:30
Anurag Mishra
95714297a4
fix: handle for party type member in payment entry
2019-04-12 15:03:46 +05:30
Nabin Hait
165e92ad5b
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
...
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-12 11:02:37 +05:30
Rohit Waghchaure
72cc37e8da
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-11 18:35:15 +05:30
Rushabh Mehta
d625c32ab1
fix(dashboard): for frappe updates, and a new splash logo
2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
...
Feature: Purchase order on hold
2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
Anurag Mishra
4c29d80cf1
fix: minor fixes
2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3
fix: start date and loan period should be mandatory
2019-04-11 11:08:07 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
...
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Rohit Waghchaure
49907e746b
fix: test cases
2019-04-10 17:33:32 +05:30
Rohit Waghchaure
b286fc99b8
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-10 16:16:30 +05:30
Rohit Waghchaure
30fda3ee54
feat: Added bank account no in bank reconcilliation
2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4
fix(dashboard): as per new features
2019-04-09 18:38:03 +05:30
Nabin Hait
1245139c51
Merge branch 'develop' into invoice-d
2019-04-09 15:27:13 +05:30
Anurag Mishra
67e6da2086
fix: Removed Extra page on generating pdf in print formats
2019-04-09 15:19:05 +05:30
Anurag Mishra
ef11d378d4
fix: UI on generating pdf in print format
2019-04-09 15:19:05 +05:30
Anurag Mishra
ed82e8ba3b
fix: removed before from accounts_controlle.pyr and fetch the gl from frontend
2019-04-09 15:19:05 +05:30
Anurag Mishra
b62cfffdea
fix: Print Auditing print format
2019-04-09 15:19:05 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
Rushabh Mehta
0d3986c9f6
fix(dashboard): account timeline for balance sheet accounts
2019-04-09 11:36:41 +05:30
Rushabh Mehta
da3f07221c
fix(dashboard): accounting timeline query fix
2019-04-08 19:38:55 +05:30
Rushabh Mehta
3882a41c51
fix(dashboard): simpler way to get account timeline from first principles
2019-04-08 19:05:12 +05:30
Mangesh-Khairnar
1934a76cd8
feat: Add status field in multiple reports linked with purchase order and sales order creation ( #17107 )
...
* enhancement: add status field in ordered itemd to be delivered
* enhancement: add status field in purchase order itemd to be received
* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
...
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17
Added test cases
2019-04-06 12:29:05 +05:30
Nabin Hait
374b85b38e
Merge pull request #17140 from hrwX/pe_supp_inv_v12
...
fix(Payment Entry): Return Bill No on for Payment Entry
2019-04-05 15:59:58 +05:30
Mangesh-Khairnar
3d667b4c94
Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold
2019-04-05 12:11:26 +05:30
Himanshu Warekar
b30f584410
fix: return bill_no
2019-04-04 19:55:13 +05:30
Himanshu Warekar
6443d7dd10
refactor: declare bill_on at function start
2019-04-04 19:54:23 +05:30
Himanshu Warekar
ad32324c4c
fix: get bill_no
2019-04-04 19:50:23 +05:30
Rohit Waghchaure
55d3bcac37
fix: not able to change pos profile
2019-04-04 15:26:00 +05:30
Nabin Hait
e0a9835f30
Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix
...
fix(Party Ledger Summary): Show all adjustment entries as columns
2019-04-04 11:45:36 +05:30
Nabin Hait
0747273ea4
Merge pull request #17028 from sagarvora/field_order
...
fix(accounts): dependent field should be displayed after source link field
2019-04-04 11:45:01 +05:30
Nabin Hait
94c822f5f0
Merge pull request #17022 from hrwX/cost_center_fix
...
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:44 +05:30
Nabin Hait
9eeb3715f0
Merge pull request #16992 from hrwX/cost_center
...
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:35 +05:30
Nabin Hait
f4ae29320f
Merge pull request #17087 from deepeshgarg007/payment_entry
...
Party type validation in payment entry
2019-04-04 11:39:00 +05:30
Nabin Hait
9ee417888e
Merge pull request #17092 from nabinhait/ar-ap-print
...
fix: Show Sales Person in AR/AP print is optional
2019-04-04 11:02:26 +05:30
Nabin Hait
2092a8b1cf
Merge pull request #17100 from nabinhait/gl-entry-precision
...
fix: Validate gl entry debit/credit as per field's precision
2019-04-04 10:59:06 +05:30
Nabin Hait
b1f3f04d71
fix: Validate gl entry debit/credit as per field's precision
2019-04-03 12:30:25 +05:30
deepeshgarg007
5ad7b655cf
fix: Divide by zero exception handling
2019-04-03 09:11:03 +05:30
Nabin Hait
b4263a41c6
fix: Validate gl entry debit/credit as per field's precision
2019-04-01 19:11:34 +05:30
Rohit Waghchaure
6f3f2185ab
fix: pos takes more time to add an item in the cart
2019-04-01 16:45:47 +05:30
Nabin Hait
51d08786dc
fix: Show Sales Person in AR/AP print is optional
2019-04-01 16:24:23 +05:30
deepeshgarg007
4614eb219b
Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry
2019-04-01 11:48:07 +05:30
Nabin Hait
093f4c529b
Merge pull request #17055 from deepeshgarg007/tds
...
fix: TDS payable monthly report fix
2019-04-01 11:12:45 +05:30
Rohit Waghchaure
614f5adf6d
fix: code cleanup
2019-04-01 10:53:08 +05:30
Rohit Waghchaure
5fa9a7a1b4
feat: unlink advance payment entry on cancelation of order
2019-04-01 00:40:38 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
deepeshgarg007
d0b98d74de
fix: Allow doctype only in party account types
2019-03-30 19:44:31 +05:30
rohitwaghchaure
43d79eaa92
Merge pull request #17057 from hrwX/bank_reconciliation_fix
...
fix(Bank Reconciliation): get credit and debit as float and not string
2019-03-30 10:16:12 +05:30
rohitwaghchaure
9d159be826
Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account
...
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:14:19 +05:30
Rohit Waghchaure
cc59fcd75e
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-29 19:23:04 +05:30
Rohit Waghchaure
fd2b1385a3
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-29 19:20:47 +05:30
Himanshu Warekar
95003cbbca
fix: get credit and debit as float and not string
2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379
fix: get credit and debit in float and not string
2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e
fix: fetch account only if available
2019-03-29 16:19:04 +05:30
Nabin Hait
7b2c52b6f2
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13
Merge branch 'deferred_revenue' into hotfix
2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700
fix(accounts): Indentation
2019-03-29 13:25:11 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue
...
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue
...
fix: accounts receivable summary
2019-03-29 09:28:21 +05:30
Rohit Waghchaure
9da14747aa
fix: accounts receivable summary
2019-03-29 09:26:40 +05:30
Rohit Waghchaure
573d1dd31f
fix: bank reconciliation not working
2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7
fix(accounts): codacy fixes
2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6
Refactored deferred revenue booking logic
2019-03-28 19:43:02 +05:30
Rohit Waghchaure
d5e45481cd
fix: code cleanup
2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
...
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:51:57 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Faris Ansari
8fdcda7d6d
Merge pull request #16411 from adityahase/dashboard
...
feat: Accounting Dashboard
2019-03-28 11:16:41 +05:30
Suraj Shetty
abc2a64d5e
fix: Commonify get gl_entry code by moving it to accounts_controller
2019-03-27 20:25:18 +05:30
Sagar Vora
d20ecb0a71
fix(accounts): dependent field should be displayed after source link field
2019-03-27 17:42:42 +05:30
rohitwaghchaure
4510e3a836
Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making
...
fix: offline pos, duplicate records creating
2019-03-26 22:49:42 +05:30
Himanshu Warekar
1b05ed042f
Cost Center as per company
2019-03-26 20:25:54 +05:30
Rohit Waghchaure
1df62097f6
fix: offline pos, duplicate records creating
2019-03-26 19:15:53 +05:30
Nabin Hait
411f66a177
Merge pull request #17006 from deepeshgarg007/account-fix
...
fix: Ignore root company validation setting in company master
2019-03-26 17:49:21 +05:30
deepeshgarg007
3eeb1cacb0
fix: Change name to Allow Account Creation against Child Company in company master
2019-03-26 17:18:06 +05:30
Anurag Mishra
10c1db1b28
fix: removed empty row on getting invoices
2019-03-26 16:30:31 +05:30
Anurag Mishra
ca4117e652
feat: seting status and indicators on list view
2019-03-26 16:03:00 +05:30
Anurag Mishra
702c6e00da
fix: route on loan Disbursement and Closing
2019-03-26 16:00:43 +05:30
deepeshgarg007
c45c2bdabb
fix: Missing semicolon
2019-03-26 15:38:38 +05:30
deepeshgarg007
7aefc15352
fix: Allow to add child account if ignore validation checked
2019-03-26 15:09:29 +05:30
Anurag Mishra
78903b1e57
fix: test for invoice payment by setting default Bank Account
2019-03-26 12:59:30 +05:30
Rohit Waghchaure
c7b916ac46
fix: test cases
2019-03-26 12:52:32 +05:30
Rohit Waghchaure
4389cf0c48
feat: provision to make Maintenance Schedule from sales invoice
2019-03-26 12:52:32 +05:30
deepeshgarg007
1c785a99b1
fix: Added setting in company to ignore root company validation
2019-03-25 22:32:29 +05:30
Mangesh-Khairnar
324e06cba0
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-03-25 18:51:13 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
Faris Ansari
843b7f6dd5
fix: Reorder Currency column to fix print ( #17008 )
...
Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.
2019-03-25 15:50:36 +05:30
Rohit Waghchaure
4ed7d035cb
fix: incorrect paid amount in accounts receivable summary report
2019-03-25 15:37:25 +05:30
Rohit Waghchaure
4792a84b5f
fix: rename pricing rule child doctype names
2019-03-25 14:28:08 +05:30
rohitwaghchaure
794b6b6c0d
Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix
...
fix: Show consolidated amount of payment entries in Bank reconciliation
2019-03-25 14:11:47 +05:30
deepeshgarg007
4f9ac0ad55
fix: Child company account currency fix
2019-03-25 11:39:25 +05:30
Suraj Shetty
67876d1026
fix: Show amount of entry based on diff of credit and debit
2019-03-25 11:19:07 +05:30
Himanshu Warekar
92593bb717
fix: Cost center as per company
2019-03-23 19:46:31 +05:30
Frappe Bot
b07a5d449d
Merge branch 'master' into develop
2019-03-23 07:25:03 +00:00
Zarrar
963d62b701
feat: Chart of Accounts Importer ( #16623 )
...
* bare doctype created for COA utility
* improvise doctype's design
* validation to check no transaction exist for the company
* download file and import coa - client side logic added
* download csv template to create custom chart
* read the custom csv uploaded and parse it to appropriate format
* convert list of list to nested tree structure
* preview the uploaded chart before actual import
* toggle field based on necessity
* tweak create_charts and build_json logic to incorporate COA Import utility
* code cleanify and validation call added
* code enhancement for flexibility and validation added
* show import button only if data is validated
* unset existing data and load new accounts
* disable coa fields if parent_company set, minor improv
* file api fix
* added progress bar
* codacy fixes
* fix: Add account number in template
* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Saif Ur Rehman
7d1c1aa28f
fix(Party Ledger Summary): Show all adjustment entries as columns
...
Consider only Income Account or Expense Account account type for adjustment amounts
Check if GL Entry's is_opening == "Yes"
2019-03-22 17:18:32 +05:00
rohitwaghchaure
56e491bccd
Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields
...
feat: enabled allow on submit for action fields in the Budget
2019-03-22 15:34:41 +05:30
Rushabh Mehta
da87a491ab
Merge pull request #16816 from finbyz/hotfix
...
fix: Rounding adjustment in Rounded Total
2019-03-22 12:51:09 +05:30
Rushabh Mehta
7678c7b179
Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt
...
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-22 12:47:06 +05:30
Rushabh Mehta
9c43c8f00b
Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12
...
feat: Brand Item Defaults (v12)
2019-03-22 12:46:04 +05:30
Rushabh Mehta
7defd6f3b5
Merge pull request #16749 from Alchez/hotfix-cancelled-payments
...
fix(payments): Only check for Draft or Submitted payments while cancelling payment requests
2019-03-22 12:43:52 +05:30
Rohit Waghchaure
9c214b6129
feat: enabled allow on submit for action fields in the Budget
2019-03-22 12:08:09 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
rohitwaghchaure
f45db71ba2
Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working
...
fix: Cost center from PO to PI is not mapping
2019-03-20 13:40:05 +05:30
Rohit Waghchaure
f288866130
fix: Cost center from PO to PI is not mapping
2019-03-20 13:34:28 +05:30
Rohit Waghchaure
a322687897
fix: Accounts receivable report, remarks showing in the sales person column
2019-03-19 18:10:08 +05:30
rohitwaghchaure
40046721b2
Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors
...
fix: POS, cost center not added against debtors
2019-03-19 16:38:07 +05:30
Rohit Waghchaure
8808a3fc8e
fix: POS, cost center not added against debtors
2019-03-19 15:32:05 +05:30
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
...
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a
fix: advance amount is not calculating properly
2019-03-19 15:06:01 +05:30
Rohit Waghchaure
8bfe330b37
feat: pricing rule enhancements
2019-03-19 12:44:30 +05:30
Himanshu Warekar
642a5b69f5
fix: change customer to supplier
2019-03-18 21:53:33 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool
...
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
2019-03-18 15:48:55 +05:30
Himanshu
ac199580af
fix(Customer Ledger): ambiguous error in where clause ( #16914 )
...
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
2019-03-18 15:44:54 +05:30
Rohit Waghchaure
d4e4316d0b
fix: test cases and codacy
2019-03-18 14:18:49 +05:30
Zlash65
01086ff60c
codacy fixes
2019-03-18 12:50:29 +05:30
Zlash65
11bba571af
test case added to check account syncing
2019-03-18 12:50:29 +05:30
Zlash65
f71cb8dc6d
fix: return if no descendants found
2019-03-18 12:50:28 +05:30
Zlash65
d787ef8b8e
feat: sync account created for a group company to all its descendants
2019-03-18 12:50:28 +05:30
Zlash65
88c990901d
fix: added validation to if account is being added to child company
2019-03-18 12:50:28 +05:30
Zlash65
0407bf1e00
fix: override primary action button, change filter to root company
2019-03-18 12:50:27 +05:30
Zlash65
2def228da8
feat: allow adding account only if topmost parent company
...
- hidden filter for Parent Company added
- Add button overriden with new condition
2019-03-18 12:50:27 +05:30
Himanshu Warekar
aa03ea2a56
disbale pl check for Sales and Purchase Invoice
2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Mangesh-Khairnar
a1afd78723
feat: add validation for on hold purchase order
2019-03-18 12:14:25 +05:30
Aditya Hase
42640cb908
fix(dashboard): Add configuration to chart source
2019-03-18 11:18:43 +05:30