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 |
|
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
|
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 |
|