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

5083 Commits

Author SHA1 Message Date
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
![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif)

Corrected
![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif)
 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