1620 Commits

Author SHA1 Message Date
Gursheen Anand
6df125a05f feat: proprietorship & partnership options in entity type
(cherry picked from commit ed2457bddfaedc83301a96f9d77b093b36d15a72)
2023-11-01 08:40:20 +00:00
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724)
* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea33a320497d2de3253ca0e1bb061a07130f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-10-27 18:54:43 +05:30
mergify[bot]
2f5d991225
refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`

(cherry picked from commit 8ffa2bfe25d8fae317d77705aec82a92dc269874)

* chore: patch to rename field `over_order_allowance`

(cherry picked from commit fcfcf6957e07ad5afc281e5f43154ca1170e14c4)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-25 14:58:01 +05:30
mergify[bot]
da5bf501eb
feat: auto reserve stock for Sales Order on purchase (backport #37603) (#37648)
* chore: make `Reserve Stock` checkbox visible in SO

(cherry picked from commit 36a996d70499a8bc4cf9c28853c2b5606d73f81d)

* refactor: rename field `Auto Reserve Stock for Sales Order`

(cherry picked from commit 2b4fa98941817966b8a936e4076be84406ad035a)

* feat: add fields to hold SO and SO Item ref in PR Item

(cherry picked from commit 188175be84b5eaa0be73face69f4f2b58b80dd64)

* feat: reserve stock for SO on PR submission

(cherry picked from commit 64497c922892d19ca378b5da75cf6b528f5e52d9)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* feat: add field `From Voucher Type` in SRE

(cherry picked from commit 5ae9c2f62b741d64da4ce74b3b251339711e8256)

* refactor: rename field `against_pick_list_item`

(cherry picked from commit 78fe56741931ad2c253bf9acca2896c2411f4ac6)

* refactor: rename field `against_pick_list`

(cherry picked from commit 961d2d9926a1a9c0396c3292d431d3bad6865e62)

* fix: incorrect serial and batch get reserved

(cherry picked from commit 45395027d3b5c51ac3ccdbebb1f0d23d5ffd2ec1)

* fix: partial reservation against SBB

(cherry picked from commit 4f363f5bf3da286999966f10d0cca22264f42199)

* fix: ignore qty msg if From Voucher is set

(cherry picked from commit a432290a828478265a8a463d05aea818c2b75914)

* test: add test case for auto-reservation from PR

(cherry picked from commit adf313a6d3308f957b4876574e455ca750b22106)

* chore: add SRE link in PR Connections

(cherry picked from commit 24788ddcc085fb825d2b14145a82ced02842f512)

* chore: patch to update `From Voucher` details

(cherry picked from commit 6942ab10125cfaf07c526df53a7c88bffcc5b9da)

* chore: `conflicts`

* fix(patch): `update_sre_from_voucher_details`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-24 12:39:05 +05:30
rohitwaghchaure
10311ff114
fix: payment entry count on supplier dashboard (#37571) 2023-10-18 17:42:35 +05:30
ruthra kumar
5bb3e290d2
Merge pull request #37330 from ruthra-kumar/provision_to_pick_exc_rate_on_transaction_date
refactor: checkbox to toggle exchange rate inheritence in PO->PI
2023-10-17 09:45:33 +05:30
ruthra kumar
08315522bb refactor: checkbox to toggle exchange rate inheritence in PO->PI 2023-10-16 16:25:19 +05:30
Bernd Oliver Sünderhauf
2d6f1f8598
fix(UX): Un-require description fields on items (#37354)
fix(UX): Un-require description fields on items.
2023-10-10 07:26:37 +05:30
RitvikSardana
2c899dd13a
fix: customer group and territory not mandatory (#37050)
* fix: customer group and territory not mandatory

* fix: supplier group not required

* test: added test case for customer and supplier without group

* test: Customer without customer group and territory

* chore: remove unwanted changes

* test: Supplier without supplier group

* test: code cleanup

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-10-09 20:21:25 +05:30
s-aga-r
e7f4b7b190
fix: ignore user permissions for Source Warehouse (#37313) 2023-10-01 21:25:01 +05:30
Gursheen Anand
888ed36eed fix: set route filter values for AP 2023-09-27 13:01:18 +05:30
Florian HENRY
fb844920af feat: Customer and Supplier - Primary Address and Contact on the same column as new adress and contact 2023-09-21 12:28:09 +02:00
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances
fix: multiple fixes for booking advances in seperate account
2023-09-13 20:24:57 +05:30
s-aga-r
d2f3286115 fix: ignore user permissions for From Warehouse in PR 2023-09-13 16:26:29 +05:30
s-aga-r
1c78a5a9aa test: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 12:28:18 +05:30
Smit Vora
43061f4416 fix: correct set_query filters 2023-09-11 19:16:25 +05:30
s-aga-r
22cf1556cd
feat: Service Item and Finished Good Map (#36647)
* feat: new DocType `Service Item and Finished Good Map`

* fix(ux): filters for Service Item and Finished Good

* fix: validations for Service Item and Finished Good

* feat: set FG Item on Service Item selection in PO

* refactor: one-to-many mapping between service item and finished goods

* feat: auto set Service Item for finished good in PO created from PP

* feat: auto set Service Item on Finished Good selection in PO

* test: add test case for service item and finished goods map

* feat: `BOM` field in `Finished Good Detail`

* feat: new DocType `Subcontracting BOM`

* fix: filters and validations for Subcontracting BOM

* feat: auto select Service Item in PO created from PP

* test: add test case for PO service item auto pick

* feat: pick BOM from Subcontracting BOM in SCO

* feat: auto pick `Service Item` on FG select

* refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail`

