nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,674 Commits 464 Branches 1,752 Tags
eaadaf452a28bc120bbee441fc856285505f1696
Commit Graph

38674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
eaadaf452a feat: child table triggers calculation of totals 2021-09-16 17:22:46 +02:00
barredterra
c4f0a818ad feat: address display 2021-09-16 17:22:25 +02:00
barredterra
4a98c85dba feat: address and contact queries 2021-09-16 17:21:52 +02:00
barredterra
75df843c29 refactor: remove unnecessary code 2021-09-16 17:21:25 +02:00
barredterra
5f0140f02e feat: rework dunning backend 2021-09-16 16:42:51 +02:00
barredterra
7865ef82c1 feat: rework dunning frontend 2021-09-16 16:42:22 +02:00
barredterra
cc80528b91 feat: rework doctypes 2021-09-16 16:38:36 +02:00
barredterra
08e53d90a5 refactor: doctype naming 
Overdue Payments -> Overdue Payment
 2021-09-16 14:09:32 +02:00
barredterra
365c0ca92c feat: restructure dunning doctype 2021-09-15 19:16:09 +02:00
barredterra
ee1070bc94 feat: filter invoices 2021-09-15 19:15:53 +02:00
barredterra
5744c6e1c0 feat: Overdue Payments table 2021-09-15 19:15:31 +02:00
Saqib
a5baf909b7 fix: editable price list rate field in sales transactions (#27455) 2021-09-13 15:50:20 +05:30
Rucha Mahabal
bab644a249 fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test
 2021-09-13 13:24:27 +05:30
Saqib
7292f5476d feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54 fix(ux): apply proper filtering in stock reports (#27411) 
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2 fix(ux): clean invalid fields from variant setting (#27412) 2021-09-12 16:36:51 +05:30
Frappe PR Bot
a52d4c25ff fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) (#27436) 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-09-11 17:54:55 +05:30
Sagar Vora
dae0a1c1d6 fix: Template Error due to use of single quote (#27433) 2021-09-11 17:54:21 +05:30
Ankush Menat
62fc544280 test: basic tests for controllers/queries (#27422) 2021-09-10 12:46:35 +05:30
Suraj Shetty
3da34382b5 ci: Remove extra space 
🤦🏻‍♂️
 2021-09-10 10:18:41 +05:30
Suraj Shetty
333b83b583 ci: Ignore demo folder 
Coverage for the demo folder is not relevant... can be ignored
 2021-09-10 09:58:48 +05:30
Suraj Shetty
df913ac036 Merge pull request #27421 from surajshetty3416/enable-codecov 
ci: Use codecov for coverage reporting
 2021-09-10 09:51:44 +05:30
Suraj Shetty
629f5e1fdf chore: Add codecov badge 2021-09-10 08:21:01 +05:30
Suraj Shetty
86afece6ad ci: Add codecov configuration file 2021-09-10 08:14:43 +05:30
Suraj Shetty
1fc8fcc258 ci: Upload coverage report to codecov 2021-09-10 08:08:00 +05:30
Anuja Pawar
a58e309297 fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Subin Tom
8b4c57ee09 fix: pos payment mode selection issue (#27409) 2021-09-09 19:33:34 +05:30
Anupam Kumar
7edac5a5d7 fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +05:30
Noah Jacob
acdb10377f refactor: .doc missing and empty row on new doc (#27408) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const
 2021-09-09 18:54:00 +05:30
Ankush Menat
a40709a673 chore: remove obsolete file 
snyk has been removed, this file is not required anymore.
 2021-09-09 13:55:56 +05:30
Rushabh Mehta
95e440b537 Merge pull request #27406 from ankush/remove_snyk 
chore: remove snyk from devdependencies
 2021-09-09 13:07:52 +05:30
Ankush Menat
518f827d87 chore: remove snyk from devdependencies 2021-09-09 12:52:45 +05:30
Ankush Menat
678335f8ac fix: job card overlap unknown column jc.employee (#27403) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests
 2021-09-09 12:24:23 +05:30
dependabot[bot]
9670490a1d chore(deps): bump axios from 0.21.1 to 0.21.4 (#27402) 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

[skip ci]
 2021-09-09 12:21:47 +05:30
Deepesh Garg
9104796eb8 Merge pull request #27258 from deepeshgarg007/tds_validity 
feat: Validity dates in Tax Withholding Rates
 2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638 fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271 fix: Linting Issues 2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39 fix: Test Case 2021-09-09 11:13:29 +05:30
rohitwaghchaure
295020451f fix: added delivery date filters to get sales orders in production plan (#27367) 2021-09-08 19:28:30 +05:30
Alan
81d3524d27 fix: auto complete sales order rows in production plan (#27352) 
* fix: auto complete sales order rows in production plan

* fix: sider
 2021-09-08 16:48:42 +05:30
Saqib
9c27f9be1e fix: document naming rule not working for subscription invoices (#27386) 2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0 fix: General Ledger translation issues (#27298) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0 fix: scan barcode fields input length (#27389) 
* fix: undo unintentional changes

* fix: scan barcode fields input length
 2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-08 11:33:42 +05:30
Ankush Menat
5596988c94 ci: fix docs checker for wiki based docs (#27380) 2021-09-07 14:53:30 +05:30
Marica
61a1356109 fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358) 2021-09-07 14:42:17 +05:30
rohitwaghchaure
058d98342a fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) 
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-07 12:14:40 +05:30
Deepesh Garg
8f6d22b7ea Merge pull request #27373 from deepeshgarg007/gstin_filter_issue 
fix: GSTR-1 Reports not showing any data
 2021-09-07 11:09:14 +05:30
Deepesh Garg
6dfcc1e2ae fix: Remove print and debug 2021-09-07 11:08:30 +05:30
Deepesh Garg
e1f55df4d7 fix: GSTR-1 Reports not showing any data 2021-09-07 11:07:22 +05:30