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

1946 Commits

Author SHA1 Message Date
barredterra
27f05145ae feat: RFQ print preview 2023-12-13 17:00:58 +01:00
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
Sagar Vora
b6a7549407
fix: use predefined onload property load_after_mapping (#38209) 2023-12-02 20:06:19 +05:30
Gursheen Kaur Anand
9087e1443e
fix: SO ordered qty on PO item removal (#38378) 
* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-02 19:53:00 +05:30
Rohit Waghchaure
691e3bb24f fix: incorrect requested quantity for the subcontracting order 2023-11-30 17:32:55 +05:30
Ankush Menat
63313eef6f
feat: enable automatic type annotations (#38452) 2023-11-30 08:23:48 +00:00
s-aga-r
1423b38d50 fix: use docstatus instead of status 2023-11-30 11:43:28 +05:30
s-aga-r
68585f6f2b test: auto create SCO on PO submit 2023-11-29 13:58:36 +05:30
s-aga-r
500573067a Merge branch 'develop' into FIX-36704 2023-11-28 17:01:48 +05:30
s-aga-r
d366a91d9e fix: use checkbox instead of select field 2023-11-28 13:06:52 +05:30
Marica
b9f5a1c85d
fix: Negative Qty and Rates in SO/PO (#38252) 
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
 2023-11-27 09:05:22 +05:30
s-aga-r
98cba5ed30 feat: add Subcontracting Receipt link in PO connections 2023-11-24 12:14:38 +05:30
ruthra kumar
0fe6dcd742 refactor: make update_project_cost optional through Buying Settings 2023-11-24 11:18:51 +05:30
s-aga-r
7e4dd33ab0 fix: hold PO item ref in SCO Service Item 2023-11-23 17:06:13 +05:30
s-aga-r
745e3bfb73 chore: notify user on SCO creation 2023-11-23 17:04:19 +05:30
s-aga-r
762906f240 feat: add field Action on Subcontracting Receipt Submission 2023-11-23 17:04:13 +05:30
s-aga-r
9ec6f1e1d6 feat: auto create SCO on PO submission 2023-11-23 17:04:07 +05:30
s-aga-r
628ea42b63 feat: add field Action on Purchase Order Submission 2023-11-23 17:03:59 +05:30
s-aga-r
627165dc7c fix: Supplier Primary Contact 2023-11-22 15:27:07 +05:30
Deepesh Garg
089da459f7 feat: Add accounting dimensions to Supplier Quotation 2023-11-17 12:37:14 +05:30
Anand Baburajan
e93a19ffb5
chore: refetch item images on transaction save (#38095) 
chore: re fetch item images on transaction save
 2023-11-14 19:38:15 +05:30
Vishakh Desai
c2bda2c705
fix: Supplier Quotation fields (#37963) 2023-11-09 18:26:34 +05:30
s-aga-r
a9d91189b0 fix: make Material Request Item required if Material Request is set in PO 2023-11-06 11:05:04 +05:30
Deepesh Garg
fc4199504f
Merge pull request #37590 from GursheenK/gov-compliance-for-tax-withholding-report 
fix: gov compliance for tax withholding report
 2023-11-01 14:09:29 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
Anand Baburajan
d99a56bc27
chore: allow wip_composite_asset in the MR PO PR PI flow (#37723) 2023-10-27 18:54:36 +05:30
s-aga-r
8ffa2bfe25 refactor: rename field Over Order Allowance to Blanket Order Allowance 2023-10-25 14:03:51 +05:30
s-aga-r
cdbe1c87d4
Merge pull request #37603 from s-aga-r/AUTO-RESERVATION 
feat: auto reserve stock for Sales Order on purchase
 2023-10-24 10:14:18 +05:30
Vishnu VS
98cc7434d2
feat(Supplier Scorecard): added method for invoiced quantity in supplier scorecard (#37580) 
feat(Supplier Scorecard): added method for invoiced quantity in supplier scorecard

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
 2023-10-21 18:04:54 +05:30
Gursheen Anand
ed2457bddf feat: proprietorship & partnership options in entity type 2023-10-19 16:59:49 +05:30
s-aga-r
188175be84 feat: add fields to hold SO and SO Item ref in PR Item 2023-10-19 14:50:38 +05:30
rohitwaghchaure
10311ff114
fix: payment entry count on supplier dashboard (#37571) 2023-10-18 17:42:35 +05:30
s-aga-r
fbd8660403
Merge pull request #37539 from HarryPaulo/fix-purchase-order-analyse-invoiced-qty 
fix: billed_qty to show a sum of all invoiced qty from the purchase order item.
 2023-10-18 11:07:34 +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
HarryPaulo
8a72f4f58a fix: billed_qty to show a sum of all invoiced qty from the purchase order item. 2023-10-16 18:12:10 -03:00
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
mergify[bot]
8d99f9a12a
fix: currency symbol in the Supplier Quotation Comparison report (backport #37337) (#37342) 
fix: currency symbol in the Supplier Quotation Comparison report (#37337)

fix: currency in the Supplier Quotation Comparison report
(cherry picked from commit 82e8606b3c4403d79556c896a98f942762cd8fa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-03 20:32:34 +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
mergify[bot]
08aaf22b2a
fix: precision issue and column name (backport #37073) (#37089) 
fix: precision issue and column name (#37073)

(cherry picked from commit f2395a92971f48904e88afb929285def7ba221e4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-15 12:09:48 +05:30
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
mergify[bot]
a77e9d36cc
fix: Procurement Tracker report not showing material request items (backport #36768) (#36774) 
fix: Procurement Tracker report not showing material request items (#36768)

(cherry picked from commit 6a9935c00e502a28fa976c963a218f7e11b891ec)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-22 22:09:45 +05:30