* feat: fetch FG for Service Item

* chore: `linter`

* refactor: update `Auto Name` expression for Subcontracting BOM
2023-09-03 11:59:28 +00:00
s-aga-r
5b62bbe073
Merge pull request #36752 from s-aga-r/FR-35157
feat: `Update Items` for Subcontract Purchase Order
2023-08-23 11:13:28 +05:30
s-aga-r
305d39f6a1 test: add test case for Subcontract PO update items 2023-08-22 18:24:30 +05:30
s-aga-r
9588bb7443 fix: validate FG Item and Qty 2023-08-22 16:29:14 +05:30
Raffael Meyer
9d29ec8eac
fix: attachments should be an empty list by default (#36757)
fix: attachments should be an empty list by default
2023-08-22 13:35:12 +05:30
Raffael Meyer
4b75b6f309
feat(RFQ): optionally send document print (#36363) 2023-08-22 12:26:01 +05:30
s-aga-r
faf9f13215 feat: allow Update Items for Subcontracted PO not having SCO created 2023-08-21 15:58:11 +05:30
Raffael Meyer
552bbb1d46
fix(RFQ): make "update password" and "submit quotation" buttons the same size (#36667)
fix(RFQ): button styling
2023-08-17 12:04:05 +05:30
barredterra
4fb844ab70 fix(RFQ): hide description in print and report 2023-08-08 16:30:53 +02:00
barredterra
68ad62f7d0 test(RFQ): get_link 2023-08-08 12:31:37 +02:00
barredterra
fd91f2c2e0 fix(RFQ): link to supplier portal 2023-08-08 12:31:01 +02:00
Raffael Meyer
8cc3df7c2c
feat(RFQ): make sending attachments configurable (#36359) 2023-08-07 19:11:01 +05:30
Raffael Meyer
21080afd92
feat(RFQ): make email message fully configurable (#36353)
feat: make RFQ message fully configurable
2023-08-07 17:12:31 +05:30
Bernd Oliver Sünderhauf
5435c641a2
fix: Refine supplier scorecard standings. (#36414)
Co-authored-by: Bernd Oliver Sünderhauf <pancho@mailbox.org>
2023-08-05 23:13:14 +05:30
s-aga-r
e179499764
fix(ux): add Ordered Qty column in Get Items From > MR (#36486) 2023-08-05 19:26:11 +05:30
Deepesh Garg
c6b024c34b
Merge pull request #36167 from barredterra/percentage-rounding
fix: rounding of percentage fields
2023-07-30 14:41:30 +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
4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents 2023-07-24 12:29:57 +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
9e791efc82 refactor: client side accounts controller 2023-07-17 21:44:43 +05:30
barredterra
ecaf0aba3c fix: rounding of percentage fields
Always round with precision of 2
2023-07-17 16:45:11 +02:00
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +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