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

1561 Commits

Author SHA1 Message Date
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
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +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
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
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
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
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
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