Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,722 Commits 3 Branches 0 Tags 1 GiB
2bcda494b2
Commit Graph

1912 Commits

Author SHA1 Message Date
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
s-aga-r
53701c37b1 feat: consider over_order_allowance while validating sales order qty 2023-03-03 22:03:54 +05:30
s-aga-r
8bcbc45add feat: consider over_order_allowance while validating order qty 2023-03-03 11:11:33 +05:30
s-aga-r
f5937f46cb feat: add field Over Order Allowance (%) in Buying Settings 2023-03-02 17:04:09 +05:30
rohitwaghchaure
9bb8e351a2
Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports 
fix: default date in Subcontracting reports
 2023-02-28 18:01:14 +05:30
Rohit Waghchaure
dfddc4efc3 fix: default date in Subcontracting reports 2023-02-28 17:53:51 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
Rohit Waghchaure
8e86553717 test: added test cases 2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Devin Slauenwhite
c76352340d
fix(ux): customer/supplier docfield layout (#34125) 2023-02-19 11:37:32 +05:30
s-aga-r
d7ef5ad955 chore: add field show_pay_button in Buying Settings 2023-02-15 14:43:10 +05:30
barredterra
d5b7f2e49e test: download RFQ PDF 2023-02-14 19:53:39 +01:00
barredterra
8e40c04494 refactor: download RFQ PDF 2023-02-14 19:53:03 +01:00
barredterra
f7fd30fecf fix: change parameter name for letter head 
To match changes from https://github.com/frappe/frappe/pull/19627
 2023-02-14 19:34:36 +01:00
developsessions
c8cd351b39 style: apply results of lint run 2023-02-04 09:12:29 +01:00
developsessions
9d0096ad9e fix: failed test, convert date time to string 2023-02-03 21:21:43 +01:00
developsessions
be1f941996 fix: Add missing 1 required positional argument: 'bill_date' 2023-02-03 14:50:44 +01:00
developsessions
c80aaad437 style: lint wrong from position 2023-02-03 13:55:36 +01:00
developsessions
ce8a1086a7 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 2023-02-03 11:30:29 +01:00
barredterra
7156184933 feat: add incoterm named place to RFQ 2023-01-31 23:23:54 +01:00
Deepesh Garg
8abe0ce0ec
fix: Currency symbol for tax withholding net total field (#33850) 
* fix: Currency symbol for tax withholding net total field

* chore: Update display depends on property
 2023-01-29 17:08:11 +05:30
Deepesh Garg
3598bcc9a8
chore: ERPNext setup wizard cleanup (#33675) 
* chore: ERPNext setup wizard cleanup

* chore: Remove default website

* chore: Remove flaky tests

* chore: remove unwanted tests
 2023-01-27 14:40:39 +05:30
Sagar Vora
1f4fa90072
Revert "fix: use correct filter name in reports" 2023-01-25 16:19:44 +05:30
Daizy Modi
def759d2e8 fix: use correct filter name in reports 2023-01-25 15:57:39 +05:30
Rohit Waghchaure
2c83fff1a1 fix: don't add template item in sales/purchase transaction 2023-01-18 23:29:06 +05:30
s-aga-r
a0e2a93f3f chore: update error msgs for Subcontracted PO 2023-01-12 12:09:28 +05:30
Smit Vora
e0f5ecdad6
fix: RFQ emails not sent with pdf attachment (#33604) 2023-01-10 20:40:12 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries (#33481) 
* fix: Incorrect exchange rate in payment entries

* test: Update failing tests
 2023-01-10 20:12:43 +05:30
Rohit Waghchaure
d1d4671320 feat: provision to disable get last purchase rate 
fix: set_incoming_rate condition
 2023-01-09 18:10:52 +05:30
s-aga-r
6f5824cb21 fix: fg_item_qty in non-subcontracted PO 2022-12-28 14:54:24 +05:30
s-aga-r
7e1b6b3c2a fix: shipping_address in PO 2022-12-25 18:11:05 +05:30
Deepesh Garg
ff48634cbb Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow 2022-12-20 11:42:15 +05:30
Deepesh Garg
0e86cde64b
Merge branch 'develop' into print-rfq 2022-12-16 16:24:02 +05:30
Deepesh Garg
dc178984ae fix: Payment Request flow fixes from Order to Payment Entry 2022-12-15 14:15:20 +05:30
barredterra
8717148d9b feat: improve visibility of default values 2022-12-14 14:14:29 +01:00
barredterra
ce9626fead feat: more control when printing RFQ 2022-12-14 14:03:36 +01:00
barredterra
e057e1dfe7 feat: incoterm named place 2022-12-12 18:49:47 +01:00
Ankush Menat
915e0347b0
chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
s-aga-r
ca0485a503 fix: add company filter in RFQ Items 2022-11-30 10:03:36 +05:30
Deepesh Garg
3eb1ed19a1 fix: Tax withholding net total for PI in reports 2022-11-29 13:10:31 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms 2022-11-25 16:50:55 +01:00
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order 
feat: item wise tds in purchase order
 2022-11-23 09:52:00 +05:30
ruthra kumar
541cf153f7 test: fix test case for SO/PO advance amount 2022-11-22 12:33:29 +05:30
niralisatapara
b9d0b4e2d3 feat: item wise tds in purchase order 2022-11-21 15:43:03 +05:30
barredterra
77105306f2 feat: add incoterm to purchasing transactions 2022-11-17 22:18:26 +01:00
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer 2022-11-17 16:42:18 +05:30
Sagar Sharma
1349d24514
Merge branch 'develop' into purchase-order/internal-supplier 2022-11-17 14:08:07 +05:30
Ankush Menat
34e4903ed7
refactor: search queries (#33004) 
- guard clauses for readability
- use values or format
 2022-11-17 13:04:42 +05:30
s-aga-r
5efbc2cbf8 fix: make is_internal_supplier read-only 2022-11-17 12:36:44 +05:30
Vishal
e5dfd53e6f chore: minor fix 2022-11-16 14:25:35 +05:30
Vishal
ba6189d054 fix: minor change 2022-11-16 13:58:29 +05:30
Vishal
343b414b40 fix: test case updated for mr 2022-11-16 13:53:21 +05:30
Vishal
89aabdaaaa fix: test case added for MR internal Transfer 2022-11-16 13:53:21 +05:30
Deepesh Garg
8f65677cb4
Merge pull request #32912 from nabinhait/customer-supplier-tab-break 
fix(ux): Tab break in Customer and Supplier form
 2022-11-10 18:30:14 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914) 
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
 2022-11-09 20:09:06 +05:30
Nabin Hait
fb7ee301b5 fix(ux): Tab break in Customer and Supplier form 2022-11-09 18:03:23 +05:30
Rohit Waghchaure
b0fc568c80 fix: not able to select customer / supplier 2022-11-03 11:24:58 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po 
fix: update advance paid in SO/PO from Payment Ledger
 2022-11-02 16:27:56 +05:30
ruthra kumar
1a0a8ac7e2 test: PO advance paid on payment submission and cancellation 2022-11-02 15:53:52 +05:30
ruthra kumar
81d791eea0 test: refactor use @change_settings decorator when possible 2022-11-02 15:40:56 +05:30
Deepesh Garg
92f37ca111 fix: Reset advance paid amount on Oreder cancel and amend 2022-10-31 19:01:54 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse 
fix: Add condition for discount section collapse
 2022-10-28 11:24:25 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30
Rohit Waghchaure
5f84993bae test: added test case to validate seachfields for customer, supplier 2022-10-24 16:10:47 +05:30
Sagar Sharma
682fb171cb
Merge branch 'develop' into refactor/buying/reports 2022-10-16 11:50:31 +05:30
Deepesh Garg
fd49503ba2 fix: Party account for multi-order invoices 2022-10-13 15:08:34 +05:30
Sagar Sharma
a161048a9d
Merge branch 'develop' into refactor/buying/reports 2022-10-12 00:38:37 +05:30
Nabin Hait
e71c417f7e fix: minor cleanup 2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
Nabin Hait
3d9263bf86 feat: Tab Break in Supplier Quotation 2022-10-11 13:18:21 +05:30