Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,864 Commits 3 Branches 0 Tags 1 GiB
1b8d36634f
Commit Graph

6131 Commits

Author SHA1 Message Date
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format 2020-10-28 21:06:11 +05:30
Rohit Waghchaure
0fa741b267 added test cases 2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255 fix: Do not allow Company as accounting dimension 2020-10-28 17:15:14 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents (#23747) 2020-10-28 17:08:47 +05:30
Rohit Waghchaure
a248dfb9a5 fix: multiple pricing rules are not working on selling side 2020-10-28 16:22:49 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms 2020-10-27 18:40:20 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return 2020-10-27 15:34:51 +05:30
marination
fa085d7f4b fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt 2020-10-27 13:18:30 +05:30
Saqib
fa5fe18b70
fix error message 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-10-26 19:27:02 +05:30
Deepesh Garg
64a4437b48
Merge branch 'develop' into add-acc-to-a-group-fix 2020-10-26 18:41:32 +05:30
Afshan
3f971b2371 fix: copying po no when mapping doc 2020-10-26 16:59:57 +05:30
rohitwaghchaure
8ba05dc674
Merge branch 'develop' into skip-non-apply-tds-invoices-develop 2020-10-26 14:11:34 +05:30
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
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
Deepesh Garg
069a54e5c3 fix: Cancellation of accounting transactions within closed accounting period 2020-08-10 16:01:01 +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
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
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports (#22888) 2020-08-03 20:41:25 +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
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
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
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
8721530b4b
fix(payment-request): do not set guest as administrator (#22801) 2020-07-24 17:19:56 +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
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
2abd66da9d fix: Update journal entry account timesstamp 2020-06-24 17:49:50 +05:30
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