Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,422 Commits 3 Branches 0 Tags 1 GiB
df840cca75
Commit Graph

45422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
df840cca75 refactor: validate totals 2023-06-14 12:54:01 +05:30
barredterra
24e7a21839 refactor: remove redndant argument 2023-06-14 12:54:00 +05:30
barredterra
f143fe7dcc refactor: tests 2023-06-14 12:53:56 +05:30
barredterra
676ed6b881 feat: hide fields in print 2023-06-14 12:50:57 +05:30
barredterra
043066a2c8 style: use double quotes 2023-06-14 12:50:41 +05:30
barredterra
938f7d2266 reafctor: validate instead of postprocess 2023-06-14 12:42:21 +05:30
barredterra
9016baddca feat: company address query + style 2023-06-14 12:42:21 +05:30
barredterra
b07620aacf feat: child table triggers calculation of totals 2023-06-14 12:42:20 +05:30
barredterra
b186f8e9d7 feat: address display 2023-06-14 12:42:17 +05:30
barredterra
db47e1b69c feat: address and contact queries 2023-06-14 12:42:02 +05:30
barredterra
4f51dfe4c5 refactor: remove unnecessary code 2023-06-14 12:42:02 +05:30
barredterra
2d0dadd9ac feat: rework dunning backend 2023-06-14 12:41:59 +05:30
barredterra
2ee919220a feat: rework dunning frontend 2023-06-14 12:37:58 +05:30
barredterra
8976e94a1d feat: rework doctypes 2023-06-14 12:37:55 +05:30
barredterra
86a8b0b30f refactor: doctype naming 
Overdue Payments -> Overdue Payment
 2023-06-14 12:37:31 +05:30
barredterra
487c6018bf feat: restructure dunning doctype 2023-06-14 12:37:02 +05:30
barredterra
e7705327f0 feat: filter invoices 2023-06-14 12:35:30 +05:30
barredterra
e5b57ec965 feat: Overdue Payments table 2023-06-14 12:35:29 +05:30
Deepesh Garg
984f89d274
fix: Validation for delivery date in Sales Order (#35597) 
* fix: Validation for delivery date in Sales Order

* chore: update utils

* chore: revert

* chore: Add default delivery date
 2023-06-13 21:35:52 +05:30
Deepesh Garg
937c0feefe
fix: Lower deduction certificate not getting applied (#35667) 2023-06-13 20:06:36 +05:30
Anand Baburajan
491a50a027
fix: make showing taxes as table in print configurable (#35672) 2023-06-13 19:42:56 +05:30
Hossein Yousefian
9f669d4c2f
Stock aging report fix when called in dashboard chart (#35671) 
fix: get_range_age conditions fixed

see https://github.com/frappe/erpnext/issues/35669
 2023-06-13 19:20:07 +05:30
Devin Slauenwhite
20de27d480
fix(accounts): validate payment entry references with latest data. (#31166) 
* test: payment entry over allocation.

* fix: validate allocated_amount against latest outstanding amount.

* fix: payment entry get outstanding documents for advance payments

* fix: only fetch latest outstanding_amount.

* fix: throw if reference is allocated

* test: throw error if a reference has been partially allocated after inital creation.

* chore: test name

* fix: remove unused part of test

* chore: linter

* chore: more user friendly error messages

* fix: only validate outstanding amount if partly paid and don't filter by cost center

* chore: minor refactor for doc.cost_center

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-13 19:06:53 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
ruthra kumar
b43e068852
Merge pull request #35659 from ruthra-kumar/fix_attribute_error_in_payment_reconciliation 
fix: attribute error on payment reconciliation tool
 2023-06-13 10:16:26 +05:30
ruthra kumar
b672616617
Merge pull request #35620 from ruthra-kumar/err_higher_allowance_for_debit_credit_diff 
fix: allow custom rounding loss allowance in Exchange Rate Revaluation
 2023-06-13 09:46:08 +05:30
ruthra kumar
bada5796fa fix: attribute error on payment reconciliation tool 2023-06-13 09:32:24 +05:30
rohitwaghchaure
4ee08b92ae
Merge pull request #35629 from rohitwaghchaure/fixed-process-loss-in-job-card 
fix: added process loss in job card
 2023-06-12 23:29:15 +05:30
ruthra kumar
96a0132501 fix: allow user to set rounding loss allowance for accounts balance 2023-06-12 22:05:08 +05:30
Ankush Menat
f957a84830
build!: update deps and drop setup.py (#35653) 2023-06-12 21:46:06 +05:30
rohitwaghchaure
64586187de
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 21:39:29 +05:30
rohitwaghchaure
62011410b2
fix: test case PyPDF2 (#35652) 
fix: test case
 2023-06-12 19:22:55 +05:30
Ankush Menat
1e8ee9354a
fix(DX): Check Frappe and ERPNext major versions (#35651) 2023-06-12 19:20:52 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 19:04:19 +05:30
mergify[bot]
4f3d531f35
fix: don't set default payment amount in case of invoice return (backport #35645) (#35647) 
fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc90eb71fa82d645b2cf54d9731502cf6c7)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-12 18:43:26 +05:30
Sagar Sharma
f1e902be5c
Merge pull request #35646 from s-aga-r/FIX-ISS-23-24-01138-1 
fix: Stock Reconciliation document update while reposting
 2023-06-12 18:42:34 +05:30
s-aga-r
db159dd11f fix: Stock Reconciliation document update while reposting 2023-06-12 18:28:16 +05:30
Rohit Waghchaure
0382eecff4 fix: test case 2023-06-12 18:20:38 +05:30
ruthra kumar
42f4f80e0c
fix: Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report (#35642) 
* fix: payment against credit note should be linked to parent invoice

* test: AR/AP report for payment against cr note scenario

* fix: cr_note shows up as outstanding invoice

Payment made against cr_note causes it be reported as outstanding invoice
 2023-06-12 17:35:13 +05:30
Deepesh Garg
2f24546b21
fix: Make difference entry button not working (#35622) 2023-06-12 15:20:28 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
ruthra kumar
dcbd7d5f1f
fix: incorrect TCS amount while customer has advance payment (#35397) 
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation
 2023-06-10 20:55:30 +05:30
Rohit Waghchaure
e9a6191af9 fix: added process loss in job card 2023-06-09 20:33:46 +05:30
Sagar Sharma
e3802d1c3f
Merge pull request #35618 from s-aga-r/FIX-SBB-SERIAL-NO-QTY 
fix: reset entries qty to `1` for serial item
 2023-06-09 13:01:01 +05:30
Anand Baburajan
7bd369c49b
fix: calculate wdv depr schedule properly for existing assets [dev] (#35614) 
* fix: calculate wdv depr schedule properly for existing assets

* fix: calculate wdv depr schedule properly for existing assets properly

* chore: properly call _get_pro_rata_amt
 2023-06-09 12:53:10 +05:30
s-aga-r
b5c5a90f71 fix(ux): set warehouse for new row 2023-06-09 12:22:24 +05:30
s-aga-r
1f28ca717e fix(ux): set entries qty to 1 before making the field read-only 2023-06-09 12:06:46 +05:30
s-aga-r
1d904c0a86 fix(ux): make qty field read-only for serial item 2023-06-09 12:05:02 +05:30
Sagar Sharma
9a819103a7
Merge pull request #35617 from s-aga-r/FIX-CBAL-TypeError 
fix: `TypeError` in Closing Stock Balance
 2023-06-09 11:36:20 +05:30
s-aga-r
93e3fe8445 fix: reset entries qty to 1 for serial item 2023-06-09 11:10:47 +05:30