nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,844 Commits 463 Branches 1,752 Tags
d3669443b16851dbc834cedbed04edd13950bbef
Commit Graph

38844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
escix
dafe99b6e2 fix: holiday message reminder 
Minor grammatical change
 2021-09-26 11:09:13 +05:30
barredterra
25708b36c3 feat: change make_gl_entries to work with new data structure 2021-09-23 20:14:45 +02:00
barredterra
353db2f612 refactor: rename interest_amount to interest, dunning_level 2021-09-23 20:13:52 +02:00
barredterra
b1e114cd5a feat: currency section , debit_to, base_dunning_amount 2021-09-23 20:09:53 +02:00
barredterra
c53ea11abb refactor: validate totals 2021-09-23 20:04:34 +02:00
Sagar Vora
c8b9a55e96 feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
Frappe PR Bot
2af6ea68ae fix: remove unknown field employee_name from query (bp #27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-09-21 20:33:09 +05:30
Ankush Menat
c302c7ab42 fix: remove bad default for anniversary reminders (#27632) 
🤦
 2021-09-21 17:51:46 +05:30
Marica
9110223341 fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) 
- Set subassemply WO's planned start date from Production Plan
 2021-09-21 16:50:14 +05:30
Kenneth Sequeira
abded895f3 fix: update default KSA VAT rate for setup (#27614) 2021-09-21 10:58:18 +05:30
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
Shariq Ansari
3e8e6ac4e2 fix: Creating unique hash for slider id instead of slider name 2021-09-20 20:52:08 +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
ChillarAnand
aa580769a6 chore: Code clean up 2021-09-20 15:27:43 +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