Commit Graph

34084 Commits

Author SHA1 Message Date
Deepesh Garg
dd7a6d948c Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-11-19 11:27:38 +05:30
Deepesh Garg
ebdc8cee5b Merge pull request #23825 from igormbq/fix-demo
fix: location data on Asset to use command(make_demo)
2020-11-19 11:26:12 +05:30
Rucha Mahabal
14514f776b fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776)
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf feat: Formula based Quality Inspection (#23916)
* feat: Formula based Quality Inspection

* chore: Added Test for Formula Based QI reading
2020-11-19 08:12:58 +05:30
rohitwaghchaure
6e974bf246 Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue
fix: email digest user not found
2020-11-18 23:54:34 +05:30
Deepesh Garg
ad16bb4ec1 Merge pull request #23953 from vorasmit/fix-sez-dev
fix(regional): set proper state code in ewaybill JSON when GST category is SEZ
2020-11-18 21:51:49 +05:30
Smit Vora
bbe4933a52 fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ 2020-11-18 21:00:09 +05:30
pateljannat
188657d05a fix: email digest user not found 2020-11-18 17:15:54 +05:30
rohitwaghchaure
67ba0462e9 Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking
fix: Item price duplicate checking
2020-11-18 16:41:48 +05:30
pateljannat
410db04b48 fix: linter issue for translation syntax 2020-11-18 15:57:16 +05:30
Deepesh Garg
a0b17c4ef6 Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue
fix: correcting description field in taxes and charges for accounts with account number + account name
2020-11-18 15:31:25 +05:30
Deepesh Garg
81f6ef3e1a Merge pull request #23934 from Anurag810/memebership-fixes
fix: validation for membership
2020-11-18 15:25:24 +05:30
Deepesh Garg
f0187f6db2 Merge pull request #23447 from hasnain2808/UAE-VAT-Format
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
pateljannat
d0c528143f Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue 2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe fix: reversing previous commits and adding condition in regional controller 2020-11-18 12:51:13 +05:30
Saqib
d82b76fe0a fix: pos item search includes non stock items (#23914)
* fix: pos item search includes non stock items

* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Jannat Patel
96a0c17626 Merge branch 'develop' into place-of-supply-change-issue 2020-11-18 10:27:20 +05:30
Deepesh Garg
dc88d63f00 Merge pull request #23937 from deepeshgarg007/loan_application_link
fix: Loan application link on creating loan
2020-11-17 22:01:31 +05:30
Deepesh Garg
69232f8dd1 fix: Loan application link on creating loan 2020-11-17 22:00:41 +05:30
pateljannat
6b10d87d46 fix: place of supply change on address change 2020-11-17 20:34:51 +05:30
Anurag Mishra
3271437314 fix: Handle for custom field IFSC code in Bank remittance report. (#23905)
* fix: Handel for custom field IFSC code

* fix: changes_requested
2020-11-17 17:52:59 +05:30
Anurag Mishra
a77f2ba0de fix: validation for membership 2020-11-17 15:34:05 +05:30
Deepesh Garg
509e40a584 fix: Account filters 2020-11-17 13:52:46 +05:30
Deepesh Garg
cb80aaf707 fix: Disable filters after test 2020-11-17 13:52:38 +05:30
Deepesh Garg
0ce888ec08 fix: Linting and test cases 2020-11-17 13:16:44 +05:30
Deepesh Garg
4569c9b5e3 fix: Add test case 2020-11-17 13:16:36 +05:30
Deepesh Garg
e895ddc952 fix: Add disable and mandatory check for accounting dimension filters 2020-11-17 13:16:25 +05:30
Deepesh Garg
3a02fd9bda fix: GL Entry validation for dimensions 2020-11-17 13:16:14 +05:30
Deepesh Garg
fb4ad9042c fix: linting 2020-11-17 13:16:04 +05:30
Deepesh Garg
d2b44e90d6 fix: Remove project filter 2020-11-17 13:15:51 +05:30
Deepesh Garg
094328b8c9 fix: Remove cost center query from doctypes 2020-11-17 13:13:09 +05:30
Deepesh Garg
317a0495e2 fix: dimension filter query 2020-11-17 13:12:59 +05:30
Deepesh Garg
e3f9c5246e fix: dimension filter query 2020-11-17 13:12:50 +05:30
Deepesh Garg
c56d775541 feat: Add accounting dimension filter doctype 2020-11-17 13:12:40 +05:30
rohitwaghchaure
7aa60d1dea fix: stock ageing report not working (#23923) 2020-11-17 12:10:27 +05:30
Afshan
c72b693223 fix: Handle the "no leave_allocation found" case (#23922)
* fix: Handle the "no leave_allocation found" case

* fix: format of error msg
2020-11-17 12:08:31 +05:30
Marica
23614b650e fix: Don't copy terms and discount from SO to PO (#23903)
* fix: Dont copy terms, discount and required by from SO to PO

* fix: Let delivery date and required by date get mapped
2020-11-17 11:12:31 +05:30
Suraj Shetty
5e8b00207b fix: Typo (Enchashment > Encashment) (#23919) 2020-11-17 10:58:09 +05:30
pateljannat
642819b955 fix: place of supply change when address changes 2020-11-17 09:47:10 +05:30
Mohammad Hasnain
d2477e6cc5 fix(UAE VAT 201): remove branch parts 2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d feat(UAE VAT 201): emirate according to branch 2020-11-16 17:36:27 +05:30
Anurag Mishra
70816fdae8 Merge pull request #23897 from Anurag810/salary_slip_fixes
fix: added wrong absent days calculation in salary slip
2020-11-16 15:56:43 +05:30
Anurag Mishra
d6e6c51f37 Merge branch 'develop' into salary_slip_fixes 2020-11-16 15:56:22 +05:30
Anurag Mishra
17d5ce3e41 fix: payroll attendance error (#23887)
* fix: payroll attendance error

* fix: change query to frappe.get_all
2020-11-16 14:20:18 +05:30
Mohammad Hasnain
b8d0b546a7 feat(UAE VAT Format): use company address for emir 2020-11-16 12:58:38 +05:30
rohitwaghchaure
6094d66a6d Merge pull request #23636 from marination/item-price-pricing-rule-conflict
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-16 12:22:30 +05:30
Anurag Mishra
69be37f88d fix: Error handling in Upload Attendance (#23907) 2020-11-15 11:14:35 +05:30
Raffael Meyer
7178df8567 fix: improve UX of DATEV report (#23892)
* feat(DATEV Settings): button to show report

* feat(desk): add DATEV to Reports under Accounting

* fix(report DATEV): last calendar month as default

* fix: let user create DATEV Settings

(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Kenneth Sequeira
c5966d3d70 fix: make contract template editable (#23891) 2020-11-15 09:44:36 +05:30
rohitwaghchaure
1c8c1d78e9 fix: default cost center in item master not set in stock entry (#23877)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30