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

1881 Commits

Author SHA1 Message Date
Deepesh Garg
829387c2bc
Merge pull request #36360 from deepeshgarg007/fy_default_dates 
fix: Default year start and end dates in reports
 2023-07-27 22:35:35 +05:30
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat 
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
 2023-07-27 21:18:03 +05:30
Deepesh Garg
2341061852 fix: Default year start and end date in reports 2023-07-27 21:03:32 +05:30
Deepesh Garg
4496a6760e fix: Default year start and end dates in reports 2023-07-27 20:54:55 +05:30
Deepesh Garg
cf50bb45ad
Revert "fix: Default year start and end dates in reports" 2023-07-27 19:13:11 +05:30
Deepesh Garg
5dc8195d91
Merge pull request #36249 from deepeshgarg007/default_dates 
fix: Default year start and end dates in reports
 2023-07-27 12:19:44 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
Deepesh Garg
4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents 2023-07-24 12:29:57 +05:30
Deepesh Garg
3c92686f0a fix: Default year start and end dates in reports 2023-07-24 11:58:16 +05:30
Deepesh Garg
8ccb8e3c5b chore: Move buying controller to utils 2023-07-23 18:50:44 +05:30
Deepesh Garg
4077254b01 chore: resolve undefined variables issue 2023-07-22 23:07:18 +05:30
Deepesh Garg
3759a41b83 fix: Default fiscal year in accounting, buying and sellingcharts 2023-07-19 13:17:12 +05:30
Deepesh Garg
9e791efc82 refactor: client side accounts controller 2023-07-17 21:44:43 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
Vishnu VS
e05b33a6c2
feat: add method for ordered quantity in supplier scorecard (#35930) 
fix: add method for getting ordered quantity in the supplier scorecard variable.

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
 2023-07-03 09:23:27 +05:30
Deepesh Garg
0408b6d655 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-29 12:19:42 +05:30
Gursheen Kaur Anand
5113a417a1
fix!: UX of supplier linking with supplier users on portal pages (#35836) 
* fix: create and add Portal Users child table in Supplier/Customer

Issue #35772

* fix: modify the original permission check hook

* fix: auto-add role for portal users

* fix: added patch for auto-populating portal users

* fix: modify patch to fetch users correctly

* fix: remove unnecessary code for updating naming_series

* fix(UX): show portal user in list view

Also split columns to reduce whitespace.

* refactor: simpler role checking

* fix: consider parenttype while fetching portal user

* refactor: simpler code, rename variable

* test: supplier portal user can access their docs

* refactor: only add role if not added

* refactor: rename and move patch to supplier

* refactor: dont add role if no perm or existing doc

* fix: add role before save

* refactor: run query directly

* refactor: split patch and apply roles

- if role isn't present dont add portal user
- ignore failure as it's not critical

* test: fix permission creation for webform test

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-06-28 11:22:40 +05:30
s-aga-r
3a00bf83d6 fix(ux): PO Get Items From Open Material Requests 2023-06-27 11:55:45 +05:30
Deepesh Garg
da6bc1a13e refactor: Redo workflows 2023-06-23 20:57:51 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting 
chore: remove whitelisting for methods not accessed from UI
 2023-06-20 20:29:49 +05:30
Deepesh Garg
98cfea6f63 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-20 13:26:14 +05:30
Deepesh Garg
7ec9d76545 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 09:48:01 +05:30
Raffael Meyer
51848ee9d7
Merge branch 'develop' into bank-trans-party-automatch 2023-06-15 16:36:17 +02:00
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
Gursheen Anand
17341adf1c fix: calculate outstanding amount on reconcile correctly 2023-06-13 15:00:46 +05:30
Gursheen Anand
7591f1010b fix: Make get party account method return a list instead of a single default account. 2023-06-12 11:06:03 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30
Gursheen Anand
4ee163742a fix: Using one field for both advance liability accounts 2023-06-08 13:15:23 +05:30
DaizyModi
5155d5bfb2 chore: remove whitelisting for methods not accessed from UI 2023-06-07 12:05:17 +05:30
Gursheen Anand
74619269f0 feat: Record Advance Payments as Liability 
Ability to let user record advance payments as liability instead of a negative asset.

Issue #34282
 2023-06-02 17:13:51 +05:30
Raffael Meyer
09872301bd
Merge branch 'develop' into bank-trans-party-automatch 2023-06-01 18:03:10 +02:00
Nabin Hait
243c49c550 refactor: Workspace cleanup 2023-05-30 13:17:59 +05:30
Gursheen Kaur Anand
c1f1a033c9
fix: tab-uniformity (#35400) 
Made Doctype tabs uniform

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-05-24 12:45:00 +05:30
Marica
6fe5264ae2
Merge branch 'develop' into bank-trans-party-automatch 2023-05-18 12:57:58 +05:30
marination
dbf7a479b6 fix: Use existing bank fields to match by bank account no/IBAN 
- Remove newly added fields in Party doctypes to store bank details
- Use Bank Account's fields to match against account no/iban
- For employee, if Bank Account does not exist, find in Employee doctype against account no/iban
 2023-05-09 20:47:14 +05:30
Rohit Waghchaure
15f5f98858 fix: error regarding accepted and supplier warehouse 2023-05-07 20:27:17 +05:30
Solufy Solution
f1acc5fabb
fix: Bulk Payment Entry from PO/SO (#34942) 
Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com>
 2023-04-25 19:16:30 +05:30
Marica
88647c63ba
Merge branch 'develop' into bank-trans-party-automatch 2023-04-24 12:13:12 +05:30
s-aga-r
c9418aab45 chore: add items field label 2023-04-14 16:57:14 +05:30
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss 
fix: Allocate tax loss to tax account head on early payment discount
 2023-04-01 18:49:02 +05:30
marination
ad31e02616 feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder) 2023-04-04 11:45:37 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewd from Customer/Supplier master
 2023-03-28 15:36:16 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss 2023-03-28 15:01:28 +05:30
Raffael Meyer
f7bf1b8a0c
fix: unset address and contact on trash (#34495) 
* fix(Customer): unset address and contact on trash

* fix(Supplier): unset address and contact on trash

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-03-23 11:52:32 +05:30
Marica
c5da7f5fb1
Merge branch 'develop' into early-payment-loss 2023-03-21 11:40:30 +05:30
Deepesh Garg
fc86a8568f
fix: Supplier RFQ email link (#34338) 2023-03-19 18:09:18 +05:30
marination
d6d0163514 fix: Provision to apply early payment discount if payment is recorded late 
- Party could have paid on time but payment is recorded late
- Prompt for reference date so that discount is applied while mapping
- Prompt only if discount in payment schedule of valid doctypes
- test: Reference date and impact on PE
- `make_payment_entry` (JS) must be able to access `this`
 2023-03-14 14:22:39 +05:30