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

1554 Commits

Author SHA1 Message Date
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
9a2db0b5b1 fix: semgrep error 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
marination
3b070d1b05 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 14:51:33 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report 
fix: Report Subcontracted Raw Materials to be Transferred
 2021-06-11 17:50:30 +05:30
marination
c4d851e45f fix: Test 2021-06-11 17:27:43 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
marination
ec4a3723cc fix: Sider 2021-06-11 12:47:06 +05:30
marination
687ad9b942 fix: Report Raw Materials to be Transferred 2021-06-10 21:18:19 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Suraj Shetty
d48ea663d9 test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-28 09:10:33 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link 
feat: linking supplier with an item group for filtering items
 2021-05-21 12:07:53 +05:30
noahjacob
bf7f0530e6 fix: added error handling if entry already exists 2021-05-19 13:53:22 +05:30
noahjacob
3768216dca refactor: updated permissions and mandatory fields 2021-05-19 13:50:35 +05:30
noahjacob
0ab0fcdd51 feat: added supplier item group link in supplier dashboard 2021-05-18 15:21:24 +05:30
Alan
98fc4195b3
fix: send emails on rfq submit (#25695) 
* fix: send emails on rfq submit

* fix: check if email is present for supplier
 2021-05-14 12:22:28 +05:30
noahjacob
7715441842 feat: added supplier item group doctype 2021-05-09 20:02:23 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning 2021-04-15 12:48:25 +05:30
Nabin Hait
1bc65ddbe4
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-14 11:23:34 +05:30
Deepesh Garg
b717420842
fix: Role to override maintain same rate check in transactions (#25193) 
* feat: configurable action if the same purchase/selling rate is not maintained

* fix: Role to override maintain same rate check in transactions

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-14 10:43:45 +05:30
Rohit Waghchaure
a5d062453e feat: added test case 2021-04-10 10:49:31 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
rohitwaghchaure
fe72e17a7b
Merge pull request #25109 from ankush/po_to_pr_fixes 
fix: incorrect status creating PR from PO after creating PI
 2021-04-03 17:11:14 +05:30
Sagar Vora
88f5c42b09
test: set formula in scorecard to avoid ValidationError (#25116) 2021-04-01 16:44:05 +05:30
Ankush Menat
427a98d6cd
fix: do not copy percent billed from PO to PR 2021-04-01 11:51:31 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 01:42:18 +05:30
Anupam
661b1e59c1 Merge branch 'develop' of https://github.com/frappe/erpnext into planning 2021-03-22 11:48:11 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +05:30
Sagar Vora
7645315424
test: set correct qty when creating subcontract transfer entry (#24903) 2021-03-17 20:01:21 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Anupam
d8f7a75eae feat: add total available stock field 2021-03-15 10:31:53 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template 
* fix: autoname for Item Tax Template

Use title + company abbreviation instead of just title.

* fix: test records of Item Tax Template

* fix: rename item tax templates in test records

* Revert "fix: test records of Item Tax Template"

This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.

* fix: rename hardcoded item tax templates in tests

* fix: rename hardcoded Item Tax Templates in tests

(2)

* fix: delete Item Tax Template with company
 2021-03-10 10:24:43 +05:30
Ankush Menat
7d892438f0
fix: track setting changes 2021-03-02 17:50:58 +05:30
Marica
f3ca4bcb70
Merge branch 'develop' into rfq-contact-email-set 2021-02-18 16:51:50 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity (#24317) 
* fix: move "Print Language" to "More Information"

* feat: add "Print Language" in "More Information"

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 16:24:37 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-11 20:19:30 +05:30
Marica
bb87950e96
Merge branch 'develop' into rfq-contact-email-set 2021-02-10 12:02:14 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30