Saqib
60212ff9b9
fix: multiple pos issues ( #23347 )
...
* fix: point of sale search
* fix: pos fetches expired serial nos
* fix: pos doesn't refresh on route change
* fix: opening balances not set in opening entry
* fix: remove debug statement
* fix: invalid query if no serial no is reserved by pos invoice
* chore: make new order btn primary
* chore: filter warehouse by company
* chore: add shortcuts for new order and email
* fix: cannot fetch serial no if no batch control
* chore: add shortcuts for menu items
* feat: standard keyboard shortcuts for pos page
* feat: display only items that are in stock
* fix: empty point of sale page if opening entry dialog is closed
* feat: conversion factor in pos item details
* fix: show all invalid mode of payments
* chore: show all items if allow negative stock is checked
* fix: -ve amount set when changing mode of payment
* fix: pos closing validations
* fix: test
* fix: non expired serial no fetching query
* fix: cannot dismiss pos opening creation dialog
* fix: transalation strings
* fix: msgprint to throw
* chore: use as_list in frappe.throw
* chore: clean up pos invoice.js & .py
* fix: codacy
* fix: transalation syntax
* fix: codacy
* fix: set_missing_values called twice from pos page
* fix: mode selector with double spaces
* fix: do not allow tables in pos additional fields
* fix: pos is not defined
* feat: set mode of payments for returns
* fix: remove naming series from pos profile
* fix: error message
* fix: minor bugs
* chore: re-arrange pos closing entry detail fields
* fix: sider & frappe linter
* fix: more translation strings
* fix: travis
* fix: more translation strings
* fix: sider
* fix: travis
* fix: unexpected end of string
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
Nabin Hait
da301b0b7a
fix: merge conflict
2020-10-25 13:07:59 +05:30
Nabin Hait
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 ( #23718 )
2020-10-24 22:00:32 +05:30
Marica
6f45a86920
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-23 19:56:15 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
...
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs ( #23595 )
...
* feat: opening invoice creation tool with background jobs
* fix: tests
* fix: codacy
* fix: sider
* fix: codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:32:37 +05:30
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input ( #23539 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:26:43 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Mangesh-Khairnar
675f79920e
fix: consider the existing paid payment request for phone payment channel
2020-10-23 15:41:05 +05:30
Mangesh-Khairnar
e03a02d9c0
fix: show descriptive message for missing fields
2020-10-23 13:38:55 +05:30
marination
efcc489967
fix: Cashier Closing Type Issue
2020-10-23 11:55:03 +05:30
Nabin Hait
5778595d50
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-22 21:42:54 +05:30
Mangesh-Khairnar
1a6d82a447
fix(payment-request): only consider paid transactions
2020-10-22 01:07:49 +05:30
Shivam Mishra
5e00ed926c
feat: update icons
2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Mohammad Hasnain
75ccb62d46
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 09:40:44 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mangesh-Khairnar
5c29eb08c4
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6
fix(payment gateway account): add patch to set the payment channel as email
2020-10-19 18:27:40 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults ( #23415 )
...
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date
The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
before_load(frm) {
var posting_date = $("input[data-fieldname='posting_date']")[0].value
posting_date = moment(posting_date)._d
frm.set_value('posting_date', posting_date )
}
})
```
Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-19 17:02:04 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search ( #23629 )
...
* fix(Bank Reconciliation): update/merge CR/DR journal entry search
Prior to this commit, the debit journal entry search (for
credit-side Bank Transaction entries) and the corresponding
credit journal entry search had diverged, with the latter
working but the former not working. Thus, the search for
journal entries matching a credit Bank Transaction (for the
purposes of reconciliation) was never returning any matching
journal entries, making reconciliation difficult.
To fix this, this commit not only updates the debit journal
entry search, but takes advantage of the fact that the two SQL
queries for the two sides (debit/credit) differ only by the
word "debit" or "credit," to merge the code for the two
queries, making the code more DRY and hopefully reducing the
chance of similar bugs occurring in the future.
* fix: message translation
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:49:55 +05:30
Shivam Mishra
2c2e7297ae
feat: update accounts onboarding
2020-10-19 14:44:02 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-19 11:55:12 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice ( #23680 )
...
* fix(minor): msgprint not defined in POS Invoice
* fix: translation friendly syntax
2020-10-18 19:28:26 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation
2020-10-16 18:21:09 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check
...
fix: Payment Reconciliation client side validations
2020-10-16 18:06:16 +05:30
Rohit Waghchaure
c70cc0d950
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-16 17:43:36 +05:30
rohitwaghchaure
6646c524e6
Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop
...
refactor: enabled no copy property for Supplier Invoice Date to due date validation
2020-10-16 16:45:56 +05:30
marination
b14ffc4349
fix: Missing semicolon
2020-10-16 16:04:56 +05:30
Faris Ansari
be0fcbea68
fix: Dont add Contact link if is company address
2020-10-16 15:55:25 +05:30
Faris Ansari
22bcad9dc7
fix: Cleanup code
2020-10-16 15:28:12 +05:30
Rohit Waghchaure
3cdaa92582
refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation
2020-10-16 15:26:27 +05:30
Shivam Mishra
5418818683
feat: add tour for account settings
2020-10-16 14:24:22 +05:30
marination
e9b04dc727
fix: Payment Reconciliation client side validations
2020-10-16 12:36:13 +05:30
Saqib Ansari
de505631a6
fix: codacy
2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4
fix: transalation syntax
2020-10-16 10:47:29 +05:30
Shivam Mishra
cb8457b9ae
feat: add description to Accounts onboarding
2020-10-15 13:53:12 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json ( #23644 )
...
added descriptions to fields to clarify input.
2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel
...
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30
fix: move get_shipping_address() from frappe to erpnext and fix references
2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73
fix: gettext import and changed function order in address.py
2020-10-14 19:48:57 +05:30
Abhishek Balam
6e9e7b4c7a
fix: serverside validation overrides
2020-10-14 19:31:37 +05:30
Abhishek Balam
346ca568b7
fix: set company link in address when is_your_company_address is set
2020-10-14 18:11:04 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-14 16:34:56 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction ( #23635 )
2020-10-14 15:44:30 +05:30
Marica
1cdb9b5b39
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-14 14:26:22 +05:30
marination
b5d16a82eb
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-10-14 14:05:54 +05:30
Mohammad Hasnain
dfc3993cec
chore(UAE VAT 21): rename report
2020-10-14 12:21:36 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts ( #23530 )
...
* fix: Chart of Accounts
* fix: Chart of Accounts with lower case "of"
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-14 10:29:53 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d
Merge branch 'develop' into UAE-VAT-Format
2020-10-14 00:26:57 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-13 21:42:22 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns ( #23609 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-13 21:23:26 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Mangesh-Khairnar
51228b5ee3
fix: make response handling more descriptive
2020-10-13 17:10:16 +05:30
Marica
43d3176d62
Merge branch 'develop' into patch-3
2020-10-13 17:01:18 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return
2020-10-13 16:57:11 +05:30
Marica
6f819d797b
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-13 16:54:39 +05:30
Marica
c5e139a542
fix: Travis ( #23606 )
...
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places
* fix: Item Barcode and Test
* fix: Over Receipt on subcontracting test
* fix: POS Invoice and Loyalty Program Tests
* fix: POS serialized item test and subcontracting exploded items in PO
* fix: Subcontracting test considering sourced_by_supplier items
* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters
...
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.
https://github.com/frappe/erpnext/issues/23613
2020-10-13 08:18:59 +03:00
Marica
978e16481e
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-12 21:17:22 +05:30
Anupam Kumar
71c02a6e89
Merge branch 'develop' into subscription-invoice-issue
2020-10-12 19:41:31 +05:30
Raffael Meyer
0975b961f9
Merge branch 'develop' into validate_regional_germany
2020-10-12 15:08:58 +02:00
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked ( #23593 )
...
* fix: cannot merge pos invoice if validate selling price is checked
* fix: validate selling price
* fix: test
* chore: add test
* fix: error message
2020-10-12 18:31:23 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series ( #23479 )
...
* fix: sales invoice series gets overwritten with pos invoice series
* chore: show is consolidated only if sales invoice is pos
2020-10-12 17:10:37 +05:30
Saqib
ebbe285872
feat: (report) POS Register ( #23313 )
...
* feat: pos register report
* feat: group by fields in pos register
* chore: add paid amount column
* fix: (minor) remove redundant group by label
2020-10-12 17:02:31 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set ( #23580 )
...
* Never add an asset GL entry if CWIP is not enabled
* fix: asset purchase with purchase invoice
* chore: allow enable cwip accounting only if cwip account is set
* fix: cannot create asset if cwip disabled and account not set
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation ( #23597 )
2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62
fix: Payment Schedule not fetching
2020-10-12 12:15:49 +05:30
Mohammad Hasnain
fc2ace1a31
Merge branch 'develop' into UAE-VAT-Format
2020-10-10 22:06:06 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv
...
fix: Opening Journal Entry via Data Import
2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team
...
fix: Change name of Sales Team table
2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk
...
fix: Add lower deduction certificate in desk page
2020-10-10 11:23:26 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view
...
fix: Check if list view standard filter exists in Payment Entry
2020-10-10 11:09:31 +05:30
Deepesh Garg
2676f96203
fix: Opening Journal Entry via Data Import
2020-10-09 21:58:38 +05:30
marination
07731c7735
fix: Check if list view standard filter exists in Payment Entry
2020-10-09 21:44:23 +05:30
Saqib Ansari
d927c8efba
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-09 21:00:33 +05:30
michellealva
1bc7fc41a5
fix: Change name of Sales Team table
2020-10-09 16:01:13 +05:30
Deepesh Garg
5e6ea36938
fix: Add lower deduction certificate in desk page
2020-10-08 20:32:36 +05:30
marination
4be5b5c891
fix: Handle missing Account and Item in Opening Invoice Creation Tool
2020-10-08 19:51:42 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition
...
feat(Accounts): Add Condition Field In Pricing Rule
2020-10-08 16:32:21 +05:30
Abhishek Balam
6d1af84fef
Merge branch 'develop' into budget
2020-10-08 16:23:36 +05:30
Saqib Ansari
3f28fb19aa
chore: validate is_group of child parent account before auto creating an account
2020-10-08 14:57:27 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax ( #23541 )
...
* fix: cannot merge pos invoices with inclusive tax
* fix: item rate calculation
2020-10-08 11:23:21 +05:30
michellealva
a9c2401a2d
fix: Typo in Accounts Setings
2020-10-07 15:13:57 +05:30
Abhishek Balam
937308854a
Merge branch 'develop' into pricing_rule_on_condition
2020-10-07 13:35:53 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany
2020-10-06 16:53:52 +02:00
michellealva
2e425efae8
fix: blank option in the beginning
2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e
fix(Budget): Change options in select field
2020-10-06 15:02:01 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote
2020-10-06 13:27:28 +05:30
Mangesh-Khairnar
8d54d61c28
fix: handle payment completion via payment request
2020-10-05 22:37:31 +05:30
Deepesh Garg
5bf35e465e
Merge pull request #23220 from marination/account-add-rename
...
feat: Validate and Update Child Company Accounts on Rename/Adding Account
2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c
fix: create payment entry against payment request
2020-10-04 13:01:11 +05:30
aakvatech
38ccf82604
fix: get_outstanding_invoices not ignoring the cancelled transactions
...
Added is_cancelled=0 in 2 places for get_outstanding_invoices
2020-10-03 19:41:38 +03:00
rohitwaghchaure
3c77a4697b
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report
...
fix: currency symbol in profit and loss report
2020-10-03 10:32:00 +05:30
Abhishek Balam
71c24c8a90
feat: add tests
2020-10-01 14:54:11 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py
2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493
fix: currency symbol in profit and loss report
2020-09-30 17:44:35 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance
...
fix(Accounts): Add Currency filter in Trial Balance report
2020-09-30 13:16:16 +05:30
Abhishek Balam
001e7e9df9
fix: remove default value
2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0
fix: add currency select to Trial Balance
2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc
fix: Add test
2020-09-29 18:39:45 +05:30
barredterra
81ad90c1d4
feat: validate sales invoice for germany
2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename
2020-09-29 13:18:54 +05:30
hasnain2808
a5e8e449ee
chore: Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:43:03 +05:30
hasnain2808
23c8966e81
Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:06:02 +05:30
Mangesh-Khairnar
8d12c3841f
fix: process transaction callback
2020-09-28 19:40:42 +05:30
hasnain2808
587bb05a37
feat(UAE VAT 21): Add desk page for UAE VAT 21
2020-09-28 14:52:29 +05:30
Mangesh-Khairnar
98658603dd
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-09-28 02:10:53 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
marination
8370d9b997
fix: Check Company in Payment Entry before selecting values
2020-09-24 11:51:03 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current ( #23361 )
2020-09-23 17:19:11 +05:30
Mangesh-Khairnar
4eb215badb
fix: bind callback callback for realtime event
2020-09-23 15:55:21 +05:30
Afshan
8be51e22c4
fix: escape apostrophe in cost centre and project if exist
2020-09-23 14:52:36 +05:30
marination
fd155408e5
fix: Check if account exists in parent company on rename
...
- Check if child company is dependent on parent company
- Check if account-to-be-renamed exists in parent, if yes, block
- Revised Test basd on the same
2020-09-23 14:42:10 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return
2020-09-22 15:39:25 +05:30
Mangesh-Khairnar
97ab96c8bf
fix: handle api changes from callbacks
2020-09-22 12:58:32 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) ( #23318 )
...
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-09-21 13:14:07 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable
...
fix: Cost Center filter in accounts receivable and payable report
2020-09-20 19:36:30 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set ( #23334 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 19:33:21 +05:30
Mangesh-Khairnar
a3ac4bf681
fix: create payment request via pos
2020-09-18 19:47:33 +05:30
Saqib
7126e179c3
fix: button click event not working in POS custom fields ( #23358 )
2020-09-22 16:35:11 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator ( #23350 )
...
* fix: reset owner values in doctype to Administrator
* fix: updated modified value
* fix: also fixed modified by
* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields ( #23358 )
2020-09-18 15:27:17 +05:30
Anurag Mishra
170ecdc76e
fix: No handlefor Cost centers in Accounts Receivable
2020-09-18 13:26:46 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark
...
feat: added option to add custom remarks in payment entry
2020-09-16 13:38:04 +05:30
Deepesh Garg
2f50cb3e58
fix: Supplier trigger onload
2020-09-15 15:00:32 +05:30
Anurag Mishra
9397b7f58b
fix: requested changes
2020-09-15 12:36:01 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice ( #23027 )
2020-09-15 09:44:46 +05:30
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry ( #23051 )
2020-09-14 21:12:36 +05:30
Mangesh-Khairnar
40d3add63c
feat(payment-gateway-account): add additional payment channel
2020-09-14 15:14:36 +05:30
marination
02c550c07d
fix: Redundant imports
2020-09-11 16:22:54 +05:30
Marica
4153a9f8de
Merge branch 'develop' into pr-dn-return
2020-09-11 16:10:48 +05:30
marination
9533318832
chore: Tests for Rename and Add child Account
2020-09-11 16:09:27 +05:30
Saqib
cd89994b33
fix: multiple pos issues ( #23297 )
...
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Suraj Shetty
67095d239f
fix: Custom dashboard sections
2020-09-10 17:15:52 +05:30
marination
efb211af6d
chore: Fix Received/Delivered Items to Billed Logic
2020-09-09 16:24:11 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug
...
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-08 16:59:29 +05:30
Deepesh Garg
f7731b0715
fix: TDS applicable on creating PI from get items button
2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95
fix: removed ignore permission flag
2020-09-08 12:55:42 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order
...
fix: capture advance payments in payment order
2020-09-08 09:59:47 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent
...
fix proposed by Andriesvn in bug report
closes #22180
2020-09-08 00:27:57 +01:00
Deepesh Garg
74ab1084b3
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-07 17:55:10 +05:30
Mangesh-Khairnar
7456ffca0f
fix: teardown created payment order
2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af
fix: remove unused imports
2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392
test: check payment order creation against payment entry
2020-09-04 18:55:14 +05:30
Mangesh-Khairnar
e1889d0c1b
fix(payment entry): update payment order status
2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182
fix: capture advance payments in payment order
2020-09-04 12:17:56 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter
...
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 19:22:56 +05:30
Deepesh Garg
9b681770d0
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 18:09:02 +05:30
michellealva
0857e6d669
fix: Add "Bank Clearance" and "Bank Reconciliation" in desk
2020-09-03 10:37:43 +05:30
Anurag Mishra
41f421d400
feat: added option to add custom remarks in payment entry
2020-09-02 13:47:18 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total
...
feat: enable total row in Gross Profit Report
2020-09-02 12:18:41 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters
...
fix: General Ledger filter validation
2020-09-01 17:53:32 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix
2020-09-01 09:31:22 +05:30
Afshan
1dc9a9b669
fix: reverse journal entry for multi-currency ( #23165 )
...
* fix: reverse journal entry for multi-currency
* fix: test case for reverse journal entry
2020-08-31 20:35:05 +05:30
marination
8938d1040d
fix: Rename/Update Child company Accounts as well
2020-08-31 18:18:10 +05:30
Deepesh Garg
bdc933b3d3
Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation
...
fix: Cancellation of accounting transactions within closed accounting period
2020-08-31 17:16:55 +05:30
marination
fdcda85f87
fix: Validate Missing Accounts in Child Companies
...
- If parent account exists in Parent and now child, throw error
2020-08-31 16:10:52 +05:30
Deepesh Garg
56ddf41873
Merge pull request #23211 from michellealva/tax-cat
...
feat: Allow Rename for Tax Category
2020-08-31 15:56:43 +05:30
michellealva
c71e37c988
feat: Allow Rename for Tax Category
2020-08-30 19:42:24 +05:30
Syed Mujeer Hashmi
b23840bf7b
fix: Filter out cancelled entries in customer ledger summary
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-08-29 23:09:18 +05:30
Rucha Mahabal
8cdc3b5d91
Merge branch 'develop' into patch-9
2020-08-28 10:41:02 +05:30
Suraj Shetty
f39bb116cc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-27 19:27:49 +05:30
prssanna
a324e9bd12
fix: remove text-muted and small class fromtree items
2020-08-27 19:26:14 +05:30
Suraj Shetty
a49af09705
fix: Primary button icon
2020-08-27 18:57:43 +05:30
Suraj Shetty
b6ebcd7559
refactor: Replace darkgray indicator with gray indicator
2020-08-27 18:57:18 +05:30
prssanna
744169833c
fix: replace indicator color darkgrey with darkgray
2020-08-27 17:06:10 +05:30
michellealva
ead2f6abf0
fix: Chage fiedtype of Customer's PO in Sales Invoice
2020-08-27 13:57:15 +05:30
Marica
e7fabb10e1
Merge branch 'develop' into general-ledger-filters
2020-08-27 11:59:01 +05:30
bhavesh95863
bb5d886930
fix: account & cost center filter by company
2020-08-26 18:23:21 +05:30
Abhishek Balam
dc9af639a7
fix: move condition field
2020-08-26 12:26:15 +05:30
Abhishek Balam
7d0bb25aca
fix: dont show message on condition syntax error
2020-08-26 12:22:31 +05:30
Michelle Alva
258b256dc6
fix: Add Delivery Note link in Sales Invoice Dashboard ( #23161 )
2020-08-25 20:37:39 +05:30
Rushabh Mehta
ee921052c0
fix(minor): test dependencies
2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d
fix(minor): import
2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf
fix(minor): circular imports?
2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f
fix(hot): Pricing Rule encoding fixed
2020-08-25 11:59:57 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report
2020-08-24 20:23:19 +05:30
Suraj Shetty
6f9f40992c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-23 16:33:50 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable ( #23114 )
2020-08-22 12:31:06 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case ( #23102 )
2020-08-20 15:53:58 +05:30
Rucha Mahabal
434bab8003
fix: Print Language for Customer not set for Print Receipt in POS
2020-08-19 01:00:59 +05:30
Rohit Waghchaure
310ade7282
profit and loss report not working
2020-08-18 16:07:24 +05:30
Marica
847343af86
Merge branch 'develop' into general-ledger-filters
2020-08-18 13:40:45 +05:30
Michelle Alva
849b712770
fix: Change spelling of "Successful" ( #23063 )
...
Before:
Import Successfull
After:
Import Successful
2020-08-18 12:06:46 +05:30
Rucha Mahabal
035907a24f
fix: remove Request for Quotation link from Fiscal Year dashboard ( #23040 )
2020-08-18 10:57:10 +05:30
Glen Whitney
b2604d1f77
fix(General Ledger): include Accounting Dimension columns in report
...
Prior to this commit, custom Accounting Dimensions are not
(by default) shown or even considered in generating a General
Ledger report. Moreover, as they are not considered, they are
not used to distinguish GL Entry lines in the same voucher
with the same Account when the "Group By" value is
"Group by Voucher (Consolidated)". This situation leads to
lines with different values for the accounting dimension
to be ganged together in the General Ledger view of a Journal
entry, making the entry difficult for an accountant to read.
This commit alleviates the problem by adding a checkbox
to control whether Accounting Dimension columns are considered
in the General Ledger report. When they are considered, they
are displayed and also included in the key that distinguishes
lines in the "Group by Voucher (Consolidated)" mode.
Resolves #23033 .
2020-08-17 20:43:56 +00:00
Deepesh Garg
1067f7ed3e
fix: Price rule filtering in case of no doc
2020-08-17 23:47:58 +05:30
marination
eb241c6c42
fix: General Ledger filter validation
2020-08-17 12:57:56 +05:30
Afshan
5b45961b9d
fix: the JSON object must be str, bytes or bytearray, not "list" ( #23047 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 10:51:53 +05:30
Deepesh Garg
d9accededa
fix: filter pricing rules based on condition
2020-08-14 22:36:01 +05:30
Rucha Mahabal
5fb0e7184e
fix: list index out of range error while setting POS payment mode ( #23018 )
2020-08-14 17:11:39 +05:30
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck ( #23023 )
2020-08-13 17:41:55 +05:30
Anupam K
b3bd780d46
fix: codasy dix
2020-08-13 17:07:15 +05:30
Abhishek Balam
a25760046f
fix: condition syntax validation readded, fetch item details if condition not met ignoring rule
2020-08-13 13:22:58 +05:30
Abhishek Balam
487aa30aef
fix: eval fail message fix
2020-08-13 12:19:34 +05:30
Deepesh Garg
ca898c6da3
fix: Condition fix
2020-08-13 11:54:18 +05:30
Deepesh Garg
cbde04d3da
fix: Pass doc instead of args
2020-08-13 11:47:41 +05:30
prssanna
bfb219612e
feat: enable total row in Gross Profit Report
2020-08-13 11:34:05 +05:30
Abhishek Balam
fdfab03c11
feat: add condition field in pricing rule
2020-08-12 20:33:54 +05:30
Nabin Hait
19ea7218d9
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 20:34:57 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts ( #22901 )
...
* feat: Process Statement Of Accounts initial commit
* fix: add jinja supported inputs for subject and body in email settings
* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return ( #22942 )
...
* feat: adding return naming series
* Update purchase_invoice.json
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist ( #22956 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 14:40:44 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field
2020-08-11 10:22:32 +05:30
sahil28297
4e4a19d3e6
Merge pull request #22984 from saurabh6790/tax-template-issue
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 16:01:35 +05:30
Deepesh Garg
069a54e5c3
fix: Cancellation of accounting transactions within closed accounting period
2020-08-10 16:01:01 +05:30
marination
3beeeb589a
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:55:02 +05:30
Saqib Ansari
cc5b49bff4
fix: [pos] minor bugs
2020-08-10 15:52:32 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:59 +05:30
marination
0f27500197
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:58 +05:30
Saqib Ansari
f1091534cd
fix: [pos] minor bugs
2020-08-10 14:45:58 +05:30
Afshan
1f3cc7553c
fix: grand_total assigment before reference
2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62
fix: escape company field
2020-08-07 14:52:50 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts
2020-08-06 15:09:22 +02:00
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref
...
fix: condition for checking reference details for Payment Entry
2020-08-05 23:16:14 +05:30
Suraj Shetty
8d05514260
refactor: Format and sanitise user inputs to search queries. ( #22922 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 20:07:30 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. ( #22913 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Rucha Mahabal
5da067b689
fix: condition for checking reference detail for Payment Entry
2020-08-05 18:18:57 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice ( #22882 )
2020-08-03 20:42:15 +05:30
Nabin Hait
a1d3537f2a
fix: Bank Clearance of POS purchase invoice ( #22883 )
2020-08-03 20:42:00 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports ( #22888 )
2020-08-03 20:41:25 +05:30
Nabin Hait
5e548b4387
Dunning cleanup beta ( #22899 )
...
* fix: Dunning cleanup
* fix: Added dashboard for Dunning
2020-08-03 20:39:15 +05:30
Nabin Hait
48163e31c5
Dunning cleanup ( #22898 )
...
* fix: Dunning cleanup
* fix: Added dashboard for Dunning
2020-08-03 20:38:28 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA ( #22885 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-08-03 15:51:57 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test
...
fix: Test case for subscription
2020-08-03 14:31:21 +05:30
Deepesh Garg
5572f8eb1e
fix: Test case for subscription
2020-08-03 13:40:11 +05:30
Shivam Mishra
de80553d89
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-03 12:34:05 +05:30
Nabin Hait
826158c792
fix: Update modified timestamp in accounts settings ( #22874 )
2020-08-03 09:34:55 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings ( #22873 )
2020-08-03 09:33:31 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix
...
fix: Ignore cancelled gl entries to get account balance
2020-07-30 22:15:23 +05:30
Shivam Mishra
11111cd9a9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-07-30 21:29:02 +05:30
Nabin Hait
38d5c2e04f
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:53:07 +05:30
Nabin Hait
9837285bf1
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:52:20 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-28 12:29:47 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items ( #22648 )
...
* fix: Unable to submit backdated stock transactions for different items
* fix: Test cases
* fix: Test Cases
* fix: Test Cases
* fix: Test for stock account JV
* fix: Journal Entry Test
2020-07-28 08:49:44 +05:30
Deepesh Garg
fa28e600b5
fix: Unable to submit backdated stock transactions for different items ( #22822 )
...
* fix: Unable to submit backdated stock transactions for different items
* fix: Test cases
* fix: Test Cases
* fix: Test Cases
* fix: Test for stock account JV
* fix: Journal Entry Test
* fix: Delete unwanted code
2020-07-28 08:49:21 +05:30
Anupam K
8718daa11e
Adding formatter in budget variance report
2020-07-25 23:56:11 +05:30
Deepesh Garg
c591b77613
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-24 19:04:05 +05:30
Mangesh-Khairnar
762f6297f6
fix(payment-request): do not set guest as administrator ( #22804 )
2020-07-24 18:05:13 +05:30
Mangesh-Khairnar
8721530b4b
fix(payment-request): do not set guest as administrator ( #22801 )
2020-07-24 17:19:56 +05:30
Nabin Hait
a8efe8eb5f
Merge branch 'develop' into version-13-beta-pre-release
2020-07-24 11:15:13 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report ( #22616 )
...
* fix: buying price for non stock item in gross profit report
* fix: refactor query
2020-07-24 09:49:17 +05:30
Nabin Hait
39969647ca
fix: Added missing project field in Purchase invoice ( #22799 )
2020-07-24 09:48:54 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry ( #22735 )
2020-07-23 20:58:57 +05:30
Deepesh Garg
76028cde6a
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-23 19:05:17 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields ( #22732 )
...
* new parent updating logic, made requested changes
* fix: Increase Length of In Words fields
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 19:01:31 +05:30
Saqib
a6f98d48bc
refactor: POS workflow ( #20789 )
...
* refactor: add pos invoice doctype replacing sales invoice in POS
* refactor: move pos.py to pos invoice
* feat: add pos invoice merge log doctype
* feat: ability to merge pos invoices into a sales invoice
* feat: [wip] new ui for point of sale
* fix: pos.py moved to pos_invoice
* feat: loyalty points for POS Invoice
* fix: loyalty points on merging
* feat: return against pos invoices
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: status fix and set warehouse from pos profile
* fix: naming series
* feat: merge pos returns into credit notes
* feat: add pos list action for merging into sales invoices
* feat[UX]: add shortcuts & focus on search after customer selection
* feat: stock validation from previous pos transactions
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: fix df not found for base_amount precision
* feat: serial no validation from previous pos transactions
* chore: move pos.py into pos page
* feat: pos opening voucher
* feat: link pos closing voucher with opening voucher
* chore: use map_doc instead of get_mapped_doc for better perf
* feat: enforce opening voucher on pos page
* feat: [ui] [wip] point of sale beta ui refactor
* fix: auto fetching serial nos with batch no
* feat: [ui] item details section for new pos ui
* feat: remove item from cart
* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids
* fix: search from item selector
* feat: loyalty points as payment method
* feat: pos invoice status
* fix a bug with invalid JSON
* fix: loyalty program ui fixes
* feat: past order list and past order summary
* feat: (minor) setting discount from item details
* fix: adding item before customer selection
* feat: post order submission summary
* save and open draft orders
* fix: item group filter
* fix: item_det not defined while submitting sle
* fix: minor bugs
* fix: minor ux fixes
* feat: show opening time in pos ui
* feat: item and customer images
* feat: emailing and printing an invoice
* fix: item details field edit shows empty alert
* fix: (minor) ux fixes
* chore: rename pos opening voucher to pos opening entry
* chore: (minor) rename pos closing voucher and sub doctypes
* chore: add patch for renaming pos closing doctypes
* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation
* fix: invoices not getting fetched on pos closing
* fix: indentation
* feat: view / edit customer info
* fix: minor bugs
* fix: minor bug
* fix: patch
* fix: minor ux issues
* fix: remove uppercase status
* refactor: pos closing payment reconciliation
* fix: move pos invoice print formats to pos invoice doctype
* fix: ui issues
* feat: new child doctype to store pos payment mode details
* fix: add to patches.txt
* feat: search by serial no
* chore: [wip] code cleanup
* fix: item not selectable from cart
* chore: [wip] code cleanup
* fix: minor issues
* loyalty points transactions
* default payment mode
* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI
* chore: pos invoice merge log tests
* fix: batch / serial validation in pos ui and on submission
* feat: use onscan js for barcode scan events
* fix: cart header with amount column
* fix: validate batch no and qty in pos transactions
* chore: do not fetch closing balances as opening balance
* feat: show available qty in item selector
* feat: shortcuts
* fix: onscan.js not found
* fix: onscan.js not found
* fix: cannot return partial items
* fix: neagtive stock indicator
* feat: invoice discount
* fix: change available stock on warehouse change
* chore: cleanup code
* fix: pos profile payment method table
* feat: adding same item with different uom
* fix: loyalty points deleted after consolidation
* fix: enter loyalty amount instead of loyalty points
* chore: return print format
* feat: custom fields in pos view
* chore: pos invoice test
* chore: remove offline pos
* fix: cyclic dependency
* fix: cyclic dependency
* patch: remove pos page and order fixes
* chore: little fixes
* fix: patch perf and plural naming
* chore: tidy up pos invoice validation
* chore: move pos closing to accounts
* fix: move pos doctypes to accounts
* fix: move pos doctypes to accounts
* fix: item description in cart
* fix: item description in cart
* chore: loyalty tests
* minor fixes
* chore: rename point of sale beta to point of sale
* chore: reset past order summary on filter change
* chore: add point of sale to accounting desk
* fix: payment reconciliation table in pos closing
* fix: travis
* Update accounting.json
* fix: test cases
* fix: tests
* patch loyalty point entries
* fix: remove test
* default mode of payment is mandatory for pos transaction
* chore: remove unused checks from pos profile
* fix: loyalty point entry patch
* fix: numpad reset and patches
* fix: minor bugs
* fix: travis
* fix: travis
* fix: travis
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
Shivam Mishra
f59d927f73
feat: update summary items
2020-07-23 17:02:32 +05:30
Shivam Mishra
840550e25f
refactor: change sequence for profit and loss statement
2020-07-23 17:02:32 +05:30
Shivam Mishra
1358efe896
feat: update icons
2020-07-23 17:02:32 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning ( #22559 )
...
* feat: Dunning
* fix: Replaces spaces with tab
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 15:45:03 +05:30
Deepesh Garg
7ac4ad8410
fix: Error due to comma in Pricing rule name ( #22741 )
...
* fix: Error due to commma in Pricing rule name
* fix: Remove print statement
* fix: Tests
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:12:55 +05:30
Deepesh Garg
9c49f2d886
feat: Enhancement in subscription ( #22263 )
...
* feat: Add supplier in subscription doctype
* fix: Code cleanup
* fix: Add dynamic link in subscription invoices
* fix: Multiple enhanccement in subscription
* feat: Follow calendar months in subscription
* fix: Test Cases and patch
* fix: Patch
* fix: Update patch and add fixes
* fix: Update permission for subscription settings
* fix: Patch and Test
* fix: Add cost center dimension in Subscripiton
2020-07-23 11:11:23 +05:30
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account ( #22725 )
...
* fix: Move branch code back to bank account
* fix: Patch
2020-07-22 18:21:04 +05:30
Deepesh Garg
c7eadfceb0
fix: Multi currency payment reconciliation ( #22738 )
...
* fix: Multi currency payment reconciliation
* fix: Hide currency link fields
2020-07-22 17:59:37 +05:30
Rucha Mahabal
1fddc6d126
chore: Exported Accounts Module Dashboard ( #22769 )
...
* chore: Exported Accounts Module Dashboards
* chore: deleted dashboard fixtures for Accounts module
2020-07-22 16:11:06 +05:30
Nabin Hait
493b581862
fix: Ignore cancelled entries in trial balance opening
2020-07-21 12:47:16 +05:30
Deepesh Garg
d81372a39c
Merge pull request #22734 from deepeshgarg007/custom_cash_flow
...
fix: Period list api changes for custom cash flow report
2020-07-18 20:35:28 +05:30
Deepesh Garg
07f8e749be
fix: Period list api changes for custom cash flow report
2020-07-18 19:47:33 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix
2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c
Fix: Changes Requested
2020-07-16 12:21:46 +05:30
Suraj Shetty
11b0554ae9
Merge branch 'develop' into fix-financial-statement-print-format
2020-07-16 09:45:26 +05:30
Rohit Waghchaure
e0de0ac617
fix: not able to submit sales invoice
2020-07-15 17:13:43 +05:30
Suraj Shetty
34617744e1
fix: Show total row in print format of financial statement
2020-07-15 16:37:21 +05:30
Deepesh Garg
5beac7a0cc
fix: Period list fixes in financial statements ( #22677 )
2020-07-15 12:17:43 +05:30
Anurag Mishra
c1636f8fab
fix: conversion rate as 1 if no conversion rate
2020-07-14 18:58:02 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
...
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
rohitwaghchaure
62fe2cac19
Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts
...
fix: Project link not set in accounts other than profit and loss accounts
2020-07-13 18:09:41 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Deepesh Garg
62d047bf9b
Merge branch 'develop' into payment_reco_cost_center_fix
2020-07-11 21:05:32 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test
...
fix(travis): Item Tax template test
2020-07-11 21:04:31 +05:30
marination
a6c10b1bc0
fix: Pricing Rule breaks if no item_code
2020-07-10 20:09:58 +05:30
Deepesh Garg
e99091fd4f
Merge pull request #22644 from deepeshgarg007/dcc_query
...
fix: Distributed cost center query
2020-07-10 13:35:34 +05:30
Deepesh Garg
7cb195b304
fix: Distributed cost center query
2020-07-10 13:33:50 +05:30
Afshan
fd28f1071e
style: arrangements of filters for reports ( #22636 )
2020-07-10 11:25:39 +05:30
Deepesh Garg
b74077faf5
fix(travis): Item Tax tempate template test
2020-07-09 19:50:41 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding ( #22580 )
...
* fix: grammatical fixes in module onboarding
* fix: more grammatical changes for consistency
* fix: Reorder Stock Onboarding
* fix: update success message
* fix: change order of stock onboarding steps
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts
2020-07-08 13:11:37 +05:30
rohitwaghchaure
37d828eda6
Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation
...
fix: Do not ignore validate methods on GL entry submit
2020-07-08 13:06:47 +05:30
Deepesh Garg
9071a7de82
fix: Add default cost center in payment reconciliation JV
2020-07-08 11:27:25 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop
...
fix: Item Tax Template permissions as per company
2020-07-08 10:08:53 +05:30
Marica
f4d0a3e7b0
Merge branch 'develop' into whitelist-query
2020-07-07 15:42:42 +05:30
rohitwaghchaure
546cfdaac2
Merge pull request #22601 from deepeshgarg007/payment_reco_company
...
fix: Payment reco error in multi-company setup
2020-07-07 15:32:36 +05:30
Deepesh Garg
ca351e3549
fix: Pass company
2020-07-07 14:37:17 +05:30
Deepesh Garg
e2fdff5777
fix: Payment reco error in multicompany setup
2020-07-07 14:14:07 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query
2020-07-07 11:53:19 +05:30
Deepesh Garg
05738bd29a
fix: Remove print statements
2020-07-06 13:40:48 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details
...
fix: Check for Company before trying to fetch party details
2020-07-06 12:42:16 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix
...
fix: Consider company fiscal year for getting balance
2020-07-06 12:34:56 +05:30
Deepesh Garg
be05c4e14a
fix: Codacy and minor fixes
2020-07-05 18:16:16 +05:30
Deepesh Garg
96d40ec9da
fix: Consider company fiscal for getting balalnce
2020-07-03 22:59:00 +05:30
marination
e27b996e38
fix: Check for Company before trying to fetch party details
2020-07-03 22:12:00 +05:30
mohammadahmad1990
015910b4c4
Company Field Added in Item Tax Template
2020-07-03 15:02:32 +05:00
Deepesh Garg
9ed0384bea
fix: Code cleanup
2020-07-03 14:54:41 +05:30
Deepesh Garg
3c004ad798
fix(GST): Do not add tax amount in grand total for reverse charge invoices
2020-07-02 21:18:29 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default ( #22521 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-02 15:11:45 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-02 12:35:41 +05:30
Deepesh Garg
8230e41a42
fix: Insert instead of DB insert
2020-06-29 21:20:05 +05:30
Deepesh Garg
d1bf6e0277
fix: Do not ignore validate methods on GLL entry submit
2020-06-29 21:14:03 +05:30
Rohit Waghchaure
04cf2e029f
fix: letter head not found in opening invoice creation tool
2020-06-28 17:08:12 +05:30
rohitwaghchaure
69aa2e400a
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223
...
feat: Accounting entries for service item in Purchase receipt (bp #22223 )
2020-06-28 11:26:21 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs ( #22433 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:37:04 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs ( #22432 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:34:01 +05:30
Deepesh Garg
be9a8e1a14
Resolve merge conflicts
2020-06-24 18:47:58 +05:30
Deepesh Garg
faa0c5624e
fix: Update journal entry account timestamp
2020-06-24 18:45:16 +05:30
Deepesh Garg
2abd66da9d
fix: Update journal entry account timesstamp
2020-06-24 17:49:50 +05:30
Deepesh Garg
51ce1e1d4e
fix: Test Cases
...
(cherry picked from commit ded3ab1cd7
2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111
fix: Move check from Stock Settings to Company Master
...
(cherry picked from commit 53d5d16abb
2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5
feat: Accounting entries for service item in Purchase receipt
...
(cherry picked from commit c258ac82c5
2020-06-24 05:38:32 +00:00
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting
2020-06-24 10:23:23 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking ( #21671 )
...
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
2020-06-23 09:57:56 +05:30
Marica
b073544e06
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-06-23 02:24:35 +05:30
Rohit Waghchaure
aaed3b988f
added validation and clear fields for Apply Rule On Other
...
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730
fix(pricing_rule): apply_on logic dont get cleanup
...
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
2020-06-22 14:52:29 +00:00
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice ( #22193 )
2020-06-22 18:03:11 +05:30
Deepesh Garg
edd4aa6faa
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7
fix: Test Cases
2020-06-22 09:40:15 +05:30
Deepesh Garg
95a497cffb
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix
2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981
fix: Test
2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due
...
fix: status error in purchase invoice
2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e
Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting
2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb
fix: Move check from Stock Settings to Company Master
2020-06-20 11:55:56 +05:30
Kenneth Sequeira
b7c8037e9a
fix codacy
2020-06-19 22:33:51 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due
2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab
fix: due date filter in purchase invoice
2020-06-19 18:22:04 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:29:49 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding ( #22055 )
...
* feat: Selling Desk, Dashboard and Onboarding
* chore: Selling Onboarding and fixes in Other onboardings
* chore: Dashboard and Number card Fixtures
* fix: Escape filters and Reposition Accounts Dashboard shortcut.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Deepesh Garg
1b30ca6a36
fix: Codacy
2020-06-19 12:12:08 +05:30
Deepesh Garg
3c63f5b76b
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-19 11:41:21 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section ( #22309 )
2020-06-19 11:11:33 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year ( #21880 )
...
* feat: date filter for fiscal year
* fix: rename fieldtypes to valid_for_fieldtypes
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-18 18:18:41 +05:30
P-Froggy
c3b74affe3
fix: Set Value of wrong Bank Account Field in Payment Entry
...
Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account".
Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632
2020-06-18 01:48:37 +02:00
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date ( #22286 )
2020-06-17 17:39:12 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis
...
fix: Travis(develop)
2020-06-15 16:12:10 +05:30
Deepesh Garg
0d880079b1
fix: Validation for group cost center
2020-06-15 12:23:24 +05:30
Deepesh Garg
817cbc4b48
fix: Minor fixes in cost center
2020-06-15 12:07:04 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address
...
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
Rohit Waghchaure
d6f9a51cbb
fix: item none not found while making sales invoice using opening invoice creation tool
2020-06-14 14:46:49 +05:30
Deepesh Garg
6760077674
fix: Billing address in for Purchase documents
2020-06-13 22:40:23 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
...
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d
fix: Distributed cost center query updation
2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1
fix: Do not select cancelled entries in financial statements
2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
...
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d
fix: Data not appearing properly for some fiscal_year in financial statemets
2020-06-13 19:26:39 +05:30
Deepesh Garg
c258ac82c5
feat: Accounting entries for service item in Purchase receipt
2020-06-12 18:33:42 +05:30
Deepesh Garg
7e974c9e2c
fix: Test Cases
2020-06-12 15:29:40 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree
...
fix: Check for Company before rendering tree in Account Tree
2020-06-12 10:02:41 +05:30
Deepesh Garg
9df4532d14
fix: Travis(develop)
2020-06-11 21:33:43 +05:30
marination
c9a6e4f151
fix: Check for Company before rendering tree in Account Tree
2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request ( #22044 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-11 19:31:41 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding
...
fix: Update payment schedule based on payment terms
2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac
fix: Update payment schedule based on payment terms
2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation
...
fix: Party validation for inter-warehouse transaction
2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708
fix: Party validation for inter-warehouse transaction
2020-06-10 19:57:49 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export
...
fix: Item-wise sales and purchase register export
2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266
fix: Item-wise sales and purchase register export
2020-06-10 18:33:24 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view
...
fix: Add total debit in Journal Entry list view
2020-06-10 14:17:13 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center ( #21531 )
...
* feat: Distributed Cost Center
Squashed commit of the following:
commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:32:26 2020 +0530
Fix: Indentation
commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:26:50 2020 +0530
The validations are added to distributed cost center.
commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 22:17:25 2020 +0530
The distributed cost centers are shown with the percentage allocation in the reports
commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 13:36:04 2020 +0530
The child table distributed cost center are added to cost center doctype and then validate percentage allocation.
* fix(Distributed Cost Center): validation and filters
* fix(Distributed Cost Center): financial statement query
* fix(Distributed Cost Center): add test cases
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.
* Merge branch 'develop' into develop-distributed-cost-center
* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.
* Update creation field in general ledger report
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* creation field updated in gl_entries query
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-08 12:20:21 +05:30
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address
...
fix: Apply shipping rule without address too
2020-06-08 10:36:19 +05:30
Deepesh Garg
76ddf4f0b5
Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13
...
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:57 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled
...
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:17 +05:30
Deepesh Garg
cdd92d756d
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:03:28 +05:30
Deepesh Garg
57f9d43c43
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:01:20 +05:30
Deepesh Garg
7135a75e5e
fix: Error when no data is present in AR/AP reeport
2020-06-03 21:51:21 +05:30
marination
0c72249403
fix: Apply shipping rule without address too
2020-06-03 14:32:07 +05:30
Deepesh Garg
60f3a2b8e7
fix: Add total debit in Journal Entry list view
2020-06-02 18:26:43 +05:30
Deepesh Garg
3609ddedbb
fix: Purchase receipt item json
2020-05-30 12:03:37 +05:30
Deepesh Garg
c96bf870e4
fix: Test Cases
2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd
Revert 'fix: tests depending on global default company'
2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356
Revert "fix: tests depending on global default company"
...
This reverts commit 1f20c99ecf
2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa
This reverts commit aa196c0a66
2020-05-30 11:37:36 +05:30
Deepesh Garg
52baf8f863
fix: Test Cases
2020-05-29 17:20:03 +05:30
Deepesh Garg
c897e800ed
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-05-29 11:04:20 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report ( #22021 )
2020-05-29 10:18:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements ( #22011 )
2020-05-28 18:36:21 +05:30
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart ( #22006 )
...
(cherry picked from commit 4afda76015
2020-05-28 15:18:47 +05:30
Shivam Mishra
4afda76015
fix: set fiscal year for Profit and Loss chart
2020-05-28 15:06:38 +05:30
rohitwaghchaure
af91e13435
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix
...
fix: transaction date not found in sales invoice
2020-05-28 14:38:13 +05:30
Deepesh Garg
cfcdd52bf4
fix: Inter-company Invoice currency for multicurrency transactions ( #21984 )
2020-05-28 13:35:29 +05:30
Saqib Ansari
dd39ba0014
chore: tests
2020-05-28 13:11:04 +05:30
Saqib Ansari
603cc3d05e
fix: transaction date not found in sales invoice
2020-05-28 12:49:33 +05:30
Deepesh Garg
6fe3a24c5d
Merge pull request #21986 from deepeshgarg007/tds_computation_summary
...
fix: TDS computation summary report
2020-05-27 22:49:42 +05:30
Deepesh Garg
33a08f1ea7
fix: TDS computation summary report
2020-05-27 22:44:50 +05:30
Deepesh Garg
c63b689497
fix: Total for ageing column 121-Above ( #21972 )
...
(cherry picked from commit 152377f84d
2020-05-27 15:27:23 +00:00
Marica
8f1aed73fd
fix: Buying Module fixes ( #21966 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:57:02 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes ( #21965 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:56:39 +05:30
mergify[bot]
01dda8a000
fix: Filtering issues in opneing invoice creation tool ( #21969 ) ( #21979 )
...
(cherry picked from commit 0030b95595
2020-05-27 20:50:20 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above ( #21972 )
2020-05-27 20:29:10 +05:30
Deepesh Garg
0030b95595
fix: Filtering issues in opneing invoice creation tool ( #21969 )
2020-05-27 20:27:33 +05:30
Deepesh Garg
ed2c1803df
fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary ( #21837 )
...
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report
* fix: Add future payment filter in AR/AP summary
* fix: Show unallocated future payments only till current creation date
* fix: Remove extra query
* fix: Remove debug
* fix: Condition
2020-05-27 12:46:12 +05:30
Deepesh Garg
3a723dd815
Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter
...
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
11ea0b1289
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:23:45 +05:30
Afshan
c0b4ec52de
fix: UX date range field separated in from and to date fields. ( #21765 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
* divided date range to seperate from and to date
* divided date range to seperate from and to date for purcase and sales register
2020-05-26 18:20:47 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made ( #21893 )
2020-05-25 19:21:08 +05:30
Chinmay D. Pai
a7f39a9879
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit 0d147b011e
2020-05-24 07:24:34 +00:00
Chinmay D. Pai
0d147b011e
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-24 00:54:04 +05:30
Deepesh Garg
18ace30a81
fix: Project filter in Trial Baalance Report
2020-05-22 20:39:14 +05:30
Deepesh Garg
29c748184c
fix: Project filter in Trial Baalance Report
2020-05-20 22:15:12 +05:30
Marica
2b04e8eef0
fix: Validate Payment Gateway only if it exists in Payment Request. ( #21805 )
2020-05-20 16:13:43 +05:30
Rohit Waghchaure
e6147ed9bc
feat: production forecasting using exponential smoothing method
2020-05-20 11:31:06 +05:30
Deepesh Garg
1b1787c61a
fix: Against voucher in General Ledger
2020-05-19 20:51:30 +05:30
Nabin Hait
ddec05ee07
Merge branch 'marination-stock-dashboard' into develop
2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721
feat: stock module dashboard and onboarding
2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text ( #21782 )
2020-05-19 19:05:42 +05:30
Shivam Mishra
31f00b6052
refactor: rename dashboards in desk page
2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing ( #21776 )
2020-05-19 15:54:24 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Nabin Hait
31b8be6c41
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
2020-05-18 11:31:30 +05:30
Deepesh Garg
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:27:38 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company
2020-05-17 20:02:12 +05:30
Deepesh Garg
bf16956d10
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description
...
fix(accounting): Tax Withholding Category Description default
2020-05-16 18:07:45 +05:30
Deepesh Garg
2a0e3e3515
fix: Remove strip
2020-05-16 18:07:03 +05:30
Deepesh Garg
2567815b03
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category
...
fix(accounting): Allow 0 threshold in Tax Withholding Category
2020-05-16 17:55:51 +05:30
rohitwaghchaure
7435174300
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue
...
fix: promotional scheme not able to save
2020-05-16 11:34:23 +05:30
Rohit Waghchaure
49dbbdc4cb
fix: promotional scheme not able to savce
2020-05-16 04:59:59 +05:30
Deepesh Garg
7be71c88f2
fix: Better validation message for group accounts ( #21725 )
2020-05-15 19:23:41 +05:30
Deepesh Garg
1b821fec4b
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix
...
fix: update remark on submitting payment entry
2020-05-15 17:48:51 +05:30
Saqib Ansari
03d165ff79
fix: update remark on submitting payment entry
2020-05-15 16:39:02 +05:30
Deepesh Garg
a812ad7555
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix
...
fix: purchase inv shows overdue for fraction of outstanding
2020-05-15 15:46:23 +05:30
Saqib Ansari
940856cc16
fix: add tests for set_status
2020-05-15 14:30:24 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries ( #21689 )
...
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) ( #21599 )
...
* format: better error messages for invalid coupon codes
* fix: remove unnecessary docstatus check
2020-05-15 12:10:34 +05:30
Deepesh Garg
33f654ebfe
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-14 22:57:27 +05:30
Deepesh Garg
8bbac6defc
fix: Onboarding and Dashboard for accounts module
2020-05-14 22:57:11 +05:30
Shivam Mishra
0fbc96cc8c
Merge pull request #21731 from prssanna/custom-chart-fix
...
fix: add heatmap_year parameter to get
2020-05-14 18:27:07 +05:30
prssanna
39cb749f95
fix: add heatmap_year parameter to get
2020-05-14 18:25:58 +05:30
Saqib Ansari
13096cdbfe
fix: invalid conditional statement
2020-05-13 22:02:56 +05:30
Saqib
2b8f307ffe
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 21:56:45 +05:30
Afshan
bd7e535885
Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice ( #21673 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
2020-05-13 19:48:42 +05:30
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 14:02:19 +05:30
Deepesh Garg
cdeb897fff
fix: Account shortcut in desk page
2020-05-12 17:23:15 +05:30
Saqib Ansari
734bfcdfc2
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:11:33 +05:30
Deepesh Garg
c6bd012e72
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-12 11:30:07 +05:30
Chinmay Pai
30f26b4457
fix: do not setup charts if not setup_complete or no company found ( #21670 )
...
* fix: do not setup charts if not setup_complete or no company found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove check for setup_complete
moved the check for setup_complete to frappe
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: return an empty dict from get_data if company not set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-11 19:54:46 +05:30
Deepesh Garg
0defefda92
feat: Standard accounts dashboard
2020-05-11 12:14:46 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number
...
fix: wrong fieldname branch_code in add_fetch
2020-05-11 07:06:42 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
...
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c
fix: Formatting fixes
2020-05-10 17:24:11 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards
2020-05-09 14:15:20 +05:30
Kevin Chan
bc05855805
fix: Simplify get_dimension_account_month_map
...
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
2020-05-09 16:02:11 +08:00
Deepesh Garg
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit
...
fix: Gross and net profit report fix
2020-05-08 19:56:58 +05:30
Deepesh Garg
3392e6b80c
fix: User filters instead of hardcoded values
2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781
fix: Gross and net profit report fix
2020-05-08 19:45:57 +05:30
Kevin Chan
9d81f97fe6
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b
fix: Zero threshold in Tax Withholding Category
...
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
2020-05-08 17:45:08 +08:00
Rohit Waghchaure
7d4ccdf240
fix: wrong fieldname branch_code in add_fetch
2020-05-08 13:27:25 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix
...
fix: Payment Order not allowing to create Payment Entry
2020-05-08 10:26:42 +05:30
Anupam K
8b52697723
Payment Order not allowing to create Payment Entry
2020-05-08 02:23:28 +05:30
Kevin Chan
b3ee6314f9
fix: Fix Budget Variance Report
...
This commit fixes a bug in Budget Variance Report where it combines the
actual expense amounts across different fiscal years. This was fixed by
updating the function and queries for computing the actual expense
amounts.
2020-05-07 18:39:47 +08:00
Kevin Chan
52189cba86
style: Improve formatting
...
This commit improves indentations and makes sql queries more readable.
2020-05-07 17:49:32 +08:00
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix
...
fix(minor): Reverse GL fix
2020-05-06 18:19:19 +05:30
Deepesh Garg
b821f22b7c
fix(minor): Reverse GL fix
2020-05-06 18:12:23 +05:30
Shivam Mishra
28436d2bc1
feat: added dashboard fixtures for accounts
2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470
feat: remove old fixtures
2020-05-06 15:18:43 +05:30
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) ( #21592 )
2020-05-05 16:17:15 +05:30
Saqib
d46696fa03
fix: cannot make payment entry against shareholder ( #21597 )
2020-05-05 16:10:47 +05:30
rohitwaghchaure
5210761e57
fix: heatmap not working for customer and supplier ( #21578 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 12:12:33 +05:30
Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' ( #21405 )
...
* fix: fieldname update for 'Credit' and 'Debit'
'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'
* Update journal_entry.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 12:09:28 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher ( #21564 )
2020-05-04 11:12:14 +05:30
Suraj Shetty
9a8512d01d
fix: NameError due to invalid variable
2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc
refactor: Folio no validation
2020-05-03 19:10:02 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry ( #19658 )
...
* feat: process deferred accounting
* feat: maintain entry for deferred accounting
* feat: add check for automatic deferred accounting entry
* feat: add build conditions for company and account
* fix: create record for automatic processing of deferred accounting
* feat: add custom naming series
* fix: change the deferred revenue creation via hooks
* fix: add client side validations
* test: creation of gl entries on submission of process deferred accounting
* fix: add multiple validations
* patch(accounts-settings): set automatically process deferred accounting entry
* fix: On cancel function for deferred entry
* fix: Send email per process instead of per invoice
* fix: Test cases
* fix: Label
* fix: Process deferred accounting fixes
* fix: Error flag
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Deepesh Garg
cea4eeaa53
fix: Reverse GL Entry on cancel fix
2020-05-02 18:05:33 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
...
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c
fix: Add multi currency check and proper account filters
2020-05-01 18:38:13 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company ( #21548 )
2020-05-01 18:15:13 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view ( #21541 )
2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop
2020-05-01 14:20:53 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
...
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a
fix: Patch test
2020-05-01 13:26:26 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
...
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab
fix: Check is child table for POS profile user
2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
...
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg
2020-04-30 20:08:18 +05:30
Saqib Ansari
c604109287
chore: handle credit note validation
2020-04-30 13:23:59 +05:30
Saqib
a8779872ee
feat: force cost center renaming from cost center form ( #21503 )
2020-04-30 11:28:43 +05:30
Saqib
090e6093f2
fix: list index out of range error ( #21467 )
...
* fix: list index out of range error
* fix: condititon
2020-04-30 11:04:44 +05:30
Saqib
078c95c438
fix: print heading field shown in gst section for india region ( #21499 )
2020-04-30 10:57:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Saqib Ansari
769c0ce72b
chore: validate and warn payment against paid invoices
2020-04-29 15:19:08 +05:30
Abhishek Balam
b59e46d773
fix semicolons as per codacy review
2020-04-29 15:01:56 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
...
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Abhishek Balam
e35bb16436
added journal entry template to accounting desk page
2020-04-29 12:18:33 +05:30
Deepesh Garg
3d8dadaab6
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:05:56 +05:30
Abhishek Balam
0c4ce4dbba
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-29 12:02:13 +05:30
Abhishek Balam
3b26b24af6
fix semicolons as per codacy review
2020-04-29 11:28:40 +05:30
Abhishek Balam
8dbc4e648b
rearranged fields in journal entry and journal entry type
2020-04-29 11:13:55 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees
...
fix: payment request not able to make against fees
2020-04-29 09:36:37 +05:30
Rohit Waghchaure
50b4106d1d
fix: payment request not able to make against fees
2020-04-29 02:27:47 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
...
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
fa2eecc5fc
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:12:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
...
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company
2020-04-28 11:38:07 +05:30
Deepesh Garg
142af4b58a
fix: Default column width in Gross profit report
2020-04-28 11:17:45 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
...
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53
fix: Test
2020-04-27 14:05:45 +05:30
Deepesh Garg
10aff8e118
fix: E-way bill fix in List view
2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b
fix: E-way bill fix in sales invoice
2020-04-27 10:50:03 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level ( #20870 )
...
* feat: Allow tax withholding category selection at invoice level
* fix: Linitng fixes
* feat: TDS calculation using common PAN
* fix: Add provision to deduct Lower TDS in purchase invoice
* fix: Consider only ref docs company while computing TDS
* fix: Default permission fixes
* fix: Add validation for dates in fiscal year
* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup ( #20932 )
...
* chore: Purchase Order Form Cleanup
* fix: Get Items from popups cleanup
* fix: Shift Set Target Warehouse next to Supply Raw Materials.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 20:07:22 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Abhishek Balam
e4e23836e7
mandatory depends on for cheque no and date, fix typo
2020-04-26 13:06:55 +05:30
Abhishek Balam
84187fb8e9
Code cleanup and improvements requested in PR:21404
2020-04-26 05:00:36 +05:30
Abhishek Balam
539c67966f
rename je template account dt
2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 17:59:00 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes ( #21407 )
...
* fix: Valid warehouse in woocommerce syncing
* fix: dmall fixes in gross & net profit report
* fix: company is required for getting party details
* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
Abhishek Balam
d64438ff47
feat: Journal Entry Template
2020-04-25 03:13:50 +05:30
Abhishek Balam
291837e63d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 02:46:00 +05:30
Abhishek Balam
7bbb77e66f
feat: Journal Entry Template
2020-04-25 02:45:45 +05:30
Diksha Jadhav
7b91617303
feat(accounting): show actual qty for warehouse in sales invoice
2020-04-25 00:02:32 +05:30
Saqib Ansari
40140c63dc
fix: rate gets overwritten when pricing rule is set
2020-04-24 14:51:56 +05:30
anoop
c02eceb989
style: intendation
2020-04-23 21:15:06 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms ( #20945 )
...
* feat: Payment allocation based on payment terms
* fix: Add desccription for checkbox
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:07:36 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes ( #21179 )
...
* fix: Rename bank account type doctypes
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions ( #21268 )
...
* fix: Budget warning against custom accounting dimension
* fix: Codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 10:34:57 +05:30
Rucha Mahabal
d7304519e2
fix: conflicts
2020-04-23 00:52:47 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json
2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item ( #21365 )
...
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".
removing oldfieldtype works for now, should be fixed inside framework
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:23:14 +05:30
Rohit Waghchaure
690855d3a1
fix: unsupported operand type issue in pricing rule
2020-04-22 02:49:48 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup ( #21230 )
...
* fix: Purchase Invoice Form Cleanup
* fix: Made Supplier field mandatory
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:00:14 +05:30
Saqib
b61d2411b1
Merge branch 'develop' into rename-bank-reco
2020-04-20 12:21:22 +05:30
Saqib Ansari
9de76de621
fix: patch
2020-04-20 12:19:27 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions ( #21313 )
2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print
...
fix: account name not showing in the gl print
2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154
fix: account name not showing in the gl print
2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
...
fix: minor issues
2020-04-18 02:08:26 +05:30
Mangesh-Khairnar
bd14a64bfb
fix: add label to gl entry
2020-04-17 19:52:47 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales ( #21299 )
...
* fix: requested qty for customer provided item and rate for sales
* fix: requested qty for material transfer
* fix: customer provided item can be sales item
* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes ( #21296 )
...
* fix: Made received qty readonly and no-copy
* fix: Made release date mandatory
* fix: requested qty calculation fix for UOM
2020-04-16 20:11:32 +05:30
anoop
93d0c78ca5
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-16 13:01:43 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation
2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13
...
fix: Chart of account importer UX improved
2020-04-16 11:21:05 +05:30
vishdha
5b36d15927
fix: fix Transalation
2020-04-16 11:13:43 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev
2020-04-15 23:48:27 +05:30
Saqib Ansari
34640777cd
fix: pos not accessible without default customer
2020-04-15 22:10:43 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer
...
feat: Provision to set Default Item Manufacturer
2020-04-15 16:35:08 +05:30
Saqib Ansari
55410e03e4
fix: tests depending on global default company
2020-04-15 12:57:55 +05:30
Saqib Ansari
1f20c99ecf
fix: tests depending on global default company
2020-04-14 19:40:25 +05:30
Rohit Waghchaure
d0f6f1808b
fix: minor issues
2020-04-14 17:26:58 +05:30
vishdha
5008be1db5
fix: message bold
2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05
fix: Chart of account importer UX improved
2020-04-14 17:17:26 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts
2020-04-14 14:05:32 +05:30
Saqib Ansari
aa196c0a66
fix: travis
2020-04-14 14:03:02 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed ( #21251 )
2020-04-14 12:53:54 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions ( #21237 )
...
Frontport of #18968
2020-04-14 11:51:48 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable ( #21227 )
2020-04-14 11:42:52 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation
2020-04-12 13:39:43 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor
2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227
fix: SQL ssyntax error
2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters
2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
...
chore: hide redundant base received amount
2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error
2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling
2020-04-10 20:14:29 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17
fix: formatting
2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977
fix: travis
2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
...
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix
2020-04-09 12:54:33 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. ( #21206 )
2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb ( #21190 )
2020-04-08 11:49:06 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order ( #21175 )
2020-04-08 09:20:17 +05:30
marination
3e7a8abf29
feat: Provision to set Default Item Manufacturer
...
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-07 21:00:57 +05:30
Saqib Ansari
e9b63e45b9
chore: hide redundant base received amount
2020-04-07 17:22:11 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix
...
fix: Use separate condition for tree and normal doctype
2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab
fix: Use separate condition for tree and normal doctype
2020-04-07 15:17:06 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ( #21020 )
...
* feat: Date range in financial statements
* feat: Add date range filter in consolidated financial statement
* fix: Handle API changes in query_report
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:16:25 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart ( #20879 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:07:01 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix
...
fix: payment request status fixes
2020-04-07 10:13:08 +05:30
Saqib Ansari
ca3967d52f
feat: (minor) purchase register filters
2020-04-06 18:25:23 +05:30
Saqib Ansari
b2a84fe478
chore: rename bank reconciliation to bank clearance
2020-04-06 16:32:33 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements ( #20876 )
...
* feat: Add report summary API for Balance Sheet and PL report
* fix: Add summary cards in Cash flow report
* feat: Add report summary in consolidated financial statements
* fix: Remove accumulated values filter from P&L and cashflow report
* fix: set company default currency in profit and loss statement if no data
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-06 14:07:20 +05:30
Saqib Ansari
474222074b
fix: tests
2020-04-06 12:40:41 +05:30
Saqib Ansari
4de2416806
fix: change request status on payment entry cancel
2020-04-06 12:34:38 +05:30
Marica
b37f0bb052
Merge pull request #20864 from deepeshgarg007/po_supplier_skip
...
feat: Allow PI creation without PO
2020-04-06 12:15:42 +05:30
Deepesh Garg
1958749382
fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype ( #21147 )
...
* fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype
* fix: Codacy
2020-04-06 10:21:50 +05:30
Saqib
63bdf5dc74
fix: [ux] credit to & debit to error message ( #21132 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 19:35:55 +05:30
marination
2a9a5352bb
fix: Test Cases and block expense on outward entry
...
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
Saqib
e2c355f670
Merge branch 'develop' into payment-req-status-fix
2020-04-03 11:29:15 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
Deepesh Garg
872fcb6cae
fix: Travis
2020-04-02 18:11:46 +05:30
Deepesh Garg
5dcd2c118e
Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos
...
fix: customer group price list not fetched in pos
2020-04-01 09:42:13 +05:30
Saqib Ansari
9a7851096c
fix: check if selling price exists then set it
2020-03-31 18:48:35 +05:30
Saqib Ansari
8ed7535e8a
fix: travis
2020-03-31 18:44:02 +05:30
Deepesh Garg
cf9347d2f5
fix: Undo unneccessary changes
2020-03-31 17:28:43 +05:30
Deepesh Garg
5fd456baa4
Merge branch 'develop' into customer-group-price-list-in-pos
2020-03-31 16:33:41 +05:30
Deepesh Garg
eeb9ba81d7
Merge branch 'develop' into project-link-for-all-accounts
2020-03-31 16:07:23 +05:30
Deepesh Garg
d45e0e0b5b
Merge branch 'develop' into billing-contact
2020-03-31 16:06:11 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor
2020-03-31 15:59:22 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue
...
fix: Adding proper error message
2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups ( #21070 )
2020-03-31 15:28:45 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue
2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal ( #21084 )
...
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
2020-03-31 10:51:09 +05:30
Deepesh Garg
f0760dee80
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue
2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2
fix: Test cases
2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop
...
fix: not able to add equity account in the chart of accounts
2020-03-30 12:15:01 +05:30
Rohit Waghchaure
cdf80eb4ad
fix: not able to add equity account in the chart of accounts
2020-03-29 16:35:10 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix
...
fix: total currency formatting in Acc Receivable and Payable
2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed
2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message
2020-03-28 21:17:58 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix
...
fix: currency formatting in gl entry dr cr field
2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1
fix: currency formatting in gl entry dr cr field
2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6
fix: payment request status fixes
2020-03-28 16:11:23 +05:30
Saqib Ansari
8488ef8eb1
fix: customer group price list not fetched in pos
2020-03-28 14:07:09 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix
2020-03-27 21:39:16 +05:30
Shivam Mishra
cf6a814328
fix: total currency formatting
2020-03-27 19:15:59 +05:30
Anupam K
7ca28fdab5
fix: Adding proper error message
2020-03-26 15:54:15 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger ( #21021 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-26 13:37:40 +05:30
Anupam K
9725e43eed
fix: Adding proper error message
2020-03-26 00:17:09 +05:30
Deepesh Garg
bdcfab3a0f
fix: Update patch and bank form cleanup
2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79
Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop
2020-03-25 21:00:25 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
Deepesh Garg
75225316f0
fix: Remove quick entry from accouting dimensions
2020-03-22 21:50:22 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed ( #20975 )
2020-03-18 18:23:38 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop ( #20965 )
...
* fix: Account setting words switches to US Terminology
* created united_states.js
* Remove Unwanted Spaces
* Remove all changes
* Add spaces between arguments
Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
2020-03-17 19:39:30 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups
...
fix(accounts): adjust account groups in SKR04
2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts ( #20913 )
...
* fix: Party name in Statement Of Accounts
* Update general_ledger.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 17:00:06 +05:30
Deepesh Garg
e7aefc1163
fix: Add check to skip PR in supplier master
2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension ( #20860 )
...
* feat: Nested set filtering for accounting dimension
* fix: Remove print statement
2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix
...
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:36:32 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix
...
fix: Get invoice details only if invoice is selected
2020-03-16 15:56:32 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts ( #20940 )
...
* Add account_type and tax rate to some VAT accounts
* fix indentation
2020-03-16 15:45:05 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card
2020-03-12 17:13:03 +05:30
Saqib Ansari
af1221bcbd
chore: add tests and remove test based on allow_cost_center_for_bs_accounts
2020-03-12 17:04:17 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Ronel Cabrera
fcb54762a1
feat(Contacts): select billing contact for sales invoice
2020-03-12 16:58:59 +08:00
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Saqib
6ec4618914
fix: travis ( #20903 )
2020-03-11 16:04:00 +05:30
Saqib Ansari
706c239cf6
fix: remove enable_allow_cost_center_in_entry_of_bs_account
2020-03-11 15:17:10 +05:30
Saqib Ansari
0a42d81993
fix: cannot find get_allow_cost_center_in_entry_of_bs_account
2020-03-11 14:27:40 +05:30
Saqib Ansari
91b307e7f8
fix: project link not set in accounts other than profilt and loss accounts
2020-03-11 13:59:15 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard ( #20847 )
2020-03-11 12:37:56 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea
fix: Get invoice details only if invoice is selected
2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
...
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30
Deepesh Garg
5e58666091
fix: HSN code not visible in GST Itemised Purchase register
2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices ( #20873 )
2020-03-09 18:30:47 +05:30
Rucha Mahabal
27512c86ae
refactor: Healthcare utils
2020-03-09 17:29:23 +05:30
Raffael Meyer
f669f30c08
add missing equity accounts
2020-03-06 16:17:06 +01:00
Deepesh Garg
1943fb0de4
feat: Allow PI creation without PO
2020-03-06 18:50:11 +05:30
Raffael Meyer
7b7513ab2b
adjust groups
2020-03-06 12:32:49 +01:00
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options
...
feat: update profit and loss for new report summary API
2020-03-04 16:07:31 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports ( #20803 )
2020-03-02 19:10:29 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer ( #20703 )
...
* fix: Excel support and UX fixes for chart of accounts importer
* fix: Linting Errors
* fix: Blank chart preview
* fix: Added template types for download
* fix: Description on template selection
* fix: Linting fixes
* fix: Move logic for download template to dialog
2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry ( #20794 )
...
* fix: Total amount not displayed in Journal Entry
* fix: Update paid_to_received field
* fix: set total amount
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable ( #20790 )
2020-03-02 17:50:05 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags ( #20774 )
2020-03-02 15:19:18 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco ( #20787 )
2020-03-02 15:01:06 +05:30
P-Froggy
f1014bb978
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-03-02 00:21:12 +01:00
P-Froggy
313efe9b32
fix: add missing semicolon
2020-03-02 00:21:08 +01:00
P-Froggy
3bf04154b1
Merge branch 'develop' into develop
2020-03-02 00:18:23 +01:00
P-Froggy
f9b3e4be78
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-02-28 20:46:41 +01:00
P-Froggy
266e689c4f
fix: Show swift number and branch code in quick entry of bank doctype
2020-02-28 20:46:36 +01:00
P-Froggy
393a626834
fix: Allow only bank accounts of the respective party in payment entry
2020-02-28 20:45:48 +01:00
Deepesh Garg
5707c9a731
fix: Item Wise report query fix ( #20760 )
2020-02-28 12:28:54 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period ( #20502 )
2020-02-27 19:09:34 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission ( #20676 )
...
* perf: improve gl entry submission
* perf: add indexes
* fix: replace **kwargs with *args
* fix: syntax error
* fix: remove cypress
* fix: travis
* chore: remove purchase invoice from status updater
* fix: set_staus args
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
* fix: only update status for invoices & fees
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Deepesh Garg
f444f451ac
fix: Remove debug statement
2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-27 16:01:47 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix ( #20733 )
...
* fix: Mandatory bank account error fix
* fix: SQL condition
2020-02-26 17:17:02 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop
2020-02-26 13:21:38 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule ( #20712 )
2020-02-26 12:51:46 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop
...
fix: Changes done to get valid customer and employee list on payment entry form(#20498 )
2020-02-26 12:17:47 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries ( #20709 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 11:36:55 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Deepesh Garg
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue
...
fix: account dashboard not working
2020-02-26 10:18:03 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return ( #20543 )
...
* fix: Paid amount updation for pos return
* fix: Remove console
* fix: Styling
* fix: get default mode of payment from POS profile
* fix: Add test cases
* fix: Codacy
2020-02-25 13:21:16 +05:30
Rohit Waghchaure
ebdf80ddb5
fix: account dashboard not working
2020-02-24 18:45:47 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls ( #20660 )
...
* chore: SINV set_status remove redundant function calls
* Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice ( #20666 )
2020-02-20 12:29:44 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash
...
feat(accounts): add german CoA "SKR03" (GnuCash)
2020-02-19 19:21:51 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop
...
fix: Plaid fixes and enhancements
2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5
fix: Styling and minor fixes
2020-02-18 18:04:09 +05:30
racitup
547a0bb909
fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions
2020-02-18 17:49:57 +05:30
racitup
719678957a
fix: Bank Reconciliation Bank Account and Bank Account No field names
2020-02-18 17:49:45 +05:30
racitup
1548e20b78
fix: KeyError about bank_account_no due to non-existent field: #20343
2020-02-18 17:49:08 +05:30
racitup
7cda218af3
fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343
2020-02-18 17:48:54 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report ( #20573 )
...
* feat: Group by AR/AP report
* fix: Do not consider total row in charts
* fix: Subtotal row for last party
2020-02-18 16:07:34 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix
...
fix: disabled mode of payments fetches in sales invoices
2020-02-18 12:38:06 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
P-Froggy
3cb9f4ab73
Add address and contact fields to bank
...
Address and contact fields are enabled for DocType Bank
2020-02-18 02:14:03 +01:00
P-Froggy
4cc929cabb
Move SWIFT-number and branch-code from bank account to bank
...
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
2020-02-18 00:38:46 +01:00
thefalconx33
23e728612f
fix: disabled mode of payments fetches in sales invoices
2020-02-17 14:15:20 +05:30
Yugandhara
ad645afeb2
fix: Changes done to get valid customer and employee list on payment entry form
2020-02-15 10:56:41 +05:30
Raffael Meyer
0fac1f9429
Add groups for account types "Bank" and "Cash"
2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355
Merge branch 'develop' into skr03_gnucash
2020-02-12 13:58:53 +01:00
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop
...
fix: added indexing on columns to fix performace issue
2020-02-11 10:12:49 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register ( #20251 )
...
* fix: Group by sales register report
* fix: Remove group-by item
* fix: Grand total query fix
* fix: Remove debug param
* fix: Code cleanup and commonification
* fix: Add group by functionality to purchase register
* fix: Changes in total row display
* fix: Minor fixes
* fix: Add total row
* fix: Do not calculate total for rate
2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3
fix: added indexing on columns to fix performace issue
2020-02-10 15:56:56 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups ( #20547 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-09 21:23:53 +05:30
Deepesh Garg
30e766b228
fix: SQL query in financial statements
2020-02-05 12:12:47 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view ( #20452 )
2020-02-03 17:05:26 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer ( #20465 )
...
* fix: Label and UX fixes while creating payment entry against customer
* fix: filter
2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile ( #20413 )
...
* feat: add tax category in pos profile
* fix: review fixes
2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements ( #20486 )
2020-02-03 15:49:24 +05:30
Deepesh Garg
cce3ac9f79
fix: Move E-Way bill button under create
2020-02-02 21:25:58 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new
...
fix: Do not show any finance book record if no finance book filter is applied
2020-01-31 13:19:16 +05:30
Deepesh Garg
34c33baa82
fix: Cash flow filter fix
2020-01-31 11:16:30 +05:30
Deepesh Garg
ba44f28202
fix: Filtering fixes in financial statement
2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8
fix: Do not show any finance book record if no finance book filter is applied
2020-01-30 15:33:51 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test
2020-01-30 13:03:05 +05:30
Raffael Meyer
e21cd5e7f1
fix: account number for "Kasse"
2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218
fix: add missing account types
2020-01-29 22:21:19 +01:00
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Pranav Nachnekar
3fb48ebf61
fix: discounting not applied on sales invoice created by subscriptions ( #20431 )
2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f
fix: Column 'project' in where clause is ambiguous ( #20438 )
...
* fix: Column 'project' in where clause is ambiguous
* fix: Fixed alias in query
2020-01-28 12:43:38 +05:30
Deepesh Garg
ef41a0eda5
fix: Finance book filtering in financial statements ( #20410 )
...
* fix: Finance book filtering in financial statements
* fix: Use IS NULL instead of ifnull
2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1
fix: incorrect status for fraction of outstanding amount ( #20369 )
2020-01-27 14:22:43 +05:30
Saqib
9291df4d4c
fix: wrong outstanding invoices fetched against employee ( #20373 )
2020-01-24 16:22:49 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort
...
fix: Order GL entries by creation time in General ledger
2020-01-24 13:19:39 +05:30
Rohit Waghchaure
8996b7d8a4
delete the auto created batch
2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476
fix: Order GL entries by creation time in General ledger
2020-01-23 17:42:57 +05:30
Rohit Waghchaure
4f4dbf1996
fix: unlink references from batch on cacnellation of stock transactions
2020-01-23 12:45:45 +05:30
rohitwaghchaure
5056c8bcb4
fix: not able to import chart of account if parent account is missing ( #20368 )
2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38
fix: account not added to child company ( #20361 )
2020-01-21 15:25:51 +05:30
Saqib
bcb6130bbe
fix: hide total amount field from journal entry PF ( #20324 )
2020-01-16 13:38:43 +05:30
sahil28297
32d643ed3c
fix(patch): reload tax category ( #20308 )
2020-01-15 18:57:54 +05:30
Saqib
617a24191f
fix: get existing payment req amount only from unpaid req ( #20289 )
2020-01-15 16:36:13 +05:30
Shivam Mishra
a59c2ce17a
fix: profit and loss indicator bug
2020-01-14 17:55:49 +05:30
Shivam Mishra
748c3d9e8b
feat: update profit and loss for new report summary API
2020-01-14 17:31:19 +05:30
Saqib
1218160c70
fix: payment entry can be created against on hold PI ( #20270 )
2020-01-14 12:07:24 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix
...
fix: remove default customer as party type
2020-01-13 13:48:55 +05:30
thefalconx33
f04d054faa
fix: remove default customer as party type
2020-01-13 12:43:49 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
Marica
287f491f7b
fix: Employee name in Report trial balance for party ( #20223 )
...
* fix: Employee name in Report trial balance for party
* fix: Add account filter in trial balance for party report
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-09 13:35:06 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request
...
fix: incorrect party type in payment request
2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77
fix: party type in payment request
2020-01-06 15:07:06 +05:30
Syed Mujeer Hashmi
03bf1a875f
feat: Allow write-off for Fees doctype
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-01-04 13:26:42 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop
...
fix: ignore pricing rule for other item group
2020-01-02 19:24:37 +05:30
Rohit Waghchaure
660a78b877
fix: ignore pricing rule for other item group
2020-01-02 17:31:09 +05:30
deepeshgarg007
473b478883
fix: Show closing row in general ledger print
2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431
feat: add accounts and account types
2020-01-01 22:55:54 +01:00
Javier Wong
5cc7648e9c
[Fix] Allow Print Before Pay in POS ( #20151 )
...
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
2019-12-31 17:07:37 +05:30
Saqib
cb7043fd9d
fix: party account currency not fetched from account for SO ( #20146 )
2019-12-31 13:55:13 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d
fix: format currency field in bank and cash payment voucher print format ( #20137 )
2019-12-30 15:18:07 +05:30
Saqib
7e57ede35b
fix: unpaid invoices are created even if current invoice is paid ( #20081 )
2019-12-27 13:02:13 +05:30
Deepesh Garg
1a2e4fa36d
Merge pull request #20087 from nextchamp-saqib/pay-reco-fix
...
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-27 08:13:09 +05:30
thefalconx33
81d0861506
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-26 14:42:11 +05:30
thefalconx33
6291ca8e40
fix: only show doctypes which impact accounting in accounting period
2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
...
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Rohit Waghchaure
682273a00b
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
Mitchy25
fee8340f98
fix: Bank Reconciliation Allows to Over Reconcile ( #19461 )
...
* Update bank_reconciliation.py
* fix: improve error message while over reconciling
* fix: only check over-reconciliation when against payment entry
Co-authored-by: Saqib <thefalconx33@gmail.com>
2019-12-24 18:02:18 +05:30
Don-Leopardo
ec258a43d9
perf: Asset Depreciations and Balances report ( #18022 )
2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3
fix: added validation for cost center ( #19932 )
...
* fix: add validation for cost centers in sales invoice
* use `get_cached_value` for getting compnay, formatting of error message
2019-12-24 16:46:46 +05:30
rohitwaghchaure
08433c2919
fix: supplier email id field not showing in the notification for purchase cycle doctypes ( #20071 )
2019-12-24 13:03:47 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension
...
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:57:50 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
2b3482d5dd
fix: Do not validate accounting dimensions if from repost ( #20042 )
...
* fix: Do not check for accounting dimensions in case of repost
* fix: Do not validate accounting dimensions if from repost
2019-12-23 17:58:50 +05:30
Saqib
9078607600
fix: paid amount gets overwritten by get_outstanding_invoices ( #20050 )
2019-12-23 16:25:16 +05:30
Saqib
4f18d2548d
fix: none type object updates AR report row ( #19958 )
2019-12-23 16:01:38 +05:30
Saqib
1263515a92
fix: exchange rate not fetching correctly ( #20010 )
2019-12-23 15:51:31 +05:30
Deepesh Garg
06e7cf3caa
Merge pull request #20009 from nextchamp-saqib/pi-payable-filter
...
fix: bad credit to filter in purchase invoice
2019-12-23 14:50:56 +05:30
thefalconx33
ee10f2f50d
fix: bad query for debit_to field in sales invoice
2019-12-23 13:07:00 +05:30
Deepesh Garg
704235565e
Merge pull request #20012 from nextchamp-saqib/share-transfer-perm
...
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:23:15 +05:30
thefalconx33
7e68f050d9
fix: account manager doesn't have cancel submit perm for share transfer
2019-12-20 14:50:25 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade
...
fix: Update sales register report
2019-12-19 13:53:15 +05:30
thefalconx33
e9cb561d8d
fix: no role has cancelling permission for share transfer doctype
2019-12-19 13:18:46 +05:30
thefalconx33
9d9a78442e
fix: bad filter query
2019-12-19 13:10:57 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
deepeshgarg007
be8c406808
fix: Update sales register report
2019-12-17 22:27:23 +05:30
deepeshgarg007
e65ada2807
feat: Dynamic filters for dimensions in budget variance report
2019-12-17 17:54:34 +05:30
rohitwaghchaure
5d0c42e2a1
Merge pull request #19943 from nextchamp-saqib/gl-precision-fix
...
fix: gl entries doesn't filter based on debit precision
2019-12-17 17:23:34 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13
...
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a
fix: incorrect outstanding amount shwoing in the AP/AR report
2019-12-17 12:48:02 +05:30
rohitwaghchaure
86b2956ac0
Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount
...
fix: pricing rule not working for product discount
2019-12-16 14:44:22 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 22:49:53 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix
...
fix: Price rule filtering fix
2019-12-13 16:01:16 +05:30
thefalconx33
bfc43d3b15
fix: gl entries doesn't filter based on debit precision
2019-12-13 15:41:19 +05:30
deepeshgarg007
8c9c6ec919
fix: Price rule filtering fix
2019-12-13 13:47:15 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix
...
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:54 +05:30
Suraj Shetty
f95267041d
fix: Financial statement report
...
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
2019-12-12 13:06:17 +05:30
prssanna
2ef26fbb07
fix: empty fname and fcontent of uploaded file
2019-12-11 14:21:04 +05:30
Saqib
664d0d89b5
fix: incorrect account mapping for child companies ( #19887 )
...
* fix: incorrect account mapping for child companies on adding account to parent company
* Update account.py
2019-12-10 21:32:17 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Deepesh Garg
ce42f48bfb
fix: Append expense account only if expense account exists ( #19880 )
2019-12-10 12:15:33 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
Saqib
39e4f75a76
fix: get outstanding invoices btn working on submitted payment entry ( #19858 )
2019-12-09 13:16:35 +05:30
Deepesh Garg
b63101250c
fix: Rounding Adjustment GL entry fix ( #19838 )
...
* fix: Rounding Adjustment GL entry fix
* fix: Spacing in tab
* fix: Comment fix
2019-12-09 13:03:24 +05:30
Raffael Meyer
af9c5fda9e
rename CoA
2019-12-07 14:22:51 +01:00
Raffael Meyer
05d708b51c
add some missing accounts
...
Aktive Rechnungsabgrenzung
Passive Rechnungsabgrenzung
Kasse
Verblk. aus Lohn und Gehalt
Erlöse
2019-12-07 14:21:22 +01:00
Raffael Meyer
d86cefe1a5
first draft
2019-12-07 13:10:44 +01:00
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person ( #19796 )
2019-12-04 15:30:58 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting ( #19805 )
2019-12-04 15:30:01 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms
...
feat: Receivable / payable summary based on payment terms
2019-12-04 11:25:28 +05:30
Saqib
d635bda29b
fix selling setting label for sales order reqd ( #19775 )
2019-12-03 17:05:06 +05:30
Khushal Trivedi
73129e6ac8
fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' ( #19774 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
2019-12-03 17:03:45 +05:30
Nabin Hait
e176c3c1d1
feat: Receivable / payable summary based on payment terms
2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8
fix: Party name field in trial balacne for party report ( #19789 )
2019-12-03 16:31:07 +05:30
Deepesh Garg
03d1394540
fix: Unable to see parties with negative balance in AR/AP Summary ( #19776 )
2019-12-03 15:12:44 +05:30
Deepesh Garg
06a6fa4cfc
feat: Accounts Payable report based on payment terms ( #19672 )
2019-11-29 16:56:27 +05:30
rohitwaghchaure
d76529e6ca
Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix
...
fix: Serial no validation against sales invoice
2019-11-29 16:34:58 +05:30
deepeshgarg007
c51dd2989e
fix: Validation msg
2019-11-29 15:56:16 +05:30
deepeshgarg007
45f57f273c
fix: Serial no validation against sales invoice
2019-11-29 15:56:08 +05:30
rohitwaghchaure
b59a25b02b
Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module
...
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:29:31 +05:30
Mangesh-Khairnar
92b9d7383d
fix: show create payment request for so that are not billed
2019-11-29 14:22:52 +05:30
Rohit Waghchaure
bf8fe06f86
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:14:11 +05:30
Marica
8f48896261
fix: Permission issue in Stock Entry ( #19738 )
2019-11-28 19:39:49 +05:30
Anurag Mishra
f3b393f5e0
fix: UOM was not fetching in purchase invoice ( #19732 )
...
* fix: UOM was not fetching in purchase invoice
* fix: Changes requested
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645
fix: Validation for parent cost center ( #19664 )
...
* fix: Validation for parent cost center
* fix: Minor modification in condition
* fix: Update test cases for invalid cost center creation
2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c
Fix: Logic bug ( #19692 )
...
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
- if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
- should be if accounts[d]['is_group'] not in ('', 0)
However, the correction provided here:
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]
is more consistent with the prior statement that extracts ledger (and not group) accounts.
account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f
fix: Account type in Handling Difference in Inventory account ( #19674 )
...
* fix: Account type in Handling Difference in Inventory account
* fix: Add Stock Adjustment account
* fix: Rename account to stock adjustment
2019-11-28 18:29:33 +05:30
Shivam Mishra
2512962f55
fix: handle None case for get_shipping_amount_from_rules ( #19723 )
2019-11-28 16:46:58 +05:30
rohitwaghchaure
1511154aa8
fix: removed stock value and account balance out of sync validation ( #19729 )
...
* fix: revert value out of sync feature
* fix: removed stock value and account balance out of sync validation
2019-11-28 16:43:39 +05:30
Deepesh Garg
31a4fa5dd3
Merge pull request #19606 from deepeshgarg007/shareholder_refactor
...
refactor: Share Transfer code cleanup and refactor
2019-11-26 07:54:57 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg ( #19676 )
...
* fix: Prefilled JV via Account Balance and Stock Value mismatch error message
- Make JV button will route to Journal Entry and add rows in child table
* fix: make journal entry to sync stock and account balance
* fix: translated action label
2019-11-25 14:02:51 +05:30
Nabin Hait
2fd6814cbf
Merge branch 'marination-account_stock_sync_error' into develop
2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4
fix: make journal entry to sync stock and account balance
2019-11-25 12:33:40 +05:30
Saqib
f37a46edea
Fixed Asset Refactor Review fixes ( #19665 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +05:30
Nabin Hait
aff4a67954
Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error
2019-11-22 15:14:32 +05:30
Mangesh-Khairnar
b10526dd86
fix: consider taxes in the grand total ( #19631 )
2019-11-22 12:28:33 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting ( #19656 )
2019-11-22 11:35:14 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting ( #19657 )
2019-11-22 11:34:50 +05:30
Rucha Mahabal
45e9dd9c51
fix(Journal Entry): default Cash Entry account not getting fetched
2019-11-20 11:40:38 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix
...
fix: stock qty not displayed in pos
2019-11-19 19:41:25 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Nabin Hait
9db9edca2c
fix(expense claim): fetch outstanding documents based on party account type
2019-11-19 18:44:54 +05:30
thefalconx33
353f73a153
fix: stock qty not displayed in pos
2019-11-19 18:37:21 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos
...
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-19 09:47:55 +05:30
deepeshgarg007
0debcf9f2f
fix: Share existing condition logic
2019-11-18 22:12:29 +05:30
deepeshgarg007
9c1c4ef3dd
refactor: Share transfer cancellation and code cleanup
2019-11-18 17:52:19 +05:30
marination
6ef057a2a3
fix: Prefilled JV via Account Balance and Stock Value mismatch error message
...
- Make JV button will route to Journal Entry and add rows in child table
2019-11-18 15:55:32 +05:30
Rohit Waghchaure
466702200f
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90
fix: Book valuation expense in specified account rather than expense included in valuation account ( #19590 )
...
* fix: Book valuation expense in specified accout rather than expense included in valuation account
* fix: Remove undefined variable
* fix: Test cases
* fix: Test Case
2019-11-18 12:34:30 +05:30
Saqib
d995609ffa
Fixed asset refactor ( #19369 )
...
* refactor: Asset Movement with multiple assets using table
* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset
* feat: Auto create asset on Purchase checkbox
* refactor: LCV for asset created via PR/PI
* refactor: get asset category accounts from item master
* refactor: Purchase Receipt for asset purchasing
* refactor: Purchase Invoice for asset purchasing
* fix: post-refactor delete fixes
* refactor: moved asset validation from pr/pi on asset submission
* fix: Asset Category should be defined for auto purchasing assets
* fix: undo serial_no_update removal (for non asset item) from LCV
* fix: remove duplicate calls from item.js
* fix: args position of all occurrence of get_asset_category_account()
* fix: test cases
* fix: landed cost voucher validations
* refactor: test case for auto creation of asset
* fix: removed invalid assertions
* fix: patch errors on travis
* fix: codacy fixes
* fix: PI Items not fetching details from item
* fix: asset movement from list view having default purpose 'Receipt'
* chore: msgprint for selecting item code first while creating asset manually
* fix: alert messages
* minor: asset movement fixes
* fix: lcv was made against submitted assets
* minor: ux fixes
* refac: move specific asset validation to SINV
* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code
* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests
* fix: code review changes
* chore: remove unecessary asset movement updation
* refac: setting latest location while making asset movements
* Added extra validations
* fix: form dashboard make lcv button
* fix: auto asset movement creation validation
* fix: allow lcv against other items after removing submitted assets
* chore: remove unwanted condition
* fix: mismatch debit credit on purchase of asset with valuation tax
* chore: toggle required field based on movement type
* chore: fix lcv error message
* fix: travis failing
* fix: travis failing test
* fix: wrong conditions after merge
* fix: cannot cancel assets
* fix: travis failing* fix change in deletion of assets
* fix: codacy
* fix: process cancellation of assets
* refac: cancellation of pr only deletes auto created assets
* fix: incorrect query
2019-11-18 11:46:55 +05:30
deepeshgarg007
57bd1308eb
fix: Validation messages code cleanup
2019-11-15 08:25:48 +05:30
prssanna
74bbcb539f
fix: Ignore period closing voucher entries in accounts dashboard
2019-11-14 22:47:58 +05:30
Marica
c9e8a1bf96
fix: Account Balance and Stock Value out of sync error message ( #19526 )
...
* fix: Account Balance and Stock Value out of sync error message
Added 'Make Adjustment Entry' button and enhanced message
* fix: Split message and changed routing for translation
2019-11-14 16:13:43 +05:30
Nabin Hait
ec082754b4
fix: One serial no can be tagged in multiple invoices if used against different items ( #19580 )
2019-11-14 13:28:24 +05:30
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding ( #19573 )
2019-11-13 18:49:23 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms ( #19563 )
2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
...
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
deepeshgarg007
5ea4328359
fix: Accumulated Values filter disappearing
2019-11-13 13:23:49 +05:30
Marica
d00c59830e
feat: Disable CWIP Accounting checkbox added in Company and Asset Category ( #19262 )
...
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
Deepesh Garg
3cc3b57926
fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry ( #19427 )
...
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry
* fix: Codacy
* fix: Minor UX fixes
* fix: Also credit payable amount in case of advance payment
* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
deepeshgarg007
929676fceb
fix: Validation logic code cleanup
2019-11-12 12:00:30 +05:30
Mitchy25
a227b9a9a6
Fix Bank Reconcilaition for Payment Entries ( #19190 )
...
* Fix Bank Reconciliation with Payment Entries
* Update bank_reconciliation.js
2019-11-11 17:29:53 +05:30
Nabin Hait
32936024a0
patch: set default for add taxes from item tax template
2019-11-11 15:44:27 +05:30
Nabin Hait
8bd2d4d35e
fix(trial balance): Show opening and closing of group account in single column ( #19509 )
2019-11-11 10:59:20 +05:30
Deepesh Garg
7a23057eab
feat: Enhancement in landed cost voucher ( #19252 )
...
* feat: Enhancement in landed cost voucher
* fix: Make GL entries based on ledgers in Landed cost voucher
* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry
* fix: Ability to select expense account in Stock Entry
* fix: Renaming and test case fixes
* fix: Test Cases
* fix: Additional cost in Stock Entry
* fix: Changed filters and test case fixes
* fix: Upadte filters in stokc entry expense account filter
* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43
fix: Accounting Dimension custom fields should be admin owned ( #19525 )
...
* fix: Accounting Dimension custom fileds should be admin owned
* fix: Update query
* fix: Travis
2019-11-08 12:42:38 +05:30
Nabin Hait
628701f1a5
fix: Accounts mandatory depending on share transfer type ( #19523 )
2019-11-07 18:05:40 +05:30
Marica
e37a67245e
fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note ( #19388 )
2019-11-07 12:52:23 +05:30
Mitchy25
a5776d16b4
fix: Version 12 Bank Reconciliation fix ( #19182 )
...
* Fix Bank Reconciliation
Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters
* Update bank_reconciliation.js
Removing incorrect fix to filters.
Filters are loaded from Bank Transaction List.
* Update bank_reconciliation.js
2019-11-06 19:04:54 +05:30
Deepesh Garg
02b9472152
Merge pull request #19490 from prssanna/dashboard-fix
...
fix: fix dashboard with date range
2019-11-06 18:17:08 +05:30
Marica
1beed7db72
fix: Added 'status' field in Payment Entry ( #19507 )
2019-11-06 18:12:29 +05:30
rohitwaghchaure
0c12eded05
Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report
...
fix: unknown column credit limit in accounts receivable report
2019-11-06 17:26:35 +05:30
Deepesh Garg
f67833f249
Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3
...
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-06 16:40:04 +05:30
rohitwaghchaure
6a50c92087
Update accounts_receivable.js
2019-11-06 16:34:17 +05:30
rohitwaghchaure
e123ec6b45
fix: incorrect number of entries while making deferred revenue entry ( #19473 )
2019-11-06 15:25:00 +05:30
Saqib
01c19d3b93
internal issues ( #19496 )
...
* fix: user remark mandatory in quick entry but not in form
* fix: preview salary slip btn showing in draft and unsaved states
* minor: removed unecessay comma
* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Rohit Waghchaure
dec5bead9c
fix: unknown column credit limit in accounts receivable report
2019-11-06 13:13:31 +05:30
Gavin D'souza
05710804cf
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-04 14:45:11 +05:30
prssanna
7e2b030052
fix: fix dashboard with date range
2019-11-04 13:07:27 +05:30
Ashish Shah
28710cdf99
fix: coupon code changes suggested by prasad ( #19352 )
...
* changes suggested by prasad
* codacy correction
2019-10-31 16:09:06 +05:30
Suraj Shetty
77e4cf89f8
fix: Pass parent_acc_name ( #19450 )
2019-10-31 15:57:31 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
rohitwaghchaure
3270ba6d8c
Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
...
fix: 'NoneType' object is not iterable
2019-10-29 11:30:22 +05:30
Anurag Mishra
07b908c0c5
patch: Missing Patch for item Tax template
2019-10-28 16:00:24 +05:30
Rohit Waghchaure
8916916a03
fix: 'NoneType' object is not iterable
2019-10-28 13:00:18 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance
2019-10-26 18:45:01 +05:30
Pranav Nachnekar
d5166861de
fix:setting incorrect field for party bank account
...
Previously
Corrected
2019-10-23 07:46:00 +00:00
Saurabh
48eff90d1f
fix: Don't show make jv button if equity or liability account and asset account not specified ( #19350 )
2019-10-21 16:03:28 +05:30
Nabin Hait
f2d37a7280
fix: Removed inter-company account filter for inter-company journal entry ( #19308 )
2019-10-21 13:36:47 +05:30
Nabin Hait
8232bd01d6
fix: Positive qty in sales return print ( #19310 )
2019-10-21 13:36:26 +05:30
deepeshgarg007
737ec6b26e
fix: Travis
2019-10-20 17:36:36 +05:30
Rohit Waghchaure
66072fec5a
fixed conflicts
2019-10-15 14:18:59 +05:30
ashish-greycube
cf24191fe5
feat: affiliate sales partner referral code and coupon code
2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
Saqib
66762380ed
fixes: internal issues ( #19201 )
...
* fix: Delivery Trip now has editable start address.
* fix: default party type not set in Journal Entry
* fix: maintainence visit purpose table not fetching item name
* fix: maintainence visit purpose table not fetching item name
2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
1d781f13b2
fix: fetch allocated amount for individual invoice ( #19259 )
2019-10-11 11:06:11 +05:30
Deepesh Garg
2d064ee67a
fix: Remove bold property from disable checkbox ( #19280 )
2019-10-11 10:43:38 +05:30
Kenneth Sequeira
a54b7542f1
fix: sales invoice labels ( #19267 )
2019-10-10 18:50:39 +05:30
Faris Ansari
38ac7f7350
Enhancements to Supplier Portal ( #19221 )
...
* fix: Add Purchase Order to portal
* fix: Create Customer or Supplier on first login
Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.
* fix: Styling for transaction_row
* fix: Styling for RFQ page
* fix: Add Purchase Invoice route
- Make Purchase Invoice from PO
* fix: minor
- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Deepesh Garg
41a6548acb
fix: Label and dependes on fixes in Bank Account ( #19245 )
2019-10-04 16:22:00 +05:30
Deepesh Garg
894604201b
Merge pull request #19242 from thefalconx33/git-issues
...
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
2019-10-03 22:39:04 +05:30
thefalconx33
4723da0251
fix : #19239
2019-10-03 13:06:43 +05:30
Sahil Khan
c5a6e9da15
Merge branch 'develop' into version-12
2019-10-02 16:36:54 +05:30
Deepesh Garg
b54f0fb388
fix: Party column empty in accounts receivable/ payable summary ( #19205 )
2019-09-30 15:19:56 +05:30
Deepesh Garg
91aa671a23
Merge pull request #19137 from marination/invoice-discounting
...
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
2019-09-30 12:43:09 +05:30
Deepesh Garg
296bf9ef42
chore: Add standard chart of accounts template for El Salvador ( #19151 )
...
* chore: Add standard chart of accounts template for El Salvador
* fix: Renane template file
2019-09-30 11:02:49 +05:30
Rohan
e19e16fbf1
fix: remove internal fields from print ( #19101 )
2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68
Merge branch 'develop' into invoice-discounting
2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df
fix(Contact): mobile_no re-introduced and travis fixes ( #19009 )
...
* fix: mobile_no re-introduced
* fix: test cases
* fix: set email as primary
* fix: add primary email and phone
* fix: utils for contact creation
* chore: remove = from dict
2019-09-30 10:08:15 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger ( #19155 )
2019-09-26 16:44:35 +05:30
sahil28297
a9ff4f6688
fix(Report): Sales Register
2019-09-26 13:58:00 +05:30
Marica
54becbb33a
fix: Codacy fix(whitespaces)
2019-09-26 11:24:34 +05:30
marination
a877115ff4
fix: Minor changes
...
Added value in fetch from and removed client side code
2019-09-26 11:08:39 +05:30
marination
e7f67592a8
fix: Made outstanding amount field read only and added validation
...
Made the field editable so that outstanding amount can be adjusted
2019-09-26 10:58:02 +05:30
marination
ed004018d6
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
...
It wrongly fetched grand total from sales invoice instead of outstanding amount.
2019-09-26 10:58:02 +05:30
Rucha Mahabal
132323462c
fix(Report): Sales Register ( #19166 )
2019-09-25 16:03:45 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency ( #19154 )
2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451
enhancement(tds-monthly-payable): remove zero value transaction ( #19141 )
2019-09-24 19:46:06 +05:30
Rucha Mahabal
824376a045
fix(Journal Entry): Opening Entry not fetching accounts ( #19148 )
2019-09-24 19:13:55 +05:30
Deepesh Garg
d9e9d562f8
fix: Travis (develop) ( #19140 )
...
* fix: Travis
* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Anurag Mishra
2c60f6419e
feat: missmatching amount in GST Sales report and itemised sales report ( #19116 )
2019-09-20 23:00:09 +05:30
Mangesh-Khairnar
a44e8afe71
feat: add bank account in payroll entry ( #19021 )
...
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
2019-09-20 18:19:47 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix
...
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 19:01:05 +05:30
marination
8590112faa
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 17:48:23 +05:30
rohitwaghchaure
d019d28bc9
fix: Customer Ledger Summary report not working on python 3 ( #19092 )
2019-09-17 18:45:59 +05:30
rohitwaghchaure
ad5fc07652
Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11
...
fix: plc conversion issue for offline pos
2019-09-17 13:24:41 +05:30
Rohit Waghchaure
094612dc02
fix: plc conversion issue for offline pos
2019-09-17 13:04:28 +05:30
Deepesh Garg
c5c3860c5c
fix: Mandatory accounting dimensions while creating asset depreciation entry ( #19073 )
...
* fix: Mandatory accounting dimensions while creating asset depreciation entry
* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42
fix: not able to change the account type in parent company account head ( #19083 )
2019-09-17 12:49:52 +05:30
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center ( #19065 )
2019-09-16 19:44:37 +05:30
Mangesh-Khairnar
dce04b7335
fix: filter for payment order ( #19070 )
2019-09-16 19:40:27 +05:30
Sammish Thundiyil
a2a9b39794
modified: erpnext/accounts/doctype/account/account.json ( #19032 )
2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96
fix: Invalid reference doctypes for accounting dimensions ( #19027 )
...
* fix: Invalid reference doctypes for accounting dimensions
* fix: Add server side validation for accounting doctypes
* fix: set fieldname and label before insert
2019-09-16 13:26:37 +05:30
rohitwaghchaure
87000977d5
Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop
...
fix: user can able to change rate and discount even if they don't have permissions
2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0
fix: user can able to change rate and discount even if they don't have permission
2019-09-16 11:15:22 +05:30
rohitwaghchaure
4a323463f7
fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices ( #19039 )
2019-09-13 18:36:57 +05:30
Nabin Hait
93a9c08116
fix: Allocate payment amount in reference table on change of payment amount ( #19041 )
2019-09-13 15:48:50 +05:30
Rucha Mahabal
72949e7f73
fix: share transfer validations for journal entry ( #19018 )
...
* fix share transfer validations for journal entry
* fix: share transfer test
* fix: tests
2019-09-13 11:05:40 +05:30
Nabin Hait
a5dfe0725f
fix: payment against shareholder ( #19019 )
2019-09-12 19:17:24 +05:30
Sammish Thundiyil
504e52ff46
refactor: cost center ( #19011 )
...
* modified: erpnext/accounts/doctype/cost_center/cost_center.json
* fix: removed unique property from cost_center_name
2019-09-12 13:48:41 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well
2019-09-11 18:39:49 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document ( #18988 )
2019-09-11 12:43:27 +05:30
Nabin Hait
a035428d43
fix: handling of key does not exists error
2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c
Merge branch 'develop' into version-12
2019-09-10 14:38:39 +05:30
Sammish Thundiyil
bcda12f4bb
modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json ( #18829 )
2019-09-10 14:11:02 +05:30
Anurag Mishra
89d3bc0b54
fix: sales invoice return print format overideing the meta default print format
2019-09-09 15:58:25 +05:30
Prssanna Desai
ddfbb07c3b
fix: fix accounts balance timeline dashboard chart source ( #18942 )
...
* fix: fix accounts balance timeline dashboard chart source
* fix: pass chart_name to get function instead of chart object
2019-09-06 15:38:06 +05:30
Nabin Hait
4ce38059ac
feat: Company wise credit limit
2019-09-06 14:33:10 +05:30
Marica
a93b665427
fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List ( #18937 )
...
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
2019-09-05 18:26:45 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring ( #18931 )
2019-09-05 16:43:20 +05:30
Raffael Meyer
48d1463825
fix(CoA): SKR04 ( #18820 )
...
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
- move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5
Party accounts if don't have default company ( #18771 )
...
Add check for get_default company
2019-09-05 15:14:09 +05:30
Nabin Hait
16a7ec95dc
fix: tax category is optional argument
2019-09-05 13:01:15 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit
2019-09-05 12:34:34 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py
2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working
...
fix: offline pos item search not working
2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659
fix: offline pos item search not working
2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) ( #18647 )
...
* feat: employee incentive and retention bonus added in additional salary
* fix: added salary component field, logic improved
* fix: codacy review
2019-09-03 20:45:52 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report ( #18906 )
2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit
2019-09-03 14:20:17 +05:30
Deepesh Garg
c174e4d01a
fix: Default message from Payment Gateway Account not fetching ( #18848 )
2019-09-03 14:17:41 +05:30
Mangesh-Khairnar
4bcc221ee3
Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit
2019-09-02 23:18:56 +05:30
deepeshgarg007
402d82b4c5
fix: Remove delete_doc from tests
2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd
fix: remove references of mobile_no
2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657
fix: fix query for contacts
2019-09-02 13:20:27 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount
...
fix: Paid amount 0 while creating advanced payment entry
2019-09-02 08:38:34 +05:30
Mangesh-Khairnar
79525327f0
feat: bypass credit limit check
2019-08-29 19:50:23 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings ( #18825 )
2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd
fix: show a descriptive message on submission of duplicate account ( #18486 )
...
* fix: show a descriptive message on submission of duplicate account
* Update account.py
2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3
chore: remove unwanted code ( #18645 )
2019-08-23 16:31:09 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py
2019-08-23 12:27:05 +05:30
Anurag Mishra
db88476f8b
feat: refactor invoice_discounting ( #18629 )
...
* feat: refactor invoice_discountig
* Update invoice_discounting.py
* Update invoice_discounting.js
2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe
fix: POS Sync Issue ( #18807 )
2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount
2019-08-23 10:42:23 +05:30
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop
...
fix: reconciled entry has not clearance date set
2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop
...
fix: debit note not reconciled with another purchase invoice using pa…
2019-08-21 23:35:35 +05:30
Anastes Mp
a6c6e02c49
Incorrect database table ( #18558 )
...
Fixed Unknow Column tax_type error on offline pos
2019-08-21 16:53:06 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry ( #18792 )
2019-08-21 14:47:33 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
rohitwaghchaure
16dda1a991
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18779 )
2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18777 )
2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
c97a7fb845
fix: restrict the payment order to non received type payment entries
2019-08-20 00:27:43 +05:30
Rohit Waghchaure
1008e6e450
fix: debit note not reconciled with another purchase invoice using payment reconciliation
2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order
2019-08-19 16:29:30 +05:30
Deepesh Garg
960a1cbd8f
fix: Party dashboard heatmap not capturing sales, purchase and other activities ( #18753 )
2019-08-19 11:51:16 +05:30
Anurag Mishra
bc5712a1b3
fix: validated cost center in financial_statement ( #18733 )
...
* fix: validated cost center in financial_statement
* Update financial_statements.py
2019-08-19 10:24:44 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
...
fix: Default dimensions in child doctypes
2019-08-16 17:27:14 +05:30
deepeshgarg007
42d9298318
fix: Remove extra space
2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order
2019-08-16 12:42:26 +05:30
deepeshgarg007
2fb6bc9867
fix: Default dimensions in child doctypes
2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
...
fix: sequence of customer name and contact in the AR report
2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f
fix: sequence of customer name and contact in the AR report
2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950
fix: restrict the payment order to non received type payment entries
2019-08-14 17:38:44 +05:30
Anurag Mishra
78690d7b8b
fix:payment ammount validation for pos invoices ( #18663 )
2019-08-14 15:03:58 +05:30
Deepesh Garg
2c5dcbe819
fix: Error handling in payment entry ( #18720 )
2019-08-14 14:26:37 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
...
fix: Check if account passed is accessible under Payment Entry
2019-08-13 18:37:17 +05:30
Anurag Mishra
d2f13fe0a6
fix: query ( #18709 )
2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38
Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission
2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97
fix: Re-organise code
2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea
fix: Ignore account permission check
2019-08-13 12:09:06 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description
2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299
fix: Check if account passed is accessible under Payment Entry
2019-08-12 16:18:36 +05:30
Rohit Waghchaure
fb23773935
fix: reconciled entry has not clearance date set
2019-08-12 15:35:19 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12
...
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:26:54 +05:30
marination
9839a9afb0
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:54:18 +05:30
marination
4583100537
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:30:05 +05:30
rohitwaghchaure
536e6bf57c
fix: group by condition in the payment reconciliation ( #18657 )
2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec
fix: accounting period ( #18477 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 17:39:13 +05:30
Deepesh Garg
f2bf76a2ef
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18653 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18654 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650
fix: Changes in print format due to attribute name changes in frappe ( #18639 )
2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0
fix: Changes in print format due to attribute name changes in frappe ( #18641 )
2019-08-08 15:51:50 +05:30
Mangesh-Khairnar
e5c733bdb3
fix: Accounting period ( #18630 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 15:44:11 +05:30
Suraj Shetty
0c699f0726
fix: Paid amount 0 while creating advanced payment entry
...
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.
Solution: Populate paid amount value after applying conversion rate
2019-08-07 10:17:05 +05:30
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12
...
fix: Ambigious column in query
2019-08-05 22:38:45 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop
...
fix: Ambigious column in query
2019-08-05 14:45:30 +05:30
deepeshgarg007
23f30cdb8b
fix: Aambigious column in query
2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6
fix: Aambigious column in query
2019-08-05 12:40:50 +05:30
Anurag Mishra
08df6bda41
fix: query ( #18468 )
2019-08-05 10:27:25 +05:30
Anurag Mishra
7e1987ed48
feat: validate cwip accounts for journal Entry ( #18518 )
2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0
feat: validate cwip accoutns in journal entry ( #18519 )
2019-08-05 10:18:37 +05:30
deepeshgarg007
a499079250
fix: Remove non standard fieldname
2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12
2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc
fix: Remove payment order from bank dashboard
2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8
fix: Remove payment order from bank dashboard
2019-08-03 10:17:44 +05:30
Sahil Khan
8426ff726a
Merge branch 'version-12-hotfix' into version-12
2019-08-02 14:27:59 +05:30
deepeshgarg007
c16ef32b6b
fix: Payment Order link fix in bank dashboard
2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39
fix: Payment Order link fix in bank dashboard
2019-08-01 13:24:48 +05:30
Deepesh Garg
d301d26fda
fix: Enhancement in credit note ( #18511 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16
fix: Enhancement in credit note ( #18510 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
deepeshgarg007
107c07e5cb
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069
fix: Code cleanup
2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2
fix: GL entry validation fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91
fix: Test cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb
fix: Test Cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b
fix: Set query fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c
fix: Codacy Fixes
2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1
fix: Remove dimensions from boot
2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79
fix: Added default dimension and filter in bootinfo
2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310
fix: Default Accounting Dimensions in doctypes
2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
...
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +05:30
deepeshgarg007
ec421df4e4
fix: Code cleanup
2019-07-29 08:58:56 +05:30
deepeshgarg007
a65ad10c62
fix: GL entry validation fix
2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241
Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension
2019-07-27 18:11:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds ( #18491 )
...
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster
...
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
dda6b5cd53
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc
fix: Test cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc
fix: Test Cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c
fix: Set query fix
2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb
fix: Codacy Fixes
2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671
fix: Remove dimensions from boot
2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013
fix: Added default dimension and filter in bootinfo
2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4
fix: Default Accounting Dimensions in doctypes
2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Faris Ansari
6998412990
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:15:45 +05:30
Aditya Hase
0d333894c9
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 05:54:04 +05:30
Aditya Hase
6a5b7f751c
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 00:23:13 +05:30
deepeshgarg007
f56284b0c1
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:44:50 +05:30
Rohit Waghchaure
6d0c6a17d9
fix: multi currency bank reco issue
2019-07-24 12:48:06 +05:30
Rushin Parikh
40240b7d96
fix: filter reference name by cost center in journal entry account ( #17948 )
...
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice
* Update journal_entry.js
2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142
fix: payment document link fix ( #18301 )
2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
64c780e8c7
fix: update percentage on creation of invoice for zero amt transaction ( #18382 )
2019-07-22 11:28:58 +05:30
Saurabh
90d7a8888f
fix: pass missing argument while generating consolidated financial statement for cash flow type ( #18398 )
2019-07-22 11:22:34 +05:30
Aditya Hase
dc42cc3998
fix(sales-invoice): Use orm instead of frappe.db.sql ( #18434 )
2019-07-22 11:19:07 +05:30
crescent28
b978c9173d
fix: added null check for filters ( #18416 )
...
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome!
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-22 11:13:27 +05:30
Rohit Waghchaure
93b7ece8b0
fix: disable field's fieldtype changed from data to check
2019-07-21 00:02:09 +05:30
deepeshgarg007
2ddbebfae0
fix: Condition fix
2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470
fix: Assignment fix
2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1
fix: Condition fix in get_balance_on function
2019-07-20 14:46:59 +05:30
rohitwaghchaure
8fedf53304
Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile
...
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-19 08:00:33 +05:30
Anurag Mishra
0e23307dbf
fix: handled value Error ( #18361 )
2019-07-18 12:43:18 +05:30
rohitwaghchaure
6349f61882
Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop
...
fix: offline pos syncing issue for customer
2019-07-17 21:37:55 +05:30
Rohit Waghchaure
438efb4008
fix: cost center not able to access
2019-07-17 21:21:58 +05:30
Rohit Waghchaure
0851c94e9b
fix: offline pos syncing issue for customer
2019-07-17 20:36:33 +05:30
Rohit Waghchaure
dcf2d3532e
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-17 19:28:36 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes
2019-07-16 16:17:07 +05:30
Mangesh-Khairnar
b560050334
fix(payment-entry):remove unused argument
2019-07-16 12:11:44 +05:30
Deepesh Garg
8c21703959
fix: Fixes in get_balance_on function ( #18324 )
2019-07-16 09:41:01 +05:30
Deepesh Garg
8fcd426dab
Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop
...
feat: added payment terms filter in the accounts payable summary
2019-07-16 08:39:30 +05:30
deepeshgarg007
af6c09ae09
fix: Codacy
2019-07-16 08:33:13 +05:30
Rohit Waghchaure
4c0dffe687
feat: added payment terms filter in the accounts payable summary
2019-07-16 02:00:41 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements
...
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
deepeshgarg007
84d1e12f34
fix: Typo
2019-07-15 18:42:22 +05:30
deepeshgarg007
2093ffc15b
fix: Usability fixes in accountng dimensions
2019-07-15 18:21:05 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields ( #17788 )
...
* refact: Refactored over delivery/receipt/billing fields
* fix: test case
2019-07-15 18:02:58 +05:30
deepeshgarg007
1cc46c06b0
Merge branch develop into ac_dim_usability_fixes
2019-07-15 15:34:40 +05:30
Nabin Hait
d83e39d0ac
Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements
2019-07-15 13:56:29 +05:30
Nabin Hait
5435b7e9eb
fix: Null issue
2019-07-15 13:56:09 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
rohitwaghchaure
3643d67249
Merge pull request #18023 from fproldan/fix_by_voucher_order_develop
...
fix: General Ledger Group by Voucher not ordering by posting_date for develop
2019-07-14 17:23:54 +05:30
rohitwaghchaure
f414c8945f
Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree
...
fix: Dr / Cr label for balance of the ledgers in the account tree
2019-07-14 17:00:58 +05:30
deepeshgarg007
5ea542b08b
fix: Do not show Project, Cost Center and Accounting Dimension in ref doc
2019-07-13 11:39:32 +05:30
Rohit Waghchaure
8412f847d4
fix: dr / cr label for balance of the ledgers in the account tree
2019-07-12 15:44:58 +05:30
Deepesh Garg
ed9ac14f70
fix: Usability fixes for chart of Accounts Importer ( #18285 )
...
* fix: Usablity fixes for chart of Accounts Importer
* fix: Provide Row no with error messages
2019-07-12 14:47:00 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency
2019-07-12 12:24:05 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart
2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f
fix(sales-invoice): get items from quotation ( #18237 )
2019-07-11 10:04:46 +05:30
deepeshgarg007
285701d9f1
fix: Add missing Cost Center filter in cash flow statement
2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f
feat: added chart to cash-flow report
2019-07-10 20:28:52 +05:30
Don-Leopardo
365a572073
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-10 10:52:59 -03:00
Suraj Shetty
61d8088be4
fix: Return fieldtype so that the client-side can format chart values ( #18211 )
2019-07-10 17:05:25 +05:30
Mangesh-Khairnar
3d28c065db
fix(exchange-rate-revaluation): change create to view button on creation of journal entry ( #18201 )
2019-07-10 17:03:23 +05:30
Suraj Shetty
bef897602d
fix: Use db_set since it triggers on_update event ( #18175 )
2019-07-08 10:30:26 +05:30
Deepesh Garg
6252c0490a
Merge pull request #18194 from deepeshgarg007/dimensions_reports
...
fix: Add accounting dimensions to various reports and fixes
2019-07-07 22:40:57 +05:30
deepeshgarg007
6bb5ade667
fix: Add accounting dimensions to various reports and fixes
2019-07-07 21:24:45 +05:30
Mangesh-Khairnar
48d61fb072
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored
2019-07-07 20:17:07 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
...
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
rohitwaghchaure
d8196ced76
Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
...
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 17:28:50 +05:30
Rohit Waghchaure
5d4d70b75f
feat: provision to make debit / credit note against the stock returned entry
2019-07-05 17:06:25 +05:30
Rohit Waghchaure
909d773462
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 15:12:14 +05:30
Rohit Waghchaure
0f065d5de1
Added due date in the gl entry
2019-07-05 14:54:15 +05:30
Rohit Waghchaure
2f3f7507c4
fix: browser hangs while making payment entry for large number of outstaning invoices
2019-07-05 14:38:46 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
Nabin Hait
7b684a01d3
fix: merge conflict
2019-07-04 12:06:50 +05:30
Deepesh Garg
a37c51f93e
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
...
fix: Add filters for accounting dimensions in trial balance report
2019-07-03 22:00:25 +05:30
rohitwaghchaure
465196b0c7
Merge pull request #18155 from scmmishra/accounts-rec-report
...
fix: format values for charts
2019-07-03 19:26:08 +05:30
Shivam Mishra
bb02c5105e
fix: format values for charts
2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a
fix: Add filtesr for accounting dimensions in trial balance report
2019-07-03 18:08:41 +05:30
Don-Leopardo
85e2fd965a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-03 08:15:08 -03:00
Deepesh Garg
af4f7b4ea1
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 16:31:48 +05:30
Deepesh Garg
55fbddbee6
Add missing semicolon
2019-07-03 16:31:06 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Deepesh Garg
824ad34270
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 13:28:49 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Don-Leopardo
46b21f88e1
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-02 14:03:45 -03:00
Nabin Hait
05fee62314
fix: inv status
2019-07-02 17:55:26 +05:30
Nabin Hait
126a02e208
fix: set invoice status considering invoice discounting
2019-07-02 15:28:57 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
...
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-01 20:47:35 +05:30
Rohit Waghchaure
2fa6224f8f
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 11:55:12 +05:30
rohitwaghchaure
4c2eb0f13b
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
...
fix: finance book filters includes the gl data which don't have finance book
2019-06-29 15:06:34 +05:30
Don-Leopardo
b2b5c3ac0a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-28 19:36:25 -03:00
Mangesh-Khairnar
4000fb5bb8
fix: add a more descriptive message when no records are found ( #18082 )
...
* fix: add a more descriptive message when no records are found
* fix: translation by passing string to translation function
2019-06-28 12:38:40 +05:30
Don-Leopardo
c3f6bed650
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-27 18:09:19 -03:00
Faris Ansari
fbc861320f
fix: Don't append None values in against_account ( #18031 )
2019-06-26 13:31:31 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Rohit Waghchaure
a2408a63da
feat: payment reconciliation enhancements
2019-06-24 02:11:51 +05:30
NahuelOperto
4448e2d66b
fix order in general ledger
2019-06-21 08:50:37 -03:00
Aditya Hase
bb5ca5a01f
fix(py3): Convert filter to list
2019-06-20 20:10:53 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Rohit Waghchaure
5f9793e081
fix: finance book filters includes the gl data which don't have finance book
2019-06-18 21:09:52 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Rohit Waghchaure
4803e817e9
fix: bank guarantee, not able to select the purchase order
2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351
fix(minor): format date in user format for accounting dashboard
2019-06-17 17:33:24 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
rohitwaghchaure
a030138df8
fix: trial balance opening balance not showing in the debit side for the liability account ( #17944 )
2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b
fix: column width ( #17935 )
2019-06-14 11:29:18 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
...
feat: added cost center in the opening invoice creation tool
2019-06-13 16:27:18 +05:30
Rohit Waghchaure
033ed93586
fix: taxes are not overriding after changing the taxes template
2019-06-13 15:47:42 +05:30
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
Deepesh Garg
3ead70ba3c
fix: Change IBAN Account length from 25 to 30 ( #16847 )
2019-03-18 08:22:57 +05:30
Deepesh Garg
2ae7ed4cf0
fix: Gross profit report fix ( #16935 )
2019-03-17 09:49:24 +05:30
rohitwaghchaure
fd33c55760
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit
...
feat: added provision to disable CWIP accounting in asset settings
2019-03-16 12:18:36 +05:30
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template
...
fix: Add credit month in validation
2019-03-15 09:03:54 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py
2019-03-15 08:57:49 +05:30
Anurag Mishra
ed190bb329
fix: codacy
2019-03-14 18:14:20 +05:30
Anurag Mishra
1c7baaeba5
test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices
2019-03-14 16:45:02 +05:30
Anurag Mishra
6deffbd6e8
test: loan_return date and loan Sanctioned on submit
2019-03-14 16:44:49 +05:30
Anurag Mishra
4a538ba78a
Resolve merge conflict
2019-03-14 16:43:16 +05:30
Nabin Hait
ed96591618
feat(accounts): Invoice Discounting
2019-03-14 16:42:44 +05:30
Bassam Ramadan
e14758c897
fix: add returns field to cashier closing ( #16911 )
2019-03-14 15:01:50 +05:30
Aditya Hase
3b75551739
feat(dashboard): Render Account Balance Timeline is a time series
2019-03-12 14:47:21 +05:30
Aditya Hase
59fc039c77
style: Linting fixes
2019-03-12 14:47:21 +05:30
Aditya Hase
1e0f9a2882
feat(dashboard): Use caching decorator for dashboard
2019-03-12 14:47:21 +05:30
Aditya Hase
76158e6643
feat(dashboard): Export chart source doc to JSON file
2019-03-12 14:47:21 +05:30
Aditya Hase
675c1d3a5a
refactor(dashboard): Move Soure settings to account_balance_timeline.js
2019-03-12 14:47:20 +05:30
Aditya Hase
09f2ed2e69
refactor(dashboard): Move dashboard.py to account_balance_timeline.py
2019-03-12 14:47:20 +05:30
Aditya Hase
d85b0ae602
fix(dashboard): Remove unused variables
2019-03-12 14:47:20 +05:30
Aditya Hase
2fa1d9caed
fix(dashboard): Remove print statement
2019-03-12 14:47:20 +05:30
Aditya Hase
15c0cfff0f
refactor(dashboard): Convert indentation to tabs
2019-03-12 14:47:20 +05:30
Aditya Hase
4b171ddebb
feat(dashboard): Remove hardcoded company filter
2019-03-12 14:47:20 +05:30
Aditya Hase
3b593e44c6
feat(dashboard): Set account from filters
2019-03-12 14:47:20 +05:30
Aditya Hase
5911e100ad
fix(dashboard): Consider opening balance
2019-03-12 14:47:20 +05:30
Aditya Hase
6cadf77073
feat(dashboard): Add Time Grain filter
2019-03-12 14:47:20 +05:30
Aditya Hase
c888e52788
feat(dashboard): Add missing dates
2019-03-12 14:47:20 +05:30
Aditya Hase
8896374413
feat(dashboard): Add timespan filter
2019-03-12 14:47:20 +05:30
Aditya Hase
953229fa47
feat(dashboard): Create Accounting dashboard from General Ledger Report
2019-03-12 14:47:20 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Rohit Waghchaure
6b33c9b934
fix: purchase receipt not able to submit because default inventory account has not selected in another company
2019-03-08 11:13:35 +05:30
Rohit Waghchaure
821a002125
feat: added provision to disable CWIP accounting in asset settings
2019-03-08 10:51:37 +05:30
Saif Ur Rehman
e62bd893c5
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/test_item.py
2019-03-08 01:29:39 +05:00
Rohit Waghchaure
db8500c03a
POS profile, account for change amount must be cash or bank account
2019-03-06 18:28:45 +05:30
Rushabh Mehta
1f0792d5ea
Merge pull request #16823 from jay-parikh/sales-return
...
fix: Python 3 Sales Invoice Return Validation "validate_pos"
2019-03-05 08:05:00 +05:30
rohitwaghchaure
369d20ac2b
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number
...
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 16:58:58 +05:30
rohitwaghchaure
e552170ce6
Merge pull request #16704 from Anurag810/vedmata-print-formats
...
feat: Auditors print formats
2019-03-04 16:58:31 +05:30
rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
...
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Anurag Mishra
0c9945e0bf
Minor fixes
2019-03-04 16:14:53 +05:30
Anurag Mishra
02138b6bfc
fix: gross depends upon now report type
2019-03-04 14:46:28 +05:30
Rohit Waghchaure
9842ce5a79
fix: HSN code not disaplying for the GST Purchase Invoice print format
2019-03-04 13:39:52 +05:30
Deepesh Garg
44ff41188d
fix: Selling and buying amount precision fix ( #16764 )
2019-03-04 12:56:27 +05:30
Deepesh Garg
40743840b7
fix: Print letter head only if checked in Print Settings ( #16789 )
...
Letter head is printed in financial statements even if option is not checked
2019-03-04 12:53:11 +05:30
Anurag Mishra
1e4e61bd94
Minor fixes
2019-03-04 12:36:51 +05:30
Anurag Mishra
f3bdeedc68
minor fixes
2019-03-04 12:27:41 +05:30
Mangesh-Khairnar
4f350fcadb
feat: validate sales order in sales invoice
2019-03-02 20:48:04 +05:30
Jay Parikh
c2090939d7
Fix Sales Invoice Return Validation "validate_pos"
2019-03-02 12:19:32 +00:00
Frappe Bot
8f0660ab31
Merge branch 'master' into develop
2019-03-01 09:22:36 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix
...
fix(regional,italy): bank details, custom button on sales invoice
2019-03-01 14:26:07 +05:30
Gaurav
b30a9b1869
fix(regional,italy): bank details, custom button on sales invoice
...
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total
...
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
2019-03-01 11:57:06 +05:30
Rohit Waghchaure
c21cda2790
Removed validation for group by voucher in general ledger
2019-02-28 16:20:45 +05:30
Frappe Bot
1fcae10258
Merge branch 'master' into develop
2019-02-28 10:20:48 +00:00
Anurag Mishra
a9a1552e32
refactor
2019-02-27 14:10:24 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master
...
fix: call base class onload method
2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808
fix: call base clase onload method
2019-02-26 18:01:37 +01:00
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
Suraj Shetty
5636f924a9
fix: get mode of payment while selecting payment term in payment term template ( #16765 )
2019-02-25 12:43:34 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs
...
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty
...
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 18:11:37 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing
...
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit
...
fix: Decimal point issue in gross profit print
2019-02-21 18:07:14 +05:30
Rohit Waghchaure
90691dc0d8
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:18:28 +05:30
Nabin Hait
b24caad789
fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings
2019-02-21 17:11:35 +05:30
Rohan Bansal
143973166f
fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests
2019-02-21 15:57:06 +05:30
Nabin Hait
26972c954d
fix: Validate serial no usage in invoice considering multi company transaction
2019-02-21 14:32:41 +05:30
deepeshgarg007
14ff6bfc32
fix: Decimal point issue in gross profit print
2019-02-21 12:08:32 +05:30
Nabin Hait
816a4655a0
fix: Consider returned qty while making invoice from DN / PR
2019-02-21 12:02:36 +05:30
Saurabh
482ebd2c7c
Merge branch 'master' into develop
2019-02-20 18:14:18 +05:30
rohitwaghchaure
c18e925d61
fix: Moved regional methods from controller to hooks ( #16736 )
2019-02-20 17:13:15 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
Nabin Hait
2c23f98b65
Merge pull request #16721 from nabinhait/ar-ap-fix
...
fix: AR/AP report based on account type
2019-02-19 17:45:30 +05:30
Nabin Hait
e4f73929c4
fix: AR/AP report based on account type
2019-02-19 17:11:50 +05:30
Nabin Hait
21706894af
Merge pull request #16705 from deepeshgarg007/pos-precision
...
fix: Fetch precision form system settings in Sales invoice payment(POS)
2019-02-19 15:06:56 +05:30
Nabin Hait
818ead4041
Merge branch 'hotfix' into purchase-qty-fix
2019-02-19 15:06:10 +05:30
Nabin Hait
157526c978
Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule
...
fix: multi-uom not working for the pricing rule rate
2019-02-19 15:05:07 +05:30
Nabin Hait
6bd3098824
Merge pull request #16716 from deepeshgarg007/precision-fix
...
fix: Removed precision from multiple doctypes
2019-02-19 15:03:00 +05:30
Gaurav
f1e28e0e8d
mod(regional,italy): Updates to Italian Localization
...
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
2019-02-19 10:39:22 +05:30
Jigar Tarpara
1ac17ec1c4
Add credit month in validation
2019-02-19 10:21:01 +05:30
deepeshgarg007
de0f59b818
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
Rohit Waghchaure
5821b672ad
fix: multi-uom not working for the pricing rule rate
2019-02-18 20:07:44 +05:30
deepeshgarg007
9a19e06856
fix: Change Received qty to accepted qty and validation for indicators
2019-02-18 18:42:15 +05:30
deepeshgarg007
48a7262fae
fix: Precision issue in POS payment
2019-02-18 15:05:36 +05:30
Anurag Mishra
879e5fd8bb
remove print and codacy
2019-02-18 14:43:55 +05:30
Anurag Mishra
42a106c7ba
Auditors print formats
2019-02-18 14:35:33 +05:30
Anurag Mishra
61f981ae05
Changes Requested
2019-02-18 11:43:32 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Nabin Hait
eb0627356b
Merge pull request #16650 from nabinhait/general-ledger-fix
...
fix: show values in account/party currency based in actual entry, no conversion
2019-02-15 14:53:12 +05:30
Nabin Hait
4df7679c65
fix: Get outstanding invoices
2019-02-15 13:08:04 +05:30
Nabin Hait
c3698e458f
Merge pull request #16666 from nabinhait/deferred-revenue-fix
...
fix: errors in deferred revenue booking
2019-02-14 18:49:01 +05:30
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix
2019-02-14 18:37:40 +05:30
Nabin Hait
29fcb14c42
fix: errors in deferred revenue booking
2019-02-13 17:18:12 +05:30
Anurag Mishra
4f0fd38209
refractor
2019-02-13 16:46:05 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Nabin Hait
6447069e50
fix: show values in account/party currency based in actual entry, no conversion
2019-02-12 16:41:20 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes
...
Multiple fixes
2019-02-12 13:56:06 +05:30
Nabin Hait
ab50211e18
fix: show project even if PI is directly created
2019-02-11 18:25:18 +05:30
Anurag Mishra
aaa57026ac
Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report
2019-02-11 17:02:59 +05:30
Anurag Mishra
f70d4089bc
fix: codacy
2019-02-11 17:02:20 +05:30
Sagar Vora
4e92414850
Merge branch 'hotfix' into gross-and-net-profit-report
2019-02-11 16:00:28 +05:30
Anurag Mishra
a032f0528e
new report gross-and-net-profit-report
2019-02-11 13:12:44 +05:30
Nabin Hait
e3b0f4f9f6
fix: removed account type filter on employee advance account
2019-02-08 16:56:26 +05:30
Nabin Hait
27af6b377f
fix: defered accounting fixes
2019-02-08 16:56:26 +05:30
Aditya Hase
2a3c39f38a
fix(py3): Convert dict.values() to list for indexing
2019-02-08 12:02:57 +05:30
Aditya Hase
46d7456782
fix(py3): Convert list to filter for indexing
2019-02-08 12:02:14 +05:30
Aditya Hase
a86a569787
fix(py3): Convert dict.values() to list for indexing
2019-02-07 22:21:06 +05:30
Aditya Hase
3e954734d0
fix(py3): Convert filter to list for indexing
2019-02-07 22:21:05 +05:30
Aditya Hase
0b1dc32fcb
Merge pull request #16597 from adityahase/python3-fix
...
fix(py3): Use range instead of xrange
2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86
fix(py3): Use range instead of xrange
2019-02-07 18:10:30 +05:30
Prateeksha Singh
ce27cffaad
refactor(desk_icon): Remove reference and patches to Desktop Icon
2019-02-07 09:58:21 +05:30
Sagar Vora
da1dc7fa52
Merge branch 'master' into develop
2019-02-05 18:40:39 +05:30
Nabin Hait
7b93e738ad
Merge pull request #16576 from nabinhait/pay_reco_fix
...
fix: Optimising payment reconciliation queries
2019-02-05 10:28:03 +05:30
Nabin Hait
ac18498ca5
fix: Optimising payment reconciliation queries
2019-02-04 21:13:43 +05:30
Chinmay Pai
125505f2aa
fix(purchase_invoice): fix undefined variable
...
fixes issue while creating purchase invoice
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-04 16:30:20 +05:30
Saif Ur Rehman
590491779a
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12
...
# Conflicts:
# erpnext/stock/doctype/item/item.py
2019-02-02 02:49:04 +05:00
Saif Ur Rehman
00aaa48779
test(Item): test_item_defaults
2019-02-02 02:43:44 +05:00
Saif Ur Rehman
1a441b267d
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Sagar Vora
56cbfe4bb0
Merge branch 'master' into develop
2019-01-31 13:34:32 +05:30
Aditya Hase
66833f109b
fix(accounts): fetch subscription details only if required fields are populated
2019-01-30 19:40:40 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
rohitwaghchaure
a95ed44d3d
fix: test case for fiscal year ( #16516 )
2019-01-29 16:24:53 +05:30
Nabin Hait
cc41b876fb
Merge pull request #16497 from nabinhait/bom_price
...
BOM raw materials price
2019-01-29 14:58:40 +05:30
Sagar Vora
8f6509fa9a
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months
2019-01-29 13:04:20 +05:30
Sagar Vora
9520e345bd
fix: better error messages
2019-01-29 13:03:46 +05:30
Nabin Hait
1df9a23e7b
Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay
...
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
2019-01-29 13:02:56 +05:30
Rohit Waghchaure
07f75a3e54
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
2019-01-29 13:00:18 +05:30
Rohit Waghchaure
a8e743e3c4
fix: fiscal year always be for 12 months
2019-01-29 12:55:04 +05:30
Deepesh Garg
a8cc4b105d
Merge branch 'staging-fixes' into pos_issue
2019-01-29 11:29:41 +05:30
Nabin Hait
3b8623e207
Merge pull request #16491 from adityahase/ar-fix
...
fix(ar-summary): Changes to column list to match recent changes
2019-01-29 11:28:02 +05:30
Nabin Hait
ff2922cbbb
Merge pull request #16488 from deepeshgarg007/price_list
...
fix(sales_invoice): fetch customer price list if available before pos price list
2019-01-29 11:24:22 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
deepeshgarg007
f0cfe98860
fix: Added missing semicolon and removed null from parameter
2019-01-28 17:58:44 +05:30
deepeshgarg007
4e4b200972
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue
2019-01-27 22:54:34 +05:30
deepeshgarg007
c2ffcc5e71
feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher
2019-01-27 16:09:07 +05:30
deepeshgarg007
76556e1a3e
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list
2019-01-25 16:50:06 +05:30
deepeshgarg007
8c84b7b888
fix: Doctype Name correction
2019-01-25 16:44:45 +05:30
Nabin Hait
3476a457ad
fix: minor
2019-01-25 16:22:36 +05:30
deepeshgarg007
1f9a6febdd
fix: Assign given price list if POS price list is not available
2019-01-25 11:53:55 +05:30
Nabin Hait
596c1b3489
Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary
...
feat: Party Ledger Summary Report
2019-01-25 11:22:55 +05:30
Nabin Hait
e21bdf020c
Merge pull request #16472 from deepeshgarg007/cost_center
...
fix(cost_center): Bug fix in update_cost_center_number argument name
2019-01-25 09:56:52 +05:30
Nabin Hait
a6ab38665d
Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice
...
fix: Dont show 0 amount taxes and tax breakup
2019-01-25 09:54:07 +05:30
Nabin Hait
393080ecbe
Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working
...
fix: ascii codec while opening offline POS
2019-01-25 09:50:41 +05:30
Rohit Waghchaure
e14cc8f2b6
fix: bank reconcilliation showing multiple entries against one JV
2019-01-25 00:23:41 +05:30
Saif Ur Rehman
3d275af67b
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/patches.txt
# erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
Rohit Waghchaure
74df01d3d1
fix: ascii code while opening offline POS
2019-01-25 00:03:35 +05:30
rohitwaghchaure
7e4cf62a15
Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative
...
Show outward entries in negative for Bank Clearance Summary report
2019-01-24 22:13:40 +05:30
Aditya Hase
a40c43e414
fix(ar-summary): Changes to column list to match recent changes
2019-01-24 19:13:32 +05:30
deepeshgarg007
c48efaba6e
fix(sales_invoice): fetch customer price list if available before pos profile price list
2019-01-24 17:15:38 +05:30
Faris Ansari
d6f837c5e5
fix: Dont show 0 amount taxes and tax breakup
2019-01-24 17:10:33 +05:30
deepeshgarg007
19ab86a3a7
fix:(cost_center): fix for update cost center number
2019-01-23 17:28:13 +05:30
Frappe Bot
e415cce1a9
Merge branch 'staging' into develop
2019-01-23 08:19:00 +00:00
Nabin Hait
141c543f97
Update journal_entry.js
2019-01-23 12:14:55 +05:30
Nabin Hait
36706c04bb
Merge pull request #16451 from nabinhait/unicode-issue
...
fix: Unicode issue in purchase invoice
2019-01-23 12:11:00 +05:30
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes
...
style: Linting fixes
2019-01-23 12:08:57 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports
...
fix: Multiple fixes in the reports
2019-01-23 12:05:36 +05:30
Aditya Hase
f79937d64b
style: Remove unused imports
2019-01-23 00:28:37 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Saif Ur Rehman
74a3370095
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/patches.txt
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Nabin Hait
a5270e561f
fix: Unicode issue in purchase invoice
2019-01-22 15:43:04 +05:30
Rohit Waghchaure
ddd9136d10
Renamed field and added finance book column in the trial balance simple report
2019-01-22 14:11:57 +05:30
Aditya Hase
d157ae17b7
fix(ar-summary-report): Changes to column list to match recent changes in AR report
2019-01-22 13:37:54 +05:30
Zlash65
270c4c2a87
fix: push party filter only if applicable
2019-01-22 12:47:25 +05:30
Zlash65
c8d632ddff
fix: add set query for payroll entry in JV
2019-01-22 12:46:13 +05:30
Nabin Hait
b9b8d575bc
Merge pull request #16435 from deepeshgarg007/support-fix
...
fix(accounts_receivable): Bug fix in accounts receivable report
2019-01-22 09:59:17 +05:30
Rohit Waghchaure
de718dacb2
fix: Code cleanup
2019-01-21 19:47:17 +05:30
deepeshgarg007
3565395e7a
Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest
2019-01-21 15:03:51 +05:30
deepeshgarg007
aab6d0e028
fix(email_digest): Linkes annual income and annual expense to profit and loss statement
2019-01-21 15:01:40 +05:30
deepeshgarg007
ff1078f271
fix(minor): fetch payment terms if voucher nos are available
2019-01-21 09:43:56 +05:30
Deepesh Garg
f7fe08c487
Merge branch 'develop' into email_digest
2019-01-20 16:53:41 +05:30
Saif Ur Rehman
31d58eac01
fix(Party Ledger Summary): Added Supplier/Customer Name column
2019-01-19 15:28:53 +05:00
Saif Ur Rehman
55566b7f8e
fix(Party Ledger Summary): Codacy fix
2019-01-19 15:12:08 +05:00
Himanshu
79d4400c16
fix: Offline pos fix ( #16424 )
...
* Offline POS fix
* Fixed items search and load items
2019-01-19 14:01:38 +05:30
Saif Ur Rehman
fcaed12a53
Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary
2019-01-19 13:18:23 +05:00
Saif Ur Rehman
398f593e5f
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series
...
feat(naming): Deferred naming for SLE and GL Entry
2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Rohit Waghchaure
fa7ee0b3b6
Added dafult bank account in the customer/supplier
2019-01-17 15:45:27 +05:30
Rohit Waghchaure
f725816809
Enhance: Added field limit in the Payment Reconciliation to handle large entries
2019-01-17 12:54:14 +05:30
Nabin Hait
873442a55d
Merge branch 'staging-fixes' into Party-Ledger-Summary
2019-01-16 17:52:45 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix
2019-01-16 17:49:22 +05:30
Saif Ur Rehman
fccb1e55ec
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-16 14:36:55 +05:00
Saurabh
7d630b3e29
Merge branch 'master' into staging-fixes
2019-01-15 19:41:09 +05:30
Rohit Waghchaure
affeb3dfec
Added on account amount field in Accounts Payable/Receivable Summary
2019-01-15 17:38:31 +05:30
Rohit Waghchaure
1a4c1e11cb
Fix: total invoiced amount in Accounts Receivable Summary report showing blank
2019-01-15 17:01:34 +05:30
Rohit Waghchaure
b2d08a498b
Added bank account field in the payment entry
2019-01-15 16:11:29 +05:30
Rohit Waghchaure
bdee57ca8d
Added finance book in trial balance and fixed cost center not working issue in trial balance
2019-01-15 15:52:52 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Rohit Waghchaure
df7215dcb2
Added supplier name in the tds report
2019-01-15 14:48:06 +05:30
Nabin Hait
4ed7cfc515
tests(cost-center-company): Validate cost center's company and revent tests
2019-01-14 17:14:39 +05:30
Saif Ur Rehman
502f15ba1b
test: test_party_details_tax_category
2019-01-12 19:07:39 +05:00
Saif Ur Rehman
bbd1e47758
test: test_tax_calculation_with_item_tax_template
2019-01-12 18:28:15 +05:00
rohitwaghchaure
ba54209c86
[Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available ( #16379 )
2019-01-12 17:58:00 +05:30
Saif Ur Rehman
5085673030
test: fix for Item Tax Template v12
2019-01-11 03:53:43 +05:00
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
Saif Ur Rehman
8d61794540
Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
...
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
deepeshgarg007
720020319f
fix(Codacy): removed unused variable
2019-01-09 21:56:45 +05:30
deepeshgarg007
c039f70496
Test Cases for
...
account balance report
2019-01-09 21:56:45 +05:30
deepeshgarg007
8621869d24
Created multiple reports and linked them to email digest
2019-01-09 21:56:45 +05:30
Rohit Waghchaure
701c762a68
Show outward entries in negative for Bank Clearance Summary report
2019-01-09 14:21:03 +05:30
Saif Ur Rehman
eb7277d2d4
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
Nabin Hait
142d8aa973
Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt
...
fix: negative amount showing in the bank clearance summary report
2019-01-08 20:25:26 +05:30
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes
...
fix: expense head of asset items in purchase invoice
2019-01-08 20:23:14 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
...
fix: Loyalty program issue fix in customer dashboard
2019-01-08 12:15:57 +05:30
Nabin Hait
4e3e784691
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
...
perf: Customer contact column in accounts receivable report
2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc
fix: Divide by zero exception fix in item wise purchase register ( #16247 )
...
* Do not prepare row if stock quantity is not available
* Update item_wise_purchase_register.py
2019-01-08 08:34:28 +05:30
Aditya Hase
85c6a0f002
fix(test): Do not rely on order by name
2019-01-08 00:09:37 +05:30
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Aditya Hase
972f659fd5
fix(naming): Use creation instead of name to order GL Entries
2019-01-08 00:09:30 +05:30
Aditya Hase
7bc692d48d
feat(naming): Deferred naming for Stock Ledger Entry and GL Entry
...
For fast lockless insertions use hash as autonaming method for
temporarily naming Stock Ledger Entry and GL Entry
In an hourly run scheduled job rename these entries using autoname options
2019-01-08 00:07:54 +05:30
Saif
e5091cbc0f
chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs ( #16356 )
...
* chore: Updated DocType json files to clean up git diff of other PRs
* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Sagar Vora
cad20abe83
Merge branch 'staging-fixes' into loyalty-program-fix
2019-01-07 15:32:40 +05:30
Sagar Vora
92cab55c72
Merge branch 'staging-fixes' into purchase-invoice-fixes
2019-01-07 15:03:37 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
...
fix: replaced str to cstr in genral ledger report
2019-01-07 14:28:27 +05:30
Sagar Vora
fbadb19d93
Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
2019-01-07 13:55:43 +05:30
Saif Ur Rehman
848bbac05e
Added patch for Item Tax Template
2019-01-07 05:32:38 +05:00
Saif Ur Rehman
f484f0d6e8
Added test for Tax Rule based on Tax Category
2019-01-07 00:37:01 +05:00
Rohit Waghchaure
ed6725172d
Replaced str to cstr in genral ledger report
2019-01-06 20:07:18 +05:30
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
Deepesh Garg
0eca1646e6
Merge branch 'staging-fixes' into loyalty-program-fix
2019-01-06 12:16:54 +05:30
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
Saif Ur Rehman
b1288b75ba
fix: Test Records
2019-01-06 04:41:13 +05:00
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
deepeshgarg007
eabf260706
fix :Test cases for accounts receivable report
2019-01-04 12:34:28 +05:30
deepeshgarg007
9de81cda77
Added Customer contact column in accounts Receivable
2019-01-04 10:54:24 +05:30
Rohit Waghchaure
1ff1fc4725
[Fix] Negative amount showing in the bank clearance summary
2019-01-02 17:56:08 +05:30
Saif Ur Rehman
016f29f09b
fix: error due to passing None in scrub
2019-01-02 16:22:22 +05:00
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Anurag Mishra
5865fcca3c
fix: expense head of asset items in purchase invoice
2019-01-02 14:36:07 +05:30
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
deepeshgarg007
8300f5ede7
fix: Codacy issues and added test case
2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
Saif Ur Rehman
fac6b59627
Exclude opening invoices in Gross Profit Report
2019-01-01 16:33:22 +05:00
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction
...
[Fix] Filter cancelled and draft payments in sales payment summary
2018-12-31 12:02:19 +05:30
Saif Ur Rehman
f6a83daae6
fix: update item_tax_template account_type server-side validation
2018-12-29 02:27:03 +05:00
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
Charles-Henri Decultot
e87eb07e16
Correction for Travis
2018-12-27 17:38:57 +00:00
Charles-Henri Decultot
8d71015bf8
Cleanup journal entries
2018-12-27 16:43:26 +00:00
Charles-Henri Decultot
b7339d7dcb
Test travis
2018-12-27 15:30:56 +00:00
Charles-Henri Decultot
43c7bd57e4
Cancel existing payment entries for data integrity in test
2018-12-27 14:43:30 +00:00
Charles-Henri Decultot
641d3e0073
Add own records
2018-12-27 13:43:56 +00:00
Charles-Henri Decultot
0f9c47c242
Remove pricing rule from items
2018-12-27 10:10:18 +00:00
Charles-Henri Decultot
02aa9fb240
Understand Travis
2018-12-27 08:46:29 +00:00
Suraj Shetty
3de12db2b1
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Charles-Henri Decultot
d7777696d7
Corrections for Travis
2018-12-26 14:08:00 +00:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Charles-Henri Decultot
9c1db688d1
Ignore pricing rule for Travis
2018-12-26 10:33:42 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
Charles-Henri Decultot
899b9b1ea7
Codacy correction
2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25
Remove ununsed variable
2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9
Test cases
2018-12-26 08:36:32 +00:00
deepeshgarg007
a1d015cc2f
Initialized loyalty_point_details
2018-12-26 11:01:02 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue
...
[Fix] Tax Withholding, TDS is applying on the tax
2018-12-25 14:49:05 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Rushabh Mehta
5d11abb0a2
fix(escaping): accounts_receivable.py
2018-12-24 16:03:24 +05:30
Rohit Waghchaure
94500a9d62
[Fix] TDS is applying on the tax
2018-12-24 15:13:52 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +05:30
Suraj Shetty
772e8780b4
Merge branch 'staging-fixes' into permission-fixes
2018-12-24 10:35:12 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b
Add and Modified DocTypes for Item Tax Template
2018-12-22 02:51:59 +05:00
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
Charles-Henri Decultot
813485023b
Filter cancelled and draft payments
2018-12-20 14:04:00 +00:00
Nabin Hait
0866b2b75a
Update accounts_receivable.py
2018-12-20 14:11:20 +05:30
Suraj Shetty
7ed37ae6c3
Commonify code
...
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
deepeshgarg007
b645c2c75e
Rebase using staging-fixes and resolved conflicts
2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc
Added temp variables for outstanding, credit_note_amt instead of function calling
2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af
breaked up code into multiple functions
2018-12-19 18:43:06 +05:30
deepeshgarg007
4ac8fcf4af
Added test case for Accounts receivable report based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a944f88b94
Removed column for pdc date
2018-12-19 18:43:06 +05:30
deepeshgarg007
17544d7ad6
Refactored accounts receivable report for payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
e7a91b9526
Credit note fix
2018-12-19 18:43:06 +05:30
deepeshgarg007
f98adf2be5
Changed columns and added currency conditions
2018-12-19 18:43:06 +05:30
deepeshgarg007
b6c083706a
Allocation of credit note amount and pdc in payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
24f8d3ed0c
Add columns based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a8ab9b5c3d
Accounts Receivable report based on payment terms
2018-12-19 18:43:06 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Faris Ansari
4994d84565
fix(pos-profile): Cleanup Form for POS Profile ( #16208 )
...
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
2018-12-14 14:19:14 +05:30
Saif Ur Rehman
b53231595d
Using same filter for Sales Person from Accounts Receivable
...
Added Customer/Supplier Ledger Summary in Accounts Module page
2018-12-12 15:46:50 +05:00
Saif Ur Rehman
b07d108bee
feat: Supplier Ledger Summary
2018-12-12 05:45:49 +05:00
Saif Ur Rehman
41236ed0e5
feat: Customer Ledger Summary report
2018-12-12 05:12:20 +05:00
Frappe Bot
fb2fdc4f4e
Merge branch 'staging' into develop
2018-12-11 09:55:01 +00:00
Pawan Mehta
377511165e
Simple Trial Balance ( #16060 )
2018-12-10 21:55:01 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
Saif
b52bd9c093
AR/AP Report Enhancement ( #16175 )
...
* Modified AR/AP print format
* Filter Sales Person based on either Customer or Voucher's assigned Sales Person
* -Added Sales Person column to Accounts Receivable Summary
-Added all filters in AR/AP Summary Report as in AR/AP Report
-Reordered filters for better grouping
-Fixed a bug that customer_name was not unset after removing Customer from filter
2018-12-10 17:56:42 +05:30
rohitwaghchaure
5472fff027
Added disabled field in the address ( #16114 )
2018-12-10 17:45:39 +05:30
RicardoJohann
bc0ef0beca
Add Serial Number button in Delivery Note and Sales Invoice's Packing List ( #16080 )
2018-12-10 17:43:03 +05:30
Deepesh Garg
0c3c148316
Linking company address to pos profile ( #16142 )
...
* Linking company address to pos profile
* Translation fix
2018-12-10 16:22:38 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Nabin Hait
dd7b020b01
fix(test): Fixed tests for period closing voucher
2018-12-03 14:24:41 +05:30
Nabin Hait
eda0a6eb33
fix(test): Fixed tests for period closing voucher
2018-11-30 15:15:17 +05:30
deepeshgarg007
ee05e358d1
Rewrote query using orm
2018-11-29 16:24:28 +05:30
deepeshgarg007
c981fb389b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-29 14:57:50 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes
2018-11-28 08:12:48 +00:00
deepeshgarg007
ebe1e12a82
Codacy issue fixes
2018-11-28 08:21:54 +05:30
Nabin Hait
f642f86982
Merge branch 'hotfix' into accounts_receivable_summary_print_issue
2018-11-27 17:56:49 +05:30
Nabin Hait
96598936ad
fix(test): Fixed tests for discount with margin and period closing voucher
2018-11-27 17:48:13 +05:30
Rohit Waghchaure
10bcd5113c
[Fix] Accounts receivable summary print is not working
2018-11-27 16:25:35 +05:30
deepeshgarg007
f31caffa74
Changes in get_dashboard_info
2018-11-27 15:04:12 +05:30
deepeshgarg007
6372fbba54
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-27 14:06:58 +05:30
Nabin Hait
218fa51dba
Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice
2018-11-26 20:23:00 +05:30
Nabin Hait
212a29ae2c
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
...
[Fix] Not able to view general ledger for purchase invoice
2018-11-26 19:57:24 +05:30
Nabin Hait
25e60f3934
Merge pull request #16044 from ESS-LLP/fix-trial-balance
...
fix: Trial Balance print
2018-11-26 19:56:27 +05:30
Nabin Hait
4191d7eb52
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
...
Fixed get_buying_amount in Gross Profit report:
2018-11-26 19:55:06 +05:30
Rohit Waghchaure
d1a85a3637
[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice
2018-11-26 18:42:29 +05:30
Nabin Hait
73ca3cfca6
fix(test): removed test print
2018-11-26 16:16:42 +05:30
Nabin Hait
2665c37f38
temp(travis): Print statement to fix travis
2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097
fix(test): Test cases fixed
2018-11-26 11:05:28 +05:30
deepeshgarg007
5dbb9f5312
Accounts receivable summary print fix
2018-11-23 19:54:08 +05:30
deepeshgarg007
a1cffc3490
minor changes in dashboard
2018-11-23 16:51:35 +05:30
deepeshgarg007
920dc1400f
Customer/Supplier dashboard fix for multi company setup
2018-11-23 10:17:28 +05:30
Ranjith
1879e91148
fix: Trial Balance
2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5
Fixed get_buying_amount in Gross Profit report:
...
To handle the case where there may be multiple invoices for a single delivery
2018-11-21 15:32:37 +05:00
Rohit Waghchaure
770a13ebc3
[Fix] Not able to view general ledger for purchase invoice
2018-11-20 13:01:52 +05:30
Frappe Bot
8c7373dfd0
Merge branch 'staging' into develop
2018-11-15 09:45:05 +00:00
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary
...
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Rohit Waghchaure
704796b1cb
Code optimization for consolidated financial statement report
2018-11-15 13:46:18 +05:30
Rohit Waghchaure
9d0f90975b
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:55:20 +05:30
Deepesh Garg
3b8c84fa75
Merge pull request #15975 from nabinhait/staging-fixes
...
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-15 12:01:09 +05:30
Rohit Waghchaure
a95697f506
Added currency filter in consolidated financial statement report
2018-11-14 19:55:44 +05:30
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
deepeshgarg007
7bc6f3843a
Fix for accounts Receivable Summary Showing zero values
2018-11-13 16:54:54 +05:30
Nabin Hait
688758a56f
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-13 16:13:16 +05:30
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Britlog
9e9e37d39b
[Fix] Conversion factor in offline POS ( #15867 )
2018-11-13 11:34:27 +05:30
Himanshu Mishra
35b2627112
Item qty based tax (CESS) calculation support ( #15456 )
...
* fix conflicts
* added test case for qty cess
* use company specified in document to get region
2018-11-13 11:13:04 +05:30
Zarrar
6922415d1b
[New Feature]Scan Item Barcode label to quick create/update records in items child table ( #15731 )
...
* Update transaction.js
* setup barcode scan
stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js
* fix bug of item_code change always reset qty to 0
when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* clean up barcode logic for transactions
* call scan_barcode method for stock entry
* separate out logic for searching serial, batch or barcode number
* added scan barcode field in transactions doctype
* search barcode-serial-batch sequence, code rectify
* hide all barcode related field if disabled from settings
* remove print statement
* Update stock_entry.py
2018-11-13 11:11:32 +05:30
rohitwaghchaure
ab76ff0836
Added new option group by voucher(consolidated) in the general ledger report ( #15957 )
2018-11-12 16:58:24 +05:30
JodeQ
1b8e9cd3bb
Permission error for new Sales invoice ( #15952 )
...
In version
```
Installed Apps
ERPNext: v11.0.3-beta.20 () (staging)
Frappe Framework: v11.0.3-beta.25 () (staging)
```
When creating a new Sales invoice without healthcare active we have this error
```
Not permitted
Insufficient Permission for Patient
```
Console log
```
Traceback (most recent call last):
File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application
response = frappe.handler.handle()
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle
data = execute_cmd(cmd)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd
return frappe.call(method, **frappe.form_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call
return fn(*args, **newargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link
search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget
as_list=not as_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list
return frappe.model.db_query.DatabaseQuery(doctype).execute(None, *args, **kwargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute
raise frappe.PermissionError(self.doctype)
PermissionError: Patient
```
2018-11-12 16:42:05 +05:30
Frappe Bot
1ff9c691b7
Merge branch 'staging' into develop
2018-11-09 10:21:07 +00:00
Frappe Bot
4df671585b
Merge branch 'master' into staging-fixes
2018-11-09 10:11:27 +00:00
rohitwaghchaure
a88eaa6e20
[Fix] User able to change discount if pricing rule has discount value as zero ( #15921 )
2018-11-08 13:05:08 +05:30
Shreya Shah
9e484fbc12
fix(payment-entry): Take default value None for paid_from ( #15777 )
2018-11-08 12:52:14 +05:30
Nabin Hait
6ff2f395f5
fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero ( #15825 )
2018-11-08 12:30:44 +05:30
Bassam Ramadan
bf86953b4c
adding returns field to cashier closing ( #15752 )
...
* adding returns field to cashier closing
* Update cashier_closing.json
2018-11-08 12:26:24 +05:30
Shreya Shah
3f6eb6b393
fix: If party type is Shareholder, set appropriate name field ( #15916 )
2018-11-08 11:51:13 +05:30
Shreya Shah
c704630d5f
fix: Return default if company not found ( #15915 )
2018-11-06 17:24:45 +05:30
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop
2018-11-06 11:17:24 +00:00
rohitwaghchaure
9eafe8c23e
Update financial_statements.py
2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3
fix(encoding): Fixed encoding issue in financial statements
2018-11-06 11:48:51 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop
2018-11-05 06:53:27 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes
2018-11-05 06:45:04 +00:00
rohitwaghchaure
c1d255e7bc
Merge pull request #15882 from Zlash65/fixtds
...
[Minor] TDS not calculated properly fix
2018-11-02 13:18:09 +05:30
Zarrar
16d45c8e2e
safe encode non ascii characters ( #15755 )
2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9
fixed divided by zero error ( #15885 )
2018-11-02 12:19:05 +05:30
rohitwaghchaure
dcb71a61ad
[Fix] Payment entry not able to submit ( #15859 )
2018-11-02 12:12:42 +05:30
Charles-Henri Decultot
a89bce0b6e
Encoding correction ( #15877 )
2018-11-01 13:18:49 +05:30
Zlash65
ab9852d31a
tds not calculated appropriately
2018-11-01 11:40:15 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop
2018-10-31 13:51:52 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes
2018-10-31 13:43:12 +00:00
deepeshgarg007
78b273af43
[Bug-Fix] Cannot Save Bank Statement Transaction Entry ( #15793 )
...
* Create bank settings only if bank name is available
* Minor bug-fix in validate_overlap
2018-10-31 18:12:03 +05:30
Shreya Shah
0c0e49a421
fix: Fix fieldnames in template ( #15860 )
2018-10-31 18:00:09 +05:30
rohitwaghchaure
3f398d24f3
[Fix] Precision issue, not able to submit the stock entry ( #15863 )
2018-10-31 17:58:26 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop
2018-10-30 12:54:16 +00:00
Rohit Waghchaure
152a0c86b0
[Fix] Delete button not working in POS for Ipad
2018-10-29 16:50:18 +05:30
Saurabh
6a916943aa
fix(P&L): sql query
2018-10-26 13:46:52 +00:00
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Zlash65
635d4dbebe
subscriber deprecated test case fixes
2018-10-23 11:00:19 +05:30
Ameya Shenoy
a0e533ede5
Merge branch 'master' into staging-fixes
2018-10-22 10:37:14 +00:00
Nabin Hait
91eac5a7cf
fix(report): Optimization for financial statements
2018-10-22 15:05:40 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
Ameya Shenoy
bbfdc13ab7
Merge branch 'master' into staging-fixes
2018-10-19 12:48:18 +00:00
Nabin Hait
5d1171678e
fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled ( #15743 )
...
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
2018-10-19 18:03:13 +05:30
Saif
3c9155e406
[Minor Fix] Force toggle display Net Total field when default taxes are fetched ( #15532 )
...
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched
* Prevent net_rate from becoming NaN
* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
Nabin Hait
500ddc94c7
fix(gle): GL Entry for invoices before introduction of rounding_adjustment ( #15732 )
2018-10-18 16:48:28 +05:30
Charles-Henri Decultot
7a7615ed66
Safe encode payer name ( #15726 )
2018-10-18 12:28:06 +05:30
rohitwaghchaure
e2afbb7abe
Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix
...
[For staging-fixes] Fixed PDC data in AR/AP report
2018-10-17 15:57:28 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
Ameya Shenoy
77b60928bf
Merge branch 'master' into staging-fixes
2018-10-17 09:39:31 +00:00
deepeshgarg007
0cbb9b54fa
Deprecating subscriber doctype ( #15695 )
...
* Depricating subscriber doctype
* Removed naming series
2018-10-16 14:39:16 +05:30
rohitwaghchaure
b7debc8573
Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix
...
Fixed PDC data in AR/AP report
2018-10-16 11:27:53 +05:30
rohitwaghchaure
a5a926967b
Update accounts_receivable.py
2018-10-16 11:27:23 +05:30
Joe Paul
666e6e665b
feat: Add provision for prebilled subscription invoices
...
(cherry picked from commit db33e6304d3167d0a2c0c9cee4a9405f5833120e)
2018-10-16 10:17:40 +05:30
Charles-Henri Decultot
615571dd21
Add safe decode for payer name ( #15692 )
2018-10-15 18:26:02 +05:30
Bibin
7844b79274
[Bug-Fix] accounts_receivable.html ( #15688 )
...
* Update accounts_receivable.html
In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue
* Update accounts_receivable.html
2018-10-15 18:25:26 +05:30
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop
2018-10-15 12:25:03 +00:00
rohitwaghchaure
0d2a4c6a59
[Fix] TDS Payable Monthly report is not working ( #15666 )
2018-10-15 11:09:17 +05:30
deepeshgarg007
42510a411f
[Bug-Fix]V11 Accounts Receivable print showing zero values ( #15667 )
...
* Bug Fix
* Print report bug fixes
2018-10-15 11:08:04 +05:30
Chinmay Pai
905c0ff978
File api ( #15637 )
...
* file-api: major refactor
migrate from file_manager.py to file.py
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
* file-api: migrate to file-api
remove file_manager stuff and migrate to file-api
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-10-15 10:38:53 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Shreya Shah
2291323c65
fix(shipping-address-display): Fetch shipping address display as per the shipping address ( #15643 )
2018-10-11 10:13:27 +05:30
Saurabh
99c064305f
Merge branch 'master' into staging-fixes
2018-10-09 17:55:33 +05:30
Shreya Shah
8a4bcefec4
fix(accounts-receivable): Column values in Print and PDF ( #15621 )
2018-10-08 18:34:01 +05:30
Shreya Shah
5b34d00bc0
fix(accounts-receivable): Column values in Print and PDF ( #15622 )
2018-10-08 18:20:51 +05:30
Ameya Shenoy
f174c95d80
Merge branch 'staging' into develop
2018-10-07 06:24:12 +00:00
Shreya Shah
5615cb4735
Set default only if customer_address not found ( #15605 )
...
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
2018-10-07 11:42:07 +05:30
Shreya Shah
e7e269d4a4
[Error] Display appropriate msg if company is different for TDS ( #15601 )
...
* fix(tds): Display appropriate msg if company is different
* Update tax_withholding_category.py
2018-10-06 17:56:21 +05:30
Zlash65
58a080a1b1
add voucher detail no while creating gl entry
2018-10-06 16:34:58 +05:30
Zarrar
bc7a2c5cb3
Merge pull request #15602 from Zlash65/fix-mod
...
[Minor] Deferred Expense
2018-10-06 16:21:06 +05:30
Zlash65
b4aeee776a
add voucher detail no while creating gl entry
2018-10-06 16:17:12 +05:30
Ameya Shenoy
1d5dc73dfd
Merge branch 'staging' into develop
2018-10-05 09:10:30 +00:00
Shreya Shah
deb9f0e03c
Merge pull request #15594 from shreyashah115/tds-report
...
Handle IndexError if no data found
2018-10-05 14:11:43 +05:30
Shreya Shah
db5ffce742
Merge pull request #15592 from shreyashah115/jv
...
Allow Reverse JV for all submitted docs
2018-10-05 13:33:11 +05:30
Shreya
0d7bd43367
Handle IndexError if no data found
2018-10-05 13:22:09 +05:30
Shreya
4f5214a136
Allow reverse jv for all submitted docs
2018-10-05 12:19:09 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
Rohit Waghchaure
18678696db
Fix issue after merging hotfix into staging-fixes
2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes
2018-10-04 09:25:07 +00:00
Zlash65
6e3b1a58a1
service_stop_date should be editable after submit
2018-10-04 09:30:27 +05:30
rohitwaghchaure
f9930ff2a4
Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving
...
[Fix] Cost center issue
2018-10-03 18:47:28 +05:30
Shreya Shah
3204c94fdd
Merge pull request #15570 from shreyashah115/fix-filter-error
...
[Bug] Item wise sales register filters
2018-10-03 17:38:41 +05:30
Shreya
cbb112f2db
Fix filter error
2018-10-03 17:37:40 +05:30
Zlash65
9d159ab95e
remove db.escape as back tick already used
2018-10-03 17:26:28 +05:30
Rohit Waghchaure
8bf9f377dd
[Fix] Cost center issue
2018-10-03 16:59:43 +05:30
Rohit Waghchaure
d1b87ba41c
Book cost of goods sold instead of stock adjustment
2018-10-03 16:29:43 +05:30
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
rohitwaghchaure
a5576f5b21
[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment ( #15374 )
2018-10-03 10:39:50 +05:30
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Shreya Shah
7d115183e4
Improvise and fix indicators in Portal list ( #15552 )
2018-10-02 12:46:26 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Zarrar
e4c9ac3961
[Minor] Cash Flow report - custom ( #15522 )
...
* python 2-3 fix for filter
* pass filters while fetching data to financial statement report
2018-09-30 21:19:01 +05:30
rohitwaghchaure
90f9f9d3d8
Code optimization for deferred revenue ( #15527 )
2018-09-30 21:12:50 +05:30
Rohit Waghchaure
ea0ef95539
[Fix] Consolidated Financial Statement report
2018-09-28 17:05:55 +05:30
Suraj Shetty
6ea3de9521
Fix quote issues ( #15497 )
...
* Fix quotes issues
* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more ( #15475 )
...
* fix(payroll): multiple minor fixes related to salary structure
* Added GSTR-1 and GSTR-2 report in Accounts module page
* delete asset movement records on cancellation of Purchase Receipt
* Update consolidated_financial_statement.py
* minor fix
* minor fix
* add filters on item prices report (#15495 )
2018-09-26 18:01:00 +05:30
Shreya Shah
352e6494f3
Contact and email fields in Payment Entry ( #15490 )
...
* Add contact_person and contact_email fields to Payment Entry
* Minor fix
* Map contact details while making Payment Entry
* Update payment_entry.py
2018-09-26 15:38:34 +05:30
rohitwaghchaure
0cf0ebf08b
[Refactored] Asset Depreciation Ledger report based on GL entries ( #15415 )
...
* [Refactored] Asset Depreciation Ledger report is based on GL entries
* Provision to make manual JV from the asset if Calculate Depreciation is disabled
2018-09-26 15:24:49 +05:30
Ameya Shenoy
b635a71247
Merge branch 'staging' into develop
2018-09-26 08:53:03 +00:00
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
...
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop
2018-09-26 07:32:45 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes
2018-09-26 07:28:53 +00:00
rohitwaghchaure
fafc277666
[Fix] BOM update tool, too many writes in one request. Please send smaller requests ( #15432 )
2018-09-25 18:59:20 +05:30
Aditya Hase
a38b77cbfd
feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion ( #15457 )
...
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion
* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Rohit Waghchaure
c699b2a98a
[Fix] Key error while saving sales invoice
2018-09-24 11:57:48 +05:30
Ameya Shenoy
63ebeb432c
Merge branch 'staging' into develop
2018-09-21 11:04:20 +00:00
Suraj Shetty
dabaec0dc5
Revert bench-init changes ( #15463 )
...
* Revert bench-init changes
* Fix test
* Remove debug flag
2018-09-21 15:46:44 +05:30
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
Saif
772dc6e82c
Various permission fixes ( #15448 )
...
* Removed test letter head from Consolidated Financial Statement
* Removed incorrect role permissions
2018-09-20 13:20:17 +05:30
rohitwaghchaure
550fc695f1
[Fix] Precision issue in the accounts receivable report ( #15440 )
2018-09-19 19:03:40 +05:30
Faris Ansari
2ab6e0e39b
fix(translations): Replace translations by keyword with indexed version ( #15426 )
...
* fix(translations): Replace translations by keyword with indexed version
Keywords in the translation also gets translated which
results in an error because python cannot find the key
* Update buying_controller.py
2018-09-19 13:13:59 +05:30
Jamsheer
c07e8e5b0d
[Fix] Healthcare minor fixes and field rename ( #15413 )
...
* Healthcare practitoiner in Clinical Procedure
* Insert and Update Patient Medical Record from Healthcare DocTypes
* vital signs remove extra columns
* Rename Healthcare Field test_name
* Healthcare Util - get_drugs_to_invoice - fix
* Rename Healthcare Field test_code
* Rename Healthcare Field test_comment
* Rename Healthcare Field test_created
* Rename Healthcare Field test_template
* Rename Healthcare Field test_rate
* Rename Healthcare Field test_description
* Rename Healthcare Field test_groups
* Rename Healthcare Field test_group
* Rename Healthcare Field test_template_type
* Rename Healthcare Field test_uom
* Rename Healthcare Field test_normal_range
* Rename Healthcare Field test_event
* Rename Healthcare Field test_prescription
* Rename Healthcare Field test_particulars
* Patch - Rename healthcare fields
* Sales Invoice - Filter updated for get drugs to invoice
* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f
added description field and changed to one filter datepicker ( #15425 )
2018-09-18 10:48:20 +05:30
Charles-Henri Decultot
d6bce7429e
Bank statement import corrections ( #15405 )
...
* Bank statement import corrections
* Bank statement corrections
* Missing semi-columns
2018-09-17 12:34:11 +05:30
theopen-institute
ba1c0c900d
Fix potential crash in payment_entry.py ( #15411 )
...
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
2018-09-17 10:59:39 +05:30
Zlash65
2619596917
pass filters as parameter
2018-09-13 12:56:04 +05:30
Nabin Hait
9fde97cdd2
Fixed merge conflict
2018-09-12 15:45:20 +05:30
Zarrar
8dade79002
return blank if no data found ( #15387 )
2018-09-12 14:24:23 +05:30
Nabin Hait
6173e091ee
fix(test): test cases fixed
2018-09-12 11:46:20 +05:30
Zarrar
2b6584a296
accounts table should be mandatory in budget ( #15386 )
2018-09-12 11:14:24 +05:30
Nabin Hait
0669a0e18a
fix(bank account): import fixed
2018-09-12 10:50:10 +05:30
Nabin Hait
13beb3a008
fix(test): test cases fixed
2018-09-11 19:37:08 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Zarrar
2859300fe6
update modified date to reload doc ( #15385 )
2018-09-11 17:12:27 +05:30
Nabin Hait
2236f0aef0
fix(test): multiple test cases fixed
2018-09-11 16:50:46 +05:30
Saif Ur Rehman
423549e084
Fixed PDC data in AR/AP report:
...
-Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared
-Get PDC data from submitted documents only
2018-09-08 15:48:55 +05:00
Nabin Hait
431e2e1c6d
fix(payment entry): Changed modified
2018-09-07 14:31:34 +05:30
Nabin Hait
399f3ddf82
fix(sales invoice): Restored missing field group_same_items
2018-09-07 14:27:14 +05:30
Nabin Hait
3a342e8d93
fix(report): project filter in financial statement
2018-09-07 14:17:57 +05:30
Zlash65
635890187a
remove console statement
2018-09-07 14:04:46 +05:30
Zarrar
525a005b78
TDS Monthly report & TDS Computation Summary report ( #15204 )
...
* tds computation report added
* tds computation logic added
* minor changes to commonify code
* tds payable monthly report added
* initial logic for monthly tds calculation added
* added field for supplier type and pan
* changes related to pan and entity type
* date filter fix and cleanup
2018-09-07 13:27:10 +05:30
Zarrar
7737620ff4
[Staging] Patch fix - Shopify Settings ( #15338 )
...
* keep enable_shopify in Shopify Settings disabled by default
* patch fix for shopify refactor
* minor fallback fix
2018-09-07 13:19:33 +05:30
Nabin Hait
b479a87031
fix(report): Cost center filters in financial statements and general ledger
2018-09-07 13:17:23 +05:30
Bassam Ramadan
574cd46e41
Adding cashier closing feature ( #15273 )
...
* adding cashier closing feature
cashier closing feature has been added as now the cashier can make a
closure to record every thing from his pos as the expenses which has
been paid and the custody which he had at the starting and the amount
which is in his save and the system will record the date and time and
the user and the total net amount automatically which supposed be equal
to all of his sales invoices totals
* add cashier closing link at pos menu
* add cashier closing link to accounts config file
adding cashier closing link at accounts config file to show it at the
accounts module page
* adding more features to cashier closing
adding from time to the cashier closing in case the cashier working more
than one shift also giving him the ability to add the type of payments
to his cashier closure ,
also adding validation to be sure the from time is less than to time.
* Update cashier_closing.py
2018-09-06 19:02:25 +05:30
Nabin Hait
a2a6568b7e
fix(reports): Made gstr1 ready for govt portal
2018-09-06 17:44:31 +05:30
Sanjay Kumar
1b49f3a4e7
Allow cost center in entry of balance sheet accounts ( #14972 )
...
* Allow Cost Center In Entry of Balance Sheet Account
* Add parent cost center in get payment entry
* Add Tests for Allow Cost Center In Entry of Balance Sheet Account
* Add tests for cost center wise account and party balance
* set parent cost center in taxes
* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents
* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Zarrar
1b37186460
set POS Invoice format only if its enabled ( #15326 )
2018-09-06 13:25:52 +05:30
Nabin Hait
f846c43361
Merge branch 'ESS-LLP-healthcare_v11_wip' into develop
2018-09-06 13:07:08 +05:30
Nabin Hait
e5a4037b57
minor fix in deferred revenue booking
2018-09-05 17:44:39 +05:30
Nabin Hait
aacb915cae
Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip
2018-09-05 17:21:47 +05:30
Zarrar
2705af488d
[Minor] [Staging] POS Profile ( #15321 )
...
* update modified date to load field display_items_in_stock
* stop dialog from popping up if no loyalty program found
* warehouse not used for not is_pos type invoice
2018-09-05 17:20:07 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year ( #15320 )
2018-09-05 17:18:59 +05:30
Nabin Hait
5122a8e0d7
Merge branch 'staging' into develop
2018-09-05 11:47:30 +05:30
Zarrar
3cea3c46b6
change modified date of account to reload fields ( #15317 )
2018-09-05 11:41:54 +05:30
Saif
8f00db58bd
-Moved JE's User Remark on the top of the generated remarks ( #15314 )
...
-Added a field in JE's Account entries to add remarks in specific JE Account entry
2018-09-05 11:13:06 +05:30
Saurabh
1fe1884b73
Merge branch 'master' into develop
2018-09-03 17:00:17 +05:30
Nabin Hait
13109aef9d
fix: validate only if service stop date
2018-09-03 12:18:17 +05:30
Jamsheer
e82f27ac10
Healthcare - Invoice Drug Prescription
2018-09-03 11:26:17 +05:30
Jamsheer
8da6f4e30c
Healthcare - Invoice - Redesign
2018-09-03 11:26:17 +05:30
Jamsheer
c6974a79a8
Sales Invoice - show Healthcare Fields - Healthcare in active Domains
2018-09-03 11:26:15 +05:30
Jamsheer
54ae74eb28
Inpatient Billing
2018-09-03 11:26:14 +05:30
Jamsheer
ba11972302
Healthcare Service - Invoice Work Flow - Redesign
2018-09-03 11:26:14 +05:30
Rohit Waghchaure
12b4096e68
[Minor] Don't validate on cancelled budgest
2018-08-31 16:54:59 +05:30
Nabin Hait
1b73505391
Update sales_invoice.py
2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d
minor fixes
2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9
minor fixes
2018-08-31 14:49:20 +05:30
Ameya Shenoy
203152d67e
indentation: fixes
2018-08-31 14:33:48 +05:30
Nabin Hait
e033df2757
minor fixes
2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06
Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date
2018-08-31 12:39:46 +05:30
Bassam Ramadan
8d7c1868d6
fix for fields names at sales invoice return payments and verifying the payment amount ( #15245 )
...
* fix for payments field names in sales invoice return
* add verification for payment amount at sales invoice return
adding verification to be sure the payment amount is negative at sales
invoice return
* correction for precision field name
2018-08-30 19:15:15 +05:30
Rushabh Mehta
49f9747385
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc ( #15267 )
...
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
2018-08-30 18:50:48 +05:30
Zlash65
80f5cb05cc
fixes in setting end_date and manual provision of start&end date
2018-08-30 10:39:48 +05:30
Zlash65
91eae54383
manually provide start and end date
2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6
start date logic fix
2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943
end date / stop date calc fix
2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383
end date should reset if start date is changed
2018-08-30 10:39:48 +05:30
Zlash65
d676a67769
validate changing service stop date once its set
2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15
book last gl_entry based on service stop date
2018-08-30 10:39:48 +05:30
Zlash65
243863a290
validation for stop date added
2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e
service stop date field added
2018-08-30 10:39:48 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab
(fix)test case: loyalty program, course schedule and more
2018-08-29 17:05:11 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Aditya Hase
e3ac5ff9e3
erpnext: refactor async to is_async ( #15231 )
2018-08-28 14:11:58 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Zarrar
93577665f2
[Enhance] Multiselect for Cost Center and Project ( #15208 )
...
* add filter for Cost Center, make CC & Project multiselect field
* update queries according to project/cost_center multiselect
* add multiselect filter for cost_center and project
* update query according to multiselect
2018-08-27 12:08:53 +05:30
Mario Monroy
fbc3df3247
Fix indentation accounts_receivable.py ( #15203 )
2018-08-23 11:10:15 +05:30
Bassam Ramadan
1ff2315899
Trial balance and payable accounts reports and sales return fixes ( #15000 )
...
* adding supplier type filter to payable accounts and payable accounts summary reports
adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter
* fix trial balance opening and closing values
the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account
* fix for supplier type filter field on payable accounts reports
rename the supplier type filter field to supplier group in payable
accounts and summary reports
* fix for paid amount in returned sales invoice
the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.
* fixing trial balance values and totals
fixing trial balance opening and closing ( DR - CR ) values and totals
2018-08-20 17:58:28 +05:30
Saif
a09a8c3bf7
Fixed missing DocType info for Purchase Items ( #15152 )
...
* Made Purchase Invoice Items' Batch No and Serial No fields non copyable.
* Added appropriate currency field options to Purchase...Items DocFields:
-Landed Cost Voucher Amount
-Billed Amt
2018-08-20 17:55:18 +05:30
Saif
e3947296e8
Group by Voucher fix in General Ledger Report ( #15169 )
...
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries
* Group by Voucher show groups with totals at the end of group
2018-08-20 17:49:29 +05:30
Shreya Shah
80f30094fb
Fix error msg ( #15146 )
2018-08-16 10:29:16 +05:30
rohitwaghchaure
6fb2117767
Allow to make budget for the same cost center with different account ( #15149 )
2018-08-16 10:22:06 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report
...
[Fix] Consolidated balance sheet report
2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85
[Fix] Consolidated balance sheet report
2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa
rounding off fixes and conversion fix ( #15140 )
2018-08-14 16:28:14 +05:30
Faris Ansari
4809f86035
fix(report): field -> fieldname, dateutil -> frappe.datetime ( #15106 )
2018-08-14 10:56:18 +05:30
Shreya Shah
0631aed3d9
Discount amount field in all transactions' child tables ( #15124 )
...
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
2018-08-14 10:51:48 +05:30
rohitwaghchaure
88b0a1305f
Code optimization for accounts receivable report to avoid timeout error ( #15114 )
...
* Code optimization for accounts receivable report to avoid timeout error
* Added index for party_type
2018-08-14 10:51:13 +05:30
Nabin Hait
c35271aef5
fix(various)
2018-08-10 19:01:13 +05:30
Nabin Hait
8bf52fef42
minor fixes
2018-08-09 19:45:33 +05:30
Nabin Hait
9a33bc6417
optimizing transactions by caching
2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049
[optimize] tree conditions for pricing rule
2018-08-08 18:43:04 +05:30
Himanshu Mishra
859d942b22
Cached calls ( #15109 )
...
* [optimize]: bin updates
* [optimise]: use frappe.get_cached_value instead of get_value for item
* [fix]: change db.get_cached_value to get_cached_value
2018-08-08 18:33:50 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
rohitwaghchaure
8f0acf30bf
Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet
...
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:53:21 +05:30
Rohit Waghchaure
9a9974f5c3
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:51:56 +05:30
Meritsystems
1ad8eca4e8
Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. ( #14895 )
...
* Update point_of_sale.py
* Update point_of_sale.py
Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.
* New field " Display Items in Stock" added
* Update point_of_sale.py
* Update point_of_sale.py
ORM used instead of SQL
used Bin to find actual quantity balances.
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
2018-08-07 14:38:50 +05:30
Saurabh
824b388631
Resolved merge conflicts
2018-08-07 13:01:11 +05:30
Shreya Shah
f0ef673498
Accounts receivable aging based on supplier due date ( #15080 )
...
* Accounts receivable aging based on supplier due date (#13801 )
* Remove spaces
2018-08-06 14:42:35 +05:30
Rohit Waghchaure
15f52e7b71
[Fix] Incorrect tax amount calculation because of same fieldname in the code
2018-08-06 14:29:34 +05:30
rohitwaghchaure
ae4ff5a403
[Fix] In words showing grand total instead of rounded total ( #15065 )
2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b
Get Advances and auto allocate ( #14970 )
2018-08-01 18:07:39 +05:30
Zarrar
7f8024c516
[Enhancement] Tax Withholding Category ( #15064 )
...
* add single, cumulative threshold, remove checkboxes
* remove tds child table from supplier & add tds link field
* add description field in tax withholding category
* add tax withholding data for indian setup, some fixes
* add a checkbox for tax withholding in purchase invoice
* remove supplier's child table for tds
* enable tds field if supplier has tds set inits master
* move rates data to child table - adding fiscal year support
* change bootstrap data according to child table config of tds
* show category name in list view
* loyalty program fixes
* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry
* add fiscal year dependency in company test
* minor loyalty program fix
* minor tier calculation fix
* minor handling duplicate exception
* toggle apply_tds according to supplier, code rectify
* minor fixes for loyalty program
* test case for single and cumulative threshold
* codacy fix
2018-08-01 17:45:05 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
Nabin Hait
d53c2c031d
more payroll improvements and tests fixes
2018-07-30 20:17:15 +05:30
Zarrar
89c87fd6a6
[Minor] Patch fix ( #15041 )
...
* update modified date
* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
rohitwaghchaure
91d2ace9bb
Account no + account name in trial balance and financial statements reports ( #15038 )
2018-07-30 10:38:51 +05:30
Shreya Shah
91a9ee5179
Merge accounts functionality ( #14993 )
...
* Add dialog to merge accounts
* Add conditions and merge functionality
* Fix travis
* Add test case
* Add more test scenarios
2018-07-28 10:26:11 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Shreya Shah
eed0a4e2df
Do not copy remarks field while duplicating ( #15023 )
2018-07-27 11:26:35 +05:30
Yaqin Shurrab
cc56ff5c37
Get the correct Summation of Closing Balances ( #14990 )
...
Fix total raw values for Closing Credit and Closing Debit
2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3
[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report ( #14994 )
2018-07-27 11:03:53 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections
...
Gocardless improvement and payment request correction
2018-07-26 11:41:43 +05:30
Shreya Shah
cd717e422f
Modify renaming process of Account ( #14839 )
...
* Disable renaming for Account Master
* Update account name along with account number
* Fix as per suggestions
* Update account.js
* Fix typo
* Remove after_rename and before_rename methods
* Modify test case
* Modify field placement
* Remove unused method
2018-07-23 14:15:20 +05:30
Saurabh
a638400e5d
Merge pull request #14707 from chdecultot/stripe_improvements_4
...
Stripe Subscriptions
2018-07-23 12:11:58 +05:30
Faris Ansari
5e096df5ae
columnDef => column
2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd
Return early if filters not initialized
2018-07-20 16:31:01 +05:30
Faris Ansari
5986d59b01
Financial Reports
...
- Update formatter for use with DataTable
- Fetch Currency from filters and fallback to company currency
2018-07-20 15:11:55 +05:30
Nabin Hait
47ce481394
Minor fix
2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property
2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707
[fix] format fiscal year docname to proper date before using 🤦 ( #14955 )
2018-07-18 18:03:27 +05:30
Saurabh
0bfbf8aa6f
[minor] remove conflicts
2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57
Gocardless improvement and payment request correction
2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832
Defaults in Item Group ( #14874 )
...
* Add Defaults table in Item Group
* Fetch defaults from Item group if not found in Item
* Add patch
* Remove default fields from Item Group
* Set query for defaults
* Fix Codacy
* Modify test records
* Modify budget.py and sales_order.py
* Remove join from query
* Else condition to avoid error if no defaults found
* refrain from making item test records before item_group
* default cost center fetch correction
* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790
Naming series increase even if there is an exception while saving the invoice from the backend ( #14938 )
2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1
[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order ( #14899 )
...
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order
* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
e78a877202
patch fixes ( #14936 )
2018-07-17 16:38:11 +05:30
Nabin Hait
26786bd35d
minor route fix for general ledger
2018-07-17 15:59:15 +05:30
Zarrar
26c9b94cc6
[ Improv ] Loyalty Program more fixes and test case ( #14888 )
...
* remove console statements
* set account & cost center for redemption
* add test case for single/multi tier & is_return scenario
* reset tier when changing loyalty program
* make loyalty fields non copy type
* fix test case - delete si after every test to avoid interference
2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b
[Fix] Invoices not showing in the gross profit report against which sales return entry has created ( #14914 )
2018-07-16 18:11:19 +05:30
Charles-Henri Decultot
3fa3104dcc
Debug cleanup
2018-07-13 14:00:42 +00:00
Charles-Henri Decultot
c047bf88db
Rebase following Subscription corrections
2018-07-13 13:25:53 +00:00
Charles-Henri Decultot
7722b81c8e
Variable correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a0b7236f66
Corrections following Saurabh's comments
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
90669a03b3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
da8b11fd12
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
8b3e841fbf
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6
Review corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a
Codacy corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3
Dev cleanup
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7
Remove payment plan reference
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631
Subscription integration
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9
Corrections to Subscriptions
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d
Stripe integration corrections
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad
Payment Request modifications
2018-07-13 13:05:54 +00:00
Saurabh
3d825e5689
Subscription test and fixes ( #14875 )
...
* Add dashboard on subscriber screen
* Add Subscription and Subscription Plan to Account Dashboard
* Fetch customer name while creating subscriber
* [fix] add section for Subscription Period
* minor fixes
* optimization
2018-07-13 17:41:36 +05:30
rohitwaghchaure
3ffe89659a
[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice ( #14879 )
2018-07-13 17:40:48 +05:30
Ameya Shenoy
a559b0de5a
Role modifications for Shareholder ( #14872 )
...
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
2018-07-13 11:34:19 +05:30
Zarrar
5899d98077
[ Major ] Loyalty Program Fixes ( #14863 )
...
* fix checking of customer_group & territory of customer in loyalty program
* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options
* removed disabled field, added from_date & to_date
* loyalty program section made collapsible, added redeem check in it
* setting loyalty program improvised, manual selection if multiple found
* get_query added, amount calculation updated
* args passed rectified for expiry_date
* get loyalty_points logic improv, redemption_details logic added
* improv based on from/to date and other rectification
* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03
[Minor] Employee Separation Fix ( #14867 )
...
* delete associated task & project forcefully
in Employee Seapration cancel trigger
* remove leftover print statement
* remove console statements
2018-07-11 14:34:55 +05:30
Shreya Shah
21d3352aa2
Merge pull request #14835 from shreyashah115/print-hide
...
Print hide loyalty program related fields
2018-07-06 18:36:47 +05:30
Shreya
9bcb959f81
Print hide loyalty program related fields
2018-07-06 18:17:02 +05:30
Zlash65
1aeca1d349
change name that fetches numbered value from acc & cc
2018-07-06 17:15:33 +05:30
Zarrar
17705f932d
[ Minor ] Cost Center Number field added in field's dialog ( #14781 )
...
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function
* rename function's name appropriately
2018-07-06 14:44:44 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
rohitwaghchaure
3f5e80ebe3
Allow bulk edit for the sales invoice item ( #14826 )
2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
rohitwaghchaure
839320dca5
[Fix] Original Invoice outstanding is not updating after making Debit Note ( #14821 )
2018-07-06 10:42:15 +05:30
bobzz-zone
58236ffc1e
Update budget_variance_report.py ( #14798 )
...
Make sure GL Entry only called once in each row
2018-07-06 10:39:00 +05:30
Zarrar
a3f6856d81
python 3 fix for sorted ( #14814 )
2018-07-05 10:37:39 +05:30
Rohit Waghchaure
5005e467a0
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 12:37:38 +05:30
Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
Nabin Hait
104f62090d
Add filters for cost center in Budget Variance report
2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026
Add configurable frequency in Selling Settings for update of project … ( #14670 )
...
* Add configurable frequency in Selling Settings for update of project and company
* remove redundant code
* remove redundant code, only trigger calculation if order/invoice is present
* removed dangling commas as per common convention in hooks
* fix:handling multiple documents
* Update selling_settings.json
2018-06-28 23:43:23 +05:30
rohitwaghchaure
191876f51b
[Fix] Bank Account mandatory ( #14734 )
2018-06-28 23:28:58 +05:30
Charles-Henri Decultot
52fb43fc4f
Add no copy to payment terms template ( #14725 )
2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
8b22310d66
Allow auto repeat update ( #14706 )
...
* Allow auto repeat update
* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1
[ Enhance ] Setup Wizard - Chart of Accounts ( #14698 )
...
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart
* read chart from file and make a tree render-able dict of it
* tree method to return node data for coa setup wizard
2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5
Fix error message ( #14716 )
2018-06-28 14:14:28 +05:30
Manas Solanki
4933e6bfeb
Update test_finance_book.py ( #14703 )
2018-06-27 17:30:09 +05:30
Manas Solanki
b912374b96
[test] check the finance book via the journal entry
2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3
[Fix] Wrong rate calculation in Itemwise sales register report for multi uom ( #14690 )
2018-06-27 11:22:03 +05:30
mnaim-cloude8
56e4346ead
To fixed if if no schedule and disposal is NOT within the period. ( #14637 )
...
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.
* Update asset_depreciations_and_balances.py
2018-06-25 15:05:26 +05:30
rohitwaghchaure
34c187706d
[Enhance] Added Budget exception approver role in company ( #14645 )
...
* [Enhance] Added Budget exception approver role in company
* Added test cases for budget
2018-06-25 10:31:08 +05:30
rohitwaghchaure
3a595d07d0
[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases ( #14649 )
...
* [Fix] POS Closing Voucher, on save collected amount becomes zero
* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Sushant Nadkar
00f0f0f5fc
Added adational filters to Tax Rule doctype ( #14639 )
2018-06-22 15:57:19 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop
2018-06-22 05:10:29 +00:00
Zlash65
4cf46edabc
expense_claim related fix in payment entry
...
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
79e5b07e62
[Fix] Subscription method ( #14604 )
...
* [Fix] Subscription method path
* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125
[Fix] Deferred account must be liability account ( #14612 )
2018-06-21 11:55:49 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
rohitwaghchaure
fd5ac45775
[Fix] Not able to make invoice in the subscription ( #14594 )
2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c
Allowed paid amount against debit/credit note
2018-06-19 12:07:02 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Zarrar
80ff296e97
data not filled in acc. receivable report for some field fix ( #14546 )
2018-06-17 11:21:10 +05:30
rohitwaghchaure
83a2612a18
[Fix] Consolidated Financial Statement report ( #14537 )
2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa
Added expense account, cost center in the purchase order and material request item doctype and fix the code ( #14535 )
2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190
[minor] Fixes for Exchange rate revaluation doctype ( #14533 )
...
* Add set query for account and party_type
* Fix asset category error
2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4
Add test case for Inter company Journal Entry ( #14531 )
2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
rohitwaghchaure
e647c1f3cb
Renamed asset adjustment to asset value adjustment ( #14532 )
2018-06-15 13:06:28 +05:30
Shreya Shah
0b9b8d6826
Remove unused code ( #14526 )
2018-06-14 17:57:39 +05:30
Rushabh Mehta
1198d94904
[rename] Email Alert -> Notification
2018-06-14 13:18:21 +05:30
Zarrar
6ffdf94003
[Fixes] Defaults and User-Permission based fixes in treeview ( #14501 )
...
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data
* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
IOWEB TECHNOLOGIES
62805e2101
Fix unicode literal issue that prevents payment entries to be created ( #14515 )
2018-06-14 09:14:07 +05:30
Shreya Shah
3d73a6f7f2
Fetch details from Journal Entry in Accounts Payable report ( #14495 )
...
* Fetch bill_no, bill_date from Journal Entry
* Fix as per suggestion
* Fetch details only if bill_no exists
2018-06-13 16:33:06 +05:30
Jamsheer
30f37b2eb1
Payroll Entry - Separate JE for flexi salary component ( #14502 )
...
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry
* Journal Entry - validate cheque info on submit
* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Rohit Waghchaure
647d595158
Code cleanup and fixes for the asset
2018-06-11 19:15:08 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py
2018-06-11 14:25:27 +05:30
rohitwaghchaure
7048925016
[Enhance] Standalone debit/credit note ( #14269 )
...
* [Enhance] Standalone debit/credit note
* Test cases
* Test cases and documentation
* Removed credit, debit note links from accounts module
2018-06-11 12:02:14 +05:30
Zarrar
88a90ff3b5
minor fix in account and account utils ( #14432 )
2018-06-11 11:21:17 +05:30
Zarrar
44175904c6
Tree fix ( #14425 )
...
* use frm.set_value instead of this.set_value
* generic methods moved to accounts/utils
* clean up code, and make use of methods added in utils
2018-06-08 16:35:21 +05:30
Zarrar
7ab70ca2d7
[ Fixes ] v11 Tree based doctype testing ( #14419 )
...
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node
* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash
* Company tree fix
Check if child exist while deleting a node validation added.
* Supplier Group tree fixes
on_trash validation added if child node present
* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Zarrar
8cd0f67b25
query fix if name contains apostrophe ( #14370 )
2018-06-07 16:48:31 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav
...
Some more travis fixes
2018-06-07 14:14:33 +05:30
Shreya
4638d1ab97
Fix POS Profile test
2018-06-06 16:23:16 +05:30
Charles-Henri Decultot
a774f3d7a0
POS closing voucher ( #14270 )
...
* POS closing voucher
* Codacy corrections + improvements
* Codacy corrections
* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Shreya
9c801b976d
Fix share transfer test
2018-06-06 02:58:23 +05:30
Shreya Shah
630721aacc
Travis ( #14354 )
...
* Fix Purchase Receipt tests
* Fix Item test
* Fix daily work summary test
* Modify currency exchange test cases
* Fix Leave Application test
* Update working hours when making salary slip from timesheet
* Replace fixer.io with exchangeratesapi
* Fix codacy
2018-06-05 12:56:10 +05:30
Shreya Shah
4fa600a8dd
Apply GST based on Origin and Place of supply GST Code ( #14288 )
...
* Add new gst field in Taxes and Charges template - is_inter_state
* Add a patch
* Add a regional function to fetch taxes on the basis of GSTin
* Add regional function to hooks.py
* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN
* Fixes in the setup.py for India region
* Set is_inter_state field
For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.
* Fix as per review comment
2018-06-05 11:27:53 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Ahmad M Abdelrahman
f12b446dc8
Bank Account #13714 PR ( #14295 )
2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495
[minor][fix] fix query syntax ( #14294 )
...
* [minor][fix] fix query syntax
* Update pos.py
2018-05-31 08:54:31 +05:30
Rohit Waghchaure
7c0dd7a142
Rearrange fields
2018-05-31 00:27:05 +05:30
Zarrar
58200182b4
update timeline data form Activity Log ( #14276 )
...
Documents updated are stored in Activity Log rather than Communication
2018-05-30 11:56:23 +05:30
Zarrar
b9f54ca946
[Enhance] Group same items during printing Delivery Note, Invoices, etc ( #14250 )
...
* add doctypes allowed to group items, average the rate
* add check field to group items during print
* call common before_print in delivery note
* fix precision issue while calculating average
2018-05-28 17:41:09 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue
...
[Fix] Data not displaying in financial reports
2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e
Fixed data not displaying in financial reports
2018-05-28 15:01:57 +05:30
Shreya Shah
13f39eb821
Display rate on the basis of stock UOM ( #14246 )
2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa
Total Quantity in Sales and Purchase DocTypes ( #14114 )
...
* Add field to all sales and purchase doctypes
* Add patch to update existing records
* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b
Sales Payment Summart Report Improvement ( #14243 )
...
* fix iteritems() takes exactly 1 argument (2 given)
* adds new helper functions
* use new functions to make POS invoices filterable on warehouse and cost center
* more PEP8 fixes
2018-05-28 10:26:45 +05:30
Suraj Shetty
084b0b3a67
Treeview permission ( #14232 )
...
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 )
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
* Add parent filter
* Add ifnull checks
2018-05-26 09:12:59 +05:30
Nabin Hait
33df0b4fbf
Test case fixes ( #14219 )
...
* Test case fixes
* fetch_from fixes
2018-05-26 09:09:02 +05:30
Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Nabin Hait
b903fc4e71
Item defaults query fixes
2018-05-24 17:07:51 +05:30
neckos
7663bb91c5
return list(filter()) not filter() ( #14191 )
...
filter constructs an iterator that is iterable only once
2018-05-23 19:45:34 +05:30
Nabin Hait
5f861756a2
Item Default fixes
2018-05-23 19:37:06 +05:30
Rushabh Mehta
315dbd2ed1
[minor] chart_of_accounts.py for python3
2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431
[fix] inconsistent indentation
2018-05-23 16:14:35 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1
Link Share Transfer to Account ( #14127 )
...
* Link Share Transfer to Account
* minor changes
* minoor changes
2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10
Project Budget does not filter per Project ( #14179 )
...
* Project Budget does not filter per Project
Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.
* Update budget.py
2018-05-23 10:47:53 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Rohit Waghchaure
7529bbb7b4
[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'
2018-05-22 11:55:48 +05:30
rohitwaghchaure
742d3e5549
[Fix] General ledger default_currency issue for member party type ( #14172 )
2018-05-22 09:10:01 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
...
[Fix] Patch, default cost center, expense account for the item
2018-05-21 17:18:58 +05:30
Rohit Waghchaure
0ca7ba3247
[Fix] Patch, default cost center, expense account for the item
2018-05-21 16:43:50 +05:30
Valmik
bfb8a73377
Append company after ( #14119 )
2018-05-21 10:44:35 +05:30
Valmik
c28378f448
[fix] get barcode string instead of dict ( #14139 )
...
* [fix] get barcode string instead of dict
* Update pos.py
2018-05-21 10:06:05 +05:30
Rohit Waghchaure
f61e94e162
Changed condition of finance book in reports
2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c
Added finance book in Asset Depreciation Ledger report, fixed asset issue
2018-05-17 23:29:37 +05:30
Valmik Jangla
b52d5b21a1
Add UOM to Item View with Price
2018-05-17 00:09:21 -07:00
Rohit Waghchaure
585945e65d
Allow to select Asset Received But Not Billed in expense account head
2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty
...
[Fix] Validation issue
2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b
[Fix] Validation issue
2018-05-16 23:57:28 +05:30
Rohit Waghchaure
44fda65b1d
[Fix] Company mandatory issue
2018-05-16 23:31:09 +05:30
Rohit Waghchaure
a91765707a
[Fix] TDS issue
2018-05-16 23:13:02 +05:30
rohitwaghchaure
64e81b436e
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing
...
[Fix] Custom buttons not showing
2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422
[Fix] Cystom buttons not showing
2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue
...
[Fix] Gl Enrty issue
2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2
[Fix] Gl Enrty issue
2018-05-16 21:34:06 +05:30
Rohit Waghchaure
8e4f676c8c
[Fix] onload set default employee, leave approver, company
2018-05-16 19:55:52 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
...
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:20:52 +05:30
Shreya
63d14cfac8
Instead of throwing error, just return
2018-05-16 17:30:58 +05:30
Shreya
df9516e906
Add Finance Book to route options
2018-05-16 17:30:35 +05:30
Ameya Shenoy
6e92958578
spaces to tabs
2018-05-16 16:11:20 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint
...
[fix] calculate withholding only on invoice
2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd
[fix] calculate withholding only on invoice
2018-05-16 15:00:19 +05:30
Charles-Henri Decultot
2f822476dd
Removal of debugging print
2018-05-16 08:40:16 +00:00
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868
Missing parentheses in price list rate determination
2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f
Undo replace of frappe.db.sql with frappe.get_list ( #14074 )
2018-05-16 13:53:31 +05:30
Ranjith Kurungadam
cdd4704485
Fixes, fields in Salary Component ( #14071 )
...
* remove duplicate fields
* Salary Component - fields is_tax_applicable, is_payable
* fix intendation
2018-05-16 13:10:08 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9
update for default warehouse
2018-05-16 12:44:07 +05:30
Rohit Waghchaure
144e9b178a
Added project condition in budget validation
2018-05-16 12:15:57 +05:30
Rushabh Mehta
b56f3d0689
[fix] syntax errors
2018-05-16 12:03:39 +05:30
tundebabzy
ad08d4ce96
Ability to hold payment for disputed invoices #12048 ( #13298 )
...
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments
* sanitize `on_hold` field input
* show hold status in list view
* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed
* reset release date if supplier is not on hold
* add validation to stop transactions when Supplier is blocked
* add test cases
* return empty list for outstanding references if supplier is blocked
* block make button:payment if supplier is blocked
* adjust test cases
* PEP 8 clean up
* more tests
* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold
* implement individual purchase invoice on hold logic
* allow user to change release date
* update manual
* final cleanup including more validation and tests
* update supplier manual
* make default for release_date argument todays date
* remove Auto Repeat added by mistake
* add on_hold_field to purchase invoice
* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view
* implement explicit payment hold in purchase invoice
* update manual
* add dialog for saving comment
* bug fix, refactor, clean up
* more test cases
2018-05-16 11:31:41 +05:30
Shreya Shah
1906cadd94
[Fix] Currency field in Pricing rule ( #14004 )
...
* some minor changes
* Set query for price list based on currency
* Validate Price list with currency
2018-05-16 11:20:30 +05:30
rohitwaghchaure
e8358f33a3
Refactor party type ( #13831 )
2018-05-16 11:02:26 +05:30
Suraj Shetty
8501010f12
Replace frappe.db.sql to frappe.get_list to apply permissions ( #14037 )
...
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
2018-05-16 10:44:38 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po
...
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:12:44 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate
...
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Zlash65
36cb8fb153
removed hard coded account_type from tree's add_child entry
2018-05-15 17:36:01 +05:30
Shreya
3f77852e93
Pass buying or selling as filter parameters
...
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account
2018-05-15 15:20:44 +05:30
Manas Solanki
0b7f64924d
booking via the schedular
2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60
deferred account in the item and company master
2018-05-15 13:04:01 +05:30
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
Rohit Waghchaure
3e0a937cb8
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-05-04 19:20:20 +05:30
Suraj Shetty
dcc90e3312
Add fix to support changes in user permission ( #13923 )
...
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Shreya Shah
ecb9315ea1
Inter Company Journal Entry ( #13683 )
...
* rebase with enterprise_sprint
* Add Inter company account checkbox in Account master
* Add Inter Company Journal Entry Voucher Type in Journal Entry
* Make Inter Company Journal Entry button
* Dialog to select company for Inter Company Journal Entry
* Map relevant fields in the Inter Company Journal Entry and reference links
* Rebase
* Add Documentation
2018-05-03 19:04:36 +05:30
Zarrar
6f3594b2e4
[Enhance] GL Entry - ability to multiselect party ( #13769 )
...
* change dynamic link to multiselect field and improv
* print based fix
* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
rohitwaghchaure
1aa3a11546
On auto-creation of new Fiscal Year, send Email notification to the account users ( #13789 )
2018-05-03 18:59:26 +05:30
Saurabh
e85a43c1c6
Merge branch 'master' into develop
2018-05-02 14:48:10 +05:30
Shreya
27e4e244b6
fix codacy
2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d
changes as per the reviews
2018-05-02 14:34:14 +05:30
Shreya
b47302dd52
unlink reference on cancellation of any invoice
2018-05-02 14:34:14 +05:30
Shreya
c804f424ab
update reference fields on both invoices
2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd
validations to check price list and currencies
2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7
mapping of relevant fields
2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03
validations before routing to invoice
2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e
Inter company invoice reference link field
2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe
make inter company invoice button on Invoices
2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e
Allowed To Transact With child table in Customer & Supplier
2018-05-02 14:34:14 +05:30
Faris Ansari
5df63e36d4
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a
display customer's name while printing receivable report ( #13830 )
2018-04-30 19:40:18 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Faris Ansari
8be895091e
Set is_pos to 0 in Opening Invoice Tool ( #13810 )
2018-04-30 11:13:06 +05:30
AravindPranera
805f09a3fe
Accounts receivable aging based on supplier due date ( #13801 )
2018-04-26 18:02:37 +05:30
deepak-mnt
b712d1905d
Override after_rename method to fetch cost center number on changing from title
2018-04-26 17:04:06 +05:30
deepak-mnt
b379998961
Added Update Cost Center Number button and it's functionality
2018-04-26 17:00:08 +05:30
Nabin Hait
dc75be8b6c
Show company column in order in consolidated financial statement
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d
[Fix] general ledger group by validation
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c
[Fix] Profit and loss statment
2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520
Fixed merge conflict
2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de
Consolidated financial statement ( #13678 )
...
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106
Group by party in general ledger report ( #13649 )
...
* Group wise Ledger for Customer and Supplier
* commonify group by fields
2018-04-26 12:16:18 +05:30
Nabin Hait
1c13e70d13
New doctypes for HR and Accounting ( #13652 )
2018-04-26 12:12:29 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Shreya Shah
4dc453d131
Loan Management for the Members (Non Profit Module) ( #13149 )
...
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account
* Patch added
* Dynamic link fields 'applicant' and 'applicant_type'
* Member link visible only if domain non profit is active
* Modified loan_dashboard
* Make Repayment Entry button
* Common file loan_common.js for loan and loan_application
* repayment schedule rows selection in dialog
* validation if repayment amount > total paid amount
* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month
* fetch nowdate if disbursement date not found
* Rebased with develop
* updated non-profit module page
* updated patch for renamed fields
* dialog to select repayment entries
* hidden field to store reschedule paid status
* update paid check in loan on journal entry updation
* calculate total paid
* updated docs
* codacy fix
2018-04-24 12:19:36 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Deepak kumar
022ac50160
Reverse Journal Entry ( #13637 )
...
* [Fix] #13605
* fixes codacy
* minor changes
* Added naming series for reverse journal entry
* added reference_type and reference_name
2018-04-24 10:52:28 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0
spelling: canceled --> cancelled
2018-04-22 23:43:08 +01:00
Nabin Hait
c36524ec54
Update chart_of_accounts.py
2018-04-20 11:00:20 +05:30
Shreya Shah
44e719d64c
[Enhancement] Leave Application and Expense Claim ( #13645 )
...
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
2018-04-19 20:58:52 -08:00
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1
...
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Zarrar
59f7b8c4a1
issue routing to report ( #13710 )
2018-04-18 02:56:02 -08:00
Saurabh
46ffbb74ff
fix cheque print measurements
2018-04-17 20:44:37 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
matmyers
742da8cfce
removed duplicate keys ( #13675 )
2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
f2a941b1a4
[fix] check if supplier value exists ( #13616 )
2018-04-15 21:37:14 -08:00
Sathisha Poojary
16ce8ed7d5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-14 12:05:11 +05:30
Faris Ansari
ed34a442a8
Obey currency filter in financial statement prints #pdd ( #13648 )
2018-04-13 21:34:00 -08:00
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print ( #13627 )
2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b
GST purchase invoice with tax breakup details ( #13561 )
2018-04-12 14:50:48 +05:30
rohitwaghchaure
2ea593bdd8
[Fix] POS Profile data not set in the sales invoice ( #13568 )
2018-04-12 13:37:08 +05:30
Sathisha Poojary
99e3ca0f67
Create a new doctype for bank so that we can suport other
...
bank statements dynamically.
2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form ( #13509 )
2018-04-06 10:28:08 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling
...
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
rohitwaghchaure
eedc0ac681
[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com ( #13467 )
2018-04-02 12:49:38 +05:30
Britlog
220864b4f7
Allow decimal quantities in pos ( #13471 )
2018-04-02 10:55:04 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30
Zarrar
e9ca5e81d2
hide add_child for root node ( #13444 )
2018-04-02 10:40:39 +05:30
Nabin Hait
edd320e338
Optimisation of warehouse_account_map ( #13454 )
2018-04-02 10:30:17 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements ( #13423 )
2018-04-02 10:14:32 +05:30
Manas Solanki
0289ad285f
fix the route filters and payment account ( #13447 )
2018-04-02 10:13:22 +05:30
Sathisha Poojary
1de5669574
Rename Bank Statement Settings appropriately and allow auto
...
populating some settings for supported banks
2018-03-31 10:30:34 +05:30
Sathisha Poojary
f698a1bcbe
Minor typo with major error
2018-03-31 01:19:52 +05:30
Sathisha Poojary
f069e1c83c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-03-31 00:55:56 +05:30
Nabin Hait
ff2e4c898a
Fixed merge conflict
2018-03-29 13:57:39 +05:30
Rohit Waghchaure
ace68cd283
[Fix] Alignment and date issue in PDC report
2018-03-28 15:53:29 +05:30
Nabin Hait
6c35822a35
Merge branch 'master' into develop
2018-03-28 10:40:14 +05:30
Sathisha Poojary
148c4f9724
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-03-28 00:27:32 +05:30
Sathisha Poojary
0512eec54b
Some minor changes addressing manual doctype renaming issues
2018-03-28 00:22:59 +05:30
Shreya Shah
c0201877dd
fixed column fieldnames for translations ( #13406 )
2018-03-27 18:45:42 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Shreya Shah
149f7ee875
[Fix] General Ledger Report ( #13374 )
...
* error fix if party_type = student or shareholder
* clear party filter when party_type changes to avoid error throw
* dict with values of party_name in utils.js
* fetch party_name from erpnext.utils.get_party_name
* Update general_ledger.py
2018-03-27 11:29:25 +05:30
Sathisha Poojary
0b5fea1491
Initial changes to manually migrating bank statemet work from
...
app to erpnext
2018-03-26 01:12:18 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Shreya Shah
9bcadf8126
Tax Id in some reports and print formats ( #13373 )
...
* tax-id in sales and purchase registers
* tax-id in general ledger print_format
* tax-id in accounts payable
* tax-id in accounts receivable
2018-03-23 15:04:37 +05:30
Nabin Hait
80a9f523d5
Minor fix AR/AP summary report
2018-03-23 13:02:27 +05:30
pawan
53a4d2c430
[fix] #13352
2018-03-21 09:19:36 +05:30
Siddhi Sawant
c672530210
[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats ( #13316 )
...
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats
* Update gst_pos_invoice.json
Updated its 'disabled' property.
* Update pos_invoice.json
Updated its 'disabled' property.
* Shows change amount only if it exists
* Updated disable property of print formats
2018-03-20 14:31:14 +05:30
Nabin Hait
8a8966ce9b
minor fix
2018-03-20 11:19:57 +05:30
Saurabh
2777fd4332
[fix] validate minimum transaction amount in Payment Request for selected payment gateway ( #13328 )
2018-03-19 18:29:01 +05:30
Achilles Rasquinha
1e95323679
Fixed dict_keys concatenation
2018-03-18 10:08:43 +05:30
Nabin Hait
c8cd4ba6f7
Merge branch 'master' into develop
2018-03-15 12:38:43 +05:30
Nabin Hait
70abac0061
Get territory from sales invoice
2018-03-15 12:19:16 +05:30
Nabin Hait
3707242770
Fixed merge conflict
2018-03-13 16:15:41 +05:30
Nabin Hait
89346967da
Reverted #13259 ( #13291 )
2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry ( #13288 )
2018-03-13 15:57:34 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI ( #13290 )
2018-03-13 15:46:59 +05:30
tundebabzy
0125f7b130
rename to Subscription and transfer present Subscription records to Auto Repeat in frappe
2018-03-12 13:51:47 +01:00
Nabin Hait
2f493731ec
Fixed merge conflict
2018-03-12 15:49:59 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Shreya Shah
69d9f51dbb
if price list not found, set default selling/ buying price list from settings ( #13259 )
2018-03-12 11:15:49 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
tundebabzy
2970630ed2
Merge branch 'develop' into new-subscription
2018-03-12 02:00:34 +01:00
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3
...
sort by name accounts for trial balance.
2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975
sort by name accounts
2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1
sort by name accounts
2018-03-09 15:22:20 +05:30
tundebabzy
3d26003c1f
add column breaks to Subscription
2018-03-09 09:37:06 +01:00
tundebabzy
8889b70ba1
Merge branch 'develop' into new-subscription
2018-03-09 09:10:48 +01:00
Achilles Rasquinha
b4de7e3d07
removed has_key, used pythonic in ( #13236 )
...
* removed has_key, used pythonic in
* Update bom.py
2018-03-09 12:35:47 +05:30
tundebabzy
e69747ca6d
[Feature Request] Add Payment Mode field on Payment Terms Template #13117 ( #13243 )
...
* add mode of payment field to Payment Term
* add mode of payment field to Payment Terms Template Detail
* add mode of payment field to Payment Schedule
* add mode of payment in `get_payment_term_details`
2018-03-09 12:23:53 +05:30
rohitwaghchaure
acd3479269
Bank POS transactions in bank reconciliation ( #13225 )
2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82
[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile ( #13233 )
2018-03-08 16:21:13 +05:30
Achilles Rasquinha
908289d40a
[FIX] filter to list
2018-03-08 13:10:51 +05:30
Achilles Rasquinha
9050998e06
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:55:41 +05:30
tundebabzy
1643cce479
fetch journal entry details ( #13218 )
2018-03-08 11:17:17 +05:30
rohitwaghchaure
bbd9b71547
Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item ( #13043 )
2018-03-07 15:39:40 +05:30
Nabin Hait
c50d7446b5
Merge branch 'master' into develop
2018-03-07 13:09:07 +05:30
Saurabh
a65b28772f
[fix] setup_party_account_field on init
2018-03-06 18:22:01 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
tundebabzy
458a1fe61a
codacy
2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00
codacy
2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47
codacy tinzz
2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68
codacy tinzz
2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9
more tests and bug fixes
2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7
fix proration logic to reduce possibility of rounding errors
2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5
enhancement: do nothing if cancel_sbscription is called for cancelled subscription
2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e
enhancement: ensure subscription is cancelled before attempting to restart
2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343
codacy review
2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572
Merge branch 'develop' into new-subscription
2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d
clean up
2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4
more tests
2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205
prorate invoice when cancelling subscription
2018-03-02 10:16:42 +01:00
tundebabzy
16afa8765e
tiny refactor of invoice setting logic
2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43
fix: apply_discount_on field should be of type Select not Data
2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827
make sure default apply_discount_on is set when creating invoice
2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99
fix: task should explicitly call commit and rollback if error
2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e
docstrings
2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c
hook to hourly scheduler
2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a
fix test
2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494
update tests and more tweaks
2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1
update start date alone after restarting subscription
2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383
set initial invoice period based on subscription start
2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce
freeze screen while waiting for updates on subscription
2018-03-01 08:45:56 +01:00
tundebabzy
328adedbc8
adds start field to record subscrption start date
2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe ( #13130 )
...
* editable unallocated amount in payment entry to handle multi currency
* set unallocated amount on server side
* some minor fixes
* Fixes in territory patch
* removed print
* minor fixes
2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55
[Fix] Sales invoice email prompt not working
2018-03-01 13:06:01 +05:30
Charles-Henri Decultot
bc7a549fdb
Gocardless integration ( #13008 )
...
* GoCardless integration
* Addition of a method for determining if the email should be sent or not
* Correction for Tests
* Codacy fix
* Documents moved to ERPNext
* Codacy fix
* Codacy fixes
* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
tundebabzy
d9fec69a70
update test case, fix bugs
2018-03-01 05:34:02 +01:00
tundebabzy
8f37926ca8
add ability to cancel, restart and refresh subscription
2018-03-01 04:57:23 +01:00
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
tundebabzy
2cccad0274
more tests and quick fix
2018-02-28 12:45:09 +01:00
tundebabzy
a5bc057ad4
adds missing 'translatability'
2018-02-28 12:24:16 +01:00
tundebabzy
86ee455cbc
more tests and bug fix
2018-02-28 12:21:08 +01:00
tundebabzy
b3d5777e55
more test cases and bug fixes
2018-02-28 12:11:19 +01:00
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix ( #13127 )
2018-02-28 12:53:34 +05:30
tundebabzy
3aaf693abd
adds task -process
2018-02-28 05:12:18 +01:00
tundebabzy
95a4ca9429
update test cases
2018-02-27 18:09:06 +01:00
tundebabzy
9bf029a16e
generate new invoice only when current_invoice_end is past
2018-02-27 15:19:02 +01:00
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3
...
[FIX] sorting multiple compares
2018-02-27 19:48:25 +05:30
tundebabzy
45b6a1719f
refactor:
...
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
2018-02-27 15:14:19 +01:00
tundebabzy
c634ca8737
adds validation to billing_interval_count in Subscription Plan
2018-02-27 14:12:39 +01:00
tundebabzy
3c26a7e862
adjusts query so multiple plans can be used to create single invoice
2018-02-27 09:36:29 +01:00
tundebabzy
559d01e176
allows to rename subscription plan
2018-02-27 09:13:35 +01:00
tundebabzy
07313c281a
adds more assertions to test cases
2018-02-27 09:00:13 +01:00
tundebabzy
048bcbf080
more tests and code fixes
2018-02-26 22:17:06 +01:00
tundebabzy
b84e9519c2
Subscriptions doctype - subscriber should be set only once
2018-02-26 20:35:20 +01:00
tundebabzy
1ea5055967
fix another date comparison bug
2018-02-26 20:17:59 +01:00
tundebabzy
4d8175f9d9
adds test cases and fix resulting bugs
2018-02-26 18:56:05 +01:00
tundebabzy
cd700efc0b
only generate invoice after_insert if subscription is not in trial period
2018-02-26 16:26:36 +01:00
tundebabzy
0091c86e80
fix date comparison bug
2018-02-26 16:18:55 +01:00
tundebabzy
08a11b4d1f
sets default for days_until_due to 0
2018-02-26 16:13:45 +01:00
tundebabzy
d3fdcd9da5
set after_insert methods:
...
- if subscription is not in trial period, generate sales invoice
2018-02-26 16:10:47 +01:00
tundebabzy
b72aac6729
adds validation:
...
- ensure trial period dates are in order
2018-02-26 15:56:47 +01:00
tundebabzy
7a2c6df645
sets Subscription doc status in before_save
2018-02-26 15:55:32 +01:00
tundebabzy
3010996cc5
adds before_insert methods:
...
- set current_invoice_start
- set current_invoice_end
2018-02-26 15:51:32 +01:00
tundebabzy
35e92c7d29
removes start field from Subscriptions
2018-02-26 15:25:26 +01:00
tundebabzy
6e014331c5
removes end_date from Subscriptions doctype
2018-02-26 14:05:54 +01:00
tundebabzy
2b5298238e
adds prorate field to Subscription Settings
2018-02-26 13:58:29 +01:00
tundebabzy
2dee342501
Subscriptions doctype - trial start and end are set_only_once
2018-02-26 13:34:25 +01:00
tundebabzy
cbe4f5b6b3
changes to subscription settings
2018-02-26 11:22:53 +01:00
tundebabzy
066958a794
subscription_invoice doctype changes
2018-02-26 11:22:05 +01:00
tundebabzy
8457bb2c7e
change in Subscription Settings
2018-02-26 08:13:41 +01:00
tundebabzy
9016890ecf
adds Subscription Settings doctype
2018-02-26 06:15:31 +01:00
tundebabzy
988f5ca38b
hide trial_period_end and invoices if empty
2018-02-26 05:14:10 +01:00
tundebabzy
bbac07d9d2
use naming series for Subscriptions
2018-02-26 05:07:56 +01:00
tundebabzy
dda6234cab
remove subscription name and name by subscriber
2018-02-26 04:52:13 +01:00
tundebabzy
7c455ad4b6
display invoices section field only if there are invoices
2018-02-26 04:50:45 +01:00
tundebabzy
4ca5e81aa3
adds description for billing_interval_count in subscription plan
2018-02-26 04:47:19 +01:00
tundebabzy
4d31255d5c
customer field in Subscriber should be Link
2018-02-26 04:40:53 +01:00
tundebabzy
a07811b67f
adds new doctype - Subscriptions
...
- encapsulates subscription
- linked to a subscriber
- subscription can contain many plans
- contains history of generated invoices
2018-02-26 04:25:30 +01:00
tundebabzy
2581e2e5d7
New doctype - Subscription Plan:
...
- Plan is to be linked to a Product
- Plan will be used to create Invoice items
- Subscriber can have multiple plans
- Contains billing cycle information
2018-02-24 11:31:42 +01:00
tundebabzy
007919c03f
New doctype - Subscriber:
...
- Encapsulates a subscriber to a service or product
- Contains subscription specific information
2018-02-24 11:19:06 +01:00
Achilles Rasquinha
a3555aa7bd
[FIX] sorting multiple compares
2018-02-23 17:22:07 +05:30
Nabin Hait
7570774ebe
Merge branch 'master' into develop
2018-02-23 16:49:43 +05:30
Ameya Shenoy
82048cf3ce
verify payment entry amount is positive ( #13066 )
...
* verify payment entry amount is positive
* Update sales_invoice.py
* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb
[Fix] Item wise sales register report ( #13055 )
2018-02-23 16:25:30 +05:30
rohitwaghchaure
dd0fc1084e
[Fix] PDC amount, PDC print layout issue ( #13062 )
2018-02-23 16:20:46 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
tundebabzy
cad22dbe39
Cutomisable Cash Flow Reports ( #12969 )
...
* add child doctype - Cash Flow Mapping Account
* adds new doctype - Cash Flow Mapping
* adds new doctype - Cash Flow Mapper
* adds new doctype Cash Flow Mapping Template
* adds new doctype Cash Flow Mapping Template
* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper
* get cash_flow_accouts from Cash Flow Mapping
* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field
* changes description from 'Net Profit/Loss' to 'Profit for the year'
* set `net_profit_loss` `parent_account` properly
* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`
* remove zero rows
* de-duplicates row, summing similar accounts in the process
* makes gl sum calculation use `parent_account` as a condition
* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field
* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities
* add "Movement in working capital" subheader
* refactor code for readability
* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'
* allow `Cash Flow Mapping` to be renamable
* adds new field - `section_subtotal` useful for only Operating Activities
* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L
* calculates and shows tax paid adjustment in cash flow statement
* renames `is_interest_paid` to `is_finance_cost`
* - adds finance costs calculation
- correctly sets opening balance dates
* prevents users from selecting extra options in Cash Flow Mapping
* adds validation to prevent selecting multiple options
* adds new fields to Cash Flow Mapping
* calculate non cash p or l items (2nd pass)
* separates default cash flow generation from custom
* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report
* clean up
* removes mandatory constraint from accounts field
* allow rename, disallow create and delete
* adds patch to add default Cash Flow Mappers
* refactors custom_cashflow
* add article to explain configuration
* refactor
* further refactor
* final clean up (hopefully)
* clean up for codacy
* more codacy fixes
* more codacy fixes
* fix broken patch
* rename article to .md
* create default mappers after install
* PEP 8
* create the tables in `after_install` call
2018-02-22 11:08:36 +05:30
tundebabzy
27d558c9ef
Optionally allow overlap on Timesheet #12893 ( #13018 )
...
* give user option to ignore time overlap validation
* move settings to new Projects Settings
* clean up - remove trailing space
2018-02-22 11:05:49 +05:30
tundebabzy
637b242a34
Credit card default account should be debtors #12989 ( #13029 )
...
* allow receivable account type in mode of payment
* update `default_account` field description
2018-02-22 10:51:57 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
Pawan Mehta
244e235c48
Sales Payment Summary - fix for change amount ( #12981 )
...
* [fix] #12980
* apply change amount to cash
2018-02-20 12:15:10 +05:30
Shreya Shah
f718b0c0df
Currency filter in Pricing Rule ( #11776 )
...
* added currency filter
* modified files
* pull margin only if currency matches
* Renamed price to rate in pricing rule
* fetch rate only if currency matches
* rebase with develop
* rebase with develop
* patch to set currency in existing docs
* currency field mandatory in pricing rule
* modified test cases
* rebase with develop
* fixed test case
2018-02-20 11:26:46 +05:30
rohitwaghchaure
554f2de23d
Code cleanup online POS ( #12985 )
2018-02-20 11:18:01 +05:30
tundebabzy
6c5d7986ab
Outstanding Amount not getting updated in Payment Entry #12713 ( #12975 )
...
* allow to `set_missing_ref_details` by force
* update payment entry references during submit and cancel
2018-02-19 13:11:56 +05:30
Pawan Mehta
174a18399c
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-02-19 12:39:13 +05:30
Shreya Shah
093e7e6e98
Refactor Expense Claim ( #12883 )
...
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
Zarrar
441a1e1b8a
Validate Bank name in Setup wizard on the same slide ( #12968 )
...
* validate bank name before moving on to next slide
* Update setup_wizard.js
2018-02-16 14:44:42 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
cc98d40ff7
Payment reco auto allocation and maintain same order of records ( #12963 )
...
* Automatically allocate amount after selecting invoice against a payment entry
* codacy fixes
2018-02-16 13:14:20 +05:30
Vishal Dhayagude
1e0ae07bff
[fix] Validate Party in not present in Party Type ( #12910 )
...
* [fix] Validate Party in not present in Party Type
* [fix] Minor Changes
* [fix] Valid Customer and Supplier fetch
* [WIP] Allow and prevent for creating party
* [fix] minor changes
* [fix] Requested Changes
* [fix] Codacy issue
* Update opening_invoice_creation_tool.py
2018-02-16 13:13:37 +05:30
Shreya Shah
3a9eec2e92
Calculate due date in Purchase Invoice on the basis of Supplier invoice date ( #12913 )
...
* pass bill_date as parameter and calculate due_date on that basis
* calculate payment_schedule on the basis of bill_date if present else posting_date
* add bill_date as an argument to get_party_details
* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
rohitwaghchaure
103c4e9b92
[Fix] Incorrect rate in item-wise sales register ( #12943 )
2018-02-16 12:57:35 +05:30
Achilles Rasquinha
0bf19a1ac5
Merge pull request #12931 from achillesrasquinha/py3-iteritems
...
Py3 iteritems
2018-02-15 13:49:43 +05:30
Achilles Rasquinha
1697a7aa81
replaced string_types with basestring
2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
361366ebe6
Python 3 fixes. ( #12916 )
...
* Fixed iteritems and exceptions
* python3-fixes
* fixed iteritems
2018-02-14 17:08:59 +05:30
