schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,569 Commits 322 Branches 1,581 Tags
72c22a4219ec1d74968ab5a62d31c7f25bf1aec0
Commit Graph

512 Commits

Author SHA1 Message Date
Ankush Menat
684ca451d3 fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 21a955d20b)
 2021-09-20 12:13:37 +00:00
Ankush Menat
8cdd6eacdd refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.

(cherry picked from commit 5e4fbba753)
 2021-09-20 12:13:37 +00:00
Ankush Menat
2dc590c0c0 fix: warn when overbilling checks are skipped. 
(cherry picked from commit 43bf82b58b)
 2021-09-20 12:13:36 +00:00
Ankush Menat
55393d160d perf: extract loop invariant db calls 
(cherry picked from commit 648b2d72a5)
 2021-09-20 12:13:36 +00:00
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Anuja Pawar
d81e837667 refactor: payment reconciliation tool (#27284) 2021-09-01 15:20:37 +05:30
skjbulcher
a1e5a64a66 fix: payment terms on Sales Order when Invoice Portion field is empty 2021-08-31 18:24:12 +05:30
Saqib Ansari
970e5af051 fix: cost center & naming series 2021-08-26 13:04:38 +05:30
Saqib Ansari
fb6af0481c perf: reduce number of queries to get party link 2021-08-26 13:04:31 +05:30
Saqib Ansari
2cb8cc525c feat: auto create advance entry on invoice submission 2021-08-26 13:01:21 +05:30
Deepesh Garg
74073ddc85 fix: Ignore due date validations if payment terms are copied from orders/receipts (#27120) 2021-08-24 21:56:49 +05:30
Frappe PR Bot
1e3a6a8a98 fix: discard empty rows from update items (#27021) (#27095) 
(cherry picked from commit 6de7b8ea93)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-24 12:20:51 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
77ad668a6f fix: date_unchanged calculation in "Update Items" (#26992) (#27010) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 12:32:59 +00:00
Frappe PR Bot
1a39d1a311 fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Deepesh Garg
9b561ea839 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13 2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b Merge pull request #26723 from GangaManoj/backport-po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-10 10:34:39 +05:30
Frappe PR Bot
0ff9ef673c fix: add parameter for db insert while adding item tax (#26855) (#26858) 
(cherry picked from commit b3bbebd27c)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-09 17:58:18 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
GangaManoj
5c21eea13d fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-05 21:50:09 +05:30
GangaManoj
e4a07d8ff3 fix: Stop fetching amount while fetching Payment Terms 2021-08-05 21:42:09 +05:30
GangaManoj
f99696b75d fix: Condition for fetching Payment Terms from Sales/Purchase Orders 2021-08-02 23:15:44 +05:30
Saqib
2d6f2fea5b fix: gl entries for exchange gain loss (#26728) 2021-07-30 10:55:53 +05:30
GangaManoj
01ab63189a fix: Check if Purchase Order has Payment Terms Template 2021-07-29 19:28:14 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
Deepesh Garg
1c9e516092 fix: GL Entries for discount amount with item qty greater than 1 2021-07-28 11:38:44 +05:30
Subin Tom
06fb0b93b5 fix: Supplier invoice importer fix v13 (#26633) 
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-26 16:46:47 +05:30
Deepesh Garg
5a06019440 fix: GL For taxes if discount applied on Grand Total 2021-07-21 15:25:40 +05:30
GangaManoj
566e8f8499 fix: Create GL Entries for Additional Discount Account 2021-07-21 14:26:51 +05:30
Ganga Manoj
f421dc7ca7 fix: GL Entry creation 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-21 14:24:21 +05:30
Ganga Manoj
e7e9bda123 fix: Use the item's project instead of the invoice's 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-21 14:24:21 +05:30
Ganga Manoj
b4a8bc8e4c fix: Use the item's cost centre instead of the Invoice's 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-21 14:24:21 +05:30
GangaManoj
99cb89f449 fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice 2021-07-21 14:23:53 +05:30
GangaManoj
9dd2a9e897 fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-21 14:23:52 +05:30
GangaManoj
38327fc177 fix: Make additional GL Entries for discount applied on taxes 2021-07-21 14:23:52 +05:30
GangaManoj
fd2852e87e fix: Create common function for discount accounting 2021-07-21 14:23:15 +05:30
Deepesh Garg
4a2e4748ac fix: Unallocated amount for inclusive charges 2021-07-13 11:22:55 +05:30
Saqib
7fb64d1645 fix: exchange gain loss not set for advances linked with invoices (#26436) 2021-07-12 18:33:16 +05:30
Afshan
7fd44907ba feat: fetching of qty as per received qty from PR to PI (#26184) 2021-06-24 14:26:36 +05:30
Deepesh Garg
4cd0f6ce23 fix: Revert unintended changes 2021-06-14 20:01:04 +05:30
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Ankush Menat
a9c84f749a perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30