nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-03 16:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,776 Commits 622 Branches 1,807 Tags
a9c5446b89a7c9dd15bb80d178263fbcf53f49f7
Commit Graph

38776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
François de Ryckel
5c400da4e2 Update training_result.js (#27615) 
cur_frm is deprecated
 2021-09-21 09:29:15 +05:30
Abdullah A. Zaqout
6d8e869a92 fix(pos): check if item exists before fetching available qty (#27581) 2021-09-20 21:35:37 +05:30
Anuja Pawar
190c2d84da fix: reference row added in allocation table (#27602) 2021-09-20 21:32:38 +05:30
Ankush Menat
4f01115f2f Merge pull request #27601 from ankush/overbill_warn 
fix(ux): warn when overbilling allowance was bypassed due to role
 2021-09-20 17:42:29 +05:30
Ankush Menat
21a955d20b fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753 refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.
 2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b fix: warn when overbilling checks are skipped. 2021-09-20 16:31:20 +05:30
Subin Tom
0ff7367f39 fix: Tax Breakup table headers fix (#27596) 2021-09-20 16:13:36 +05:30
Saqib
ef66beec51 fix(plaid): query to check if bank account exists 2021-09-20 15:33:29 +05:30
Ankush Menat
648b2d72a5 perf: extract loop invariant db calls 2021-09-20 15:27:12 +05:30
Deepesh Garg
f07ff92a35 fix: Improvements in COA Importer (#27584) 2021-09-20 11:12:39 +05:30
Frappe PR Bot
4f7af79c31 fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-18 13:34:27 +05:30
barredterra
17700a4413 refactor: remove redndant argument 2021-09-17 20:34:28 +02:00
barredterra
21366c748e refactor: tests 2021-09-17 20:34:09 +02:00
rohitwaghchaure
bf2a590332 fix: View Stock / Accounting Ledger button not showing in the stock entry (#27570) 2021-09-17 18:39:21 +05:30
barredterra
71e93b65cb feat: hide fields in print 2021-09-17 12:16:23 +02:00
barredterra
f9f2faf457 style: use double quotes 2021-09-17 12:03:02 +02:00
barredterra
ad1fad068e reafctor: validate instead of postprocess 2021-09-17 11:58:24 +02:00
barredterra
c8c10ef06b feat: company address query + style 2021-09-17 11:43:09 +02:00
Saqib
e03d9aa889 fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Subin Tom
d49346ac45 fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-17 10:39:03 +05:30
Marica
41f11eca72 fix: Remove duplicates from customer_code field (#27555) 2021-09-17 10:27:29 +05:30
barredterra
553a869bb2 Merge branch 'develop' into payments-based-dunning 2021-09-16 17:23:35 +02:00
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
Deepesh Garg
c9c8957250 feat: Merge POS invoices based on customer group (#27471) 
* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-16 19:33:57 +05:30
barredterra
08e53d90a5 refactor: doctype naming 
Overdue Payments -> Overdue Payment
 2021-09-16 14:09:32 +02:00
Saqib
5eba1ccd51 fix: no validation on item defaults (#27393) 
* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 17:31:37 +05:30
Ankush Menat
557d9516ff ci: comment about coverage after min. 3 builds (#27544) 
[skip ci]
 2021-09-16 17:17:10 +05:30
Marica
9b388883d3 fix: Validate if item exists on uploading items in stock reco (#27538) 
* fix: Validate if item exists on uploading items in stock reco

- Uploading non existent item in stock reco and then changing warehouse or batch gave an error
- Check for non existent item

* chore: translation

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-09-16 15:47:17 +05:30
Ankush Menat
78fe92542c fix(ProdPlan): Get SubAssy Items does not work (#27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched
 2021-09-16 15:34:50 +05:30
Rucha Mahabal
866763c16a fix(minor): Employee filter in Unpaid Expense Claims report (#27530) 2021-09-16 00:05:16 +05:30
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
rohitwaghchaure
e6a1ad8016 fix: not able to submit stock entry with 350 items (#27523) 2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e test: automated test for running all stock reports (#27510) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular
 2021-09-15 19:24:35 +05:30
Frappe PR Bot
29dab0699c fix(minor): Remove b2c limit check from CDNR Invoices (#27516) (#27520) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format

(cherry picked from commit 978028c880)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 19:12:02 +05:30
Noah Jacob
5e0b21582a fix: table data deleted on submitted maintenance schedule (#27513) 2021-09-15 17:37:52 +05:30
Frappe PR Bot
d4d5e2786f fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27478) 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive

(cherry picked from commit 10754831c3)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed feat: provision to add scrap item in job card (#27483) 2021-09-15 16:45:57 +05:30
Frappe PR Bot
6e7945fbb7 fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) (#27506) 
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343

* fix: Linting issues

* fix: remove unnecessary caching

[skip ci]


Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>

(cherry picked from commit 50fe23308a)
 2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920 fix: Autoname for customer and supplier (#27398) 2021-09-15 10:24:26 +05:30
Deepesh Garg
625626b973 fix: Values with same account and different account number in consolidated balance sheet report (#27493) 2021-09-15 10:10:54 +05:30
rohitwaghchaure
2e2985e4f1 fix: calculate operating cost based on BOM Quantity (#27464) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases
 2021-09-15 00:37:41 +05:30