Marica
7579981fb5
Merge pull request #29987 from marination/mr-to-order-and-receive-report
...
fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`
2022-03-07 10:18:28 +05:30
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +05:30
marination
54b3676f35
fix: linter (imports alphabetical)
2022-03-02 13:09:34 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items
2022-03-02 12:13:56 +05:30
marination
ac425722e2
fix: Sider and Linter
2022-03-01 17:30:37 +05:30
marination
e6952cb7f9
refactor: Convert to QB, added test file, removed white space
...
- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year
2022-03-01 17:15:04 +05:30
Marica
5a8c80b153
Merge branch 'develop' into mr-to-order-and-receive-report
2022-03-01 13:01:35 +05:30
Ankush Menat
829c453cb6
test: remove transaction commits from buying module
2022-02-28 17:36:58 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-28 11:35:42 +05:30
marination
d3b0ca30c6
fix: Get MRs that are yet to be received but fully ordered in Report
...
- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)
2022-02-25 12:10:11 +05:30
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +05:30
Saqib Ansari
2f1709dfef
chore: remove unintentional search index
2022-02-24 15:12:35 +05:30
Saqib Ansari
1e139cf9a1
chore: remove unintentional search index
2022-02-24 15:12:12 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
Saqib Ansari
8005fee656
feat: update ordered qty for packed items
2022-02-22 15:06:19 +05:30
Sagar Vora
08a391fa88
test: set correct DocType ( #29819 )
2022-02-16 10:56:57 +05:30
Ankush Menat
77be98295c
fix: update bin modified timestamp when updating qty
...
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.
2022-02-11 11:54:58 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing ( #28580 )
...
* feat: Bulk Transaction Processing
* fix: add flags to ignore validations and exception handling correction
* fix: remove duplicate code, added logger functionality and improved notifications
* fix: linting and sider issues
* test: added tests
* fix: linter issues
* fix: failing test case
* fix: sider issues and test cases
* refactor: mapping function calls to create order/invoice
* fix: added more test cases to increase coverage
* fix: test cases
* fix: sider issue
* fix: rename doctype, improve formatting and minor refactor
* fix: update doctype name in hooks and sider issues
* fix: entry log test case
* fix: typos, translations and company name in tests
* fix: linter issues and translations
* fix: linter issue
* fix: split into separate function for marking failed transaction
* fix: typos, retry failed transaction logic and make log read only
* fix: hide retry button when no failed transactions and remove test cases not rrelevant
* fix: sider issues and indentation to tabs
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings ( #29638 )
...
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.
* chore: undo changes to creation timestamp
happened because of a bug in fw
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
2022-02-07 10:42:55 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Shariq Ansari
dd56bf205a
fix: fixed card for buying workspace
2022-01-13 20:19:49 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Kanchan Chauhan
8c4cdf7afc
refactor: Payment Request added to PO Dashboard
2021-12-29 16:44:20 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Noah Jacob
db46257a3b
feat: added required_date field to set date in child table ( #28432 )
...
* feat: added required_date field to set date in child table
* fix: dont refresh full table
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-14 12:12:33 +05:30
Himanshu
624481be6f
feat(buying): quotation number in supplier quotation ( #28420 )
2021-12-11 11:51:59 +00:00
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving ( #28798 )
...
* fix: misleading "Set Default X" fields after saving
* refactor: remove unncessary code and minor formatting
* fix: extend to more doctypes and correct fieldnames
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-09 17:04:00 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering ( #28553 )
...
* fix: adding get_timeline_data import on supplier.py, customer.py
2021-11-26 12:58:43 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier ( #28387 )
...
* feat: create party link from customer/supplier
* test: create_party_link method
2021-11-22 12:23:23 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created ( #28348 )
2021-11-11 19:49:41 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193
...
fix: replaced "=" with "in" for multiple statuses in query
2021-11-02 17:52:45 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates
...
feat: Taxes template for selling/buying doctypes
2021-10-28 12:33:21 +05:30
Deepesh Garg
e3ae8d5a1e
fix: Move PAN field from standard doctype to fixtures for India
2021-10-24 17:24:25 +05:30
Faris Ansari
8b547e39a8
feat: Taxes template for selling/buying doctypes
...
Depends on the new Print Format Builder
frappe/frappe#14134
2021-10-21 12:06:02 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
marination
fd6f3c6b88
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-10-12 18:24:21 +05:30
Ankush Menat
8d69ec72a6
fix: remove transaction commit from tests
2021-10-12 16:17:15 +05:30
marination
025574d9b5
chore: Removing Item's Website section & references
...
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
2021-10-12 16:03:19 +05:30
Noah Jacob
4bbe434d43
Merge pull request #27800 from noahjacob/buy_on
...
refactor: updated buying onboarding tours.
2021-10-11 15:33:58 +05:30
Noah Jacob
f5e0cad6a1
refactor: updated onboarding cards and tours
2021-10-05 13:24:22 +05:30
rohitwaghchaure
104d107659
Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis
...
fix: added project name in the purchase order analysis
2021-09-29 23:41:31 +05:30
Rohit Waghchaure
c1f9997a67
fix: added project name in the purchase order analysis
2021-09-29 23:26:19 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs ( #27684 )
...
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs
* fix: Ignore user permission for fiscal year company
2021-09-29 15:54:35 +05:30
Frappe PR Bot
6e7945fbb7
fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) ( #27499 ) ( #27506 )
...
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343
* fix: Linting issues
* fix: remove unnecessary caching
[skip ci]
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>
(cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)
2021-09-15 11:10:11 +05:30
Deepesh Garg
759f2b7920
fix: Autoname for customer and supplier ( #27398 )
2021-09-15 10:24:26 +05:30
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items
...
feat: link items to supplier / customer
2021-09-14 13:58:18 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order ( #27449 )
2021-09-13 12:13:43 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-31 22:08:10 +05:30
GangaManoj
a067d55865
fix: Add Product Bundle field in Items table
2021-08-30 20:07:06 +05:30
GangaManoj
055ac82b39
fix: Remove Bundle Items table
2021-08-30 20:04:24 +05:30
marination
7b78473da3
fix: Indentation and removed f-strings
...
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
GangaManoj
e44567754d
fix: Display Packed/Bundle Items table only if it exists
2021-08-27 20:16:13 +05:30
GangaManoj
a2b394b195
fix: Enable Print Hide for Bundle Items
2021-08-27 20:06:22 +05:30
marination
2a3ef03388
fix: Popup stale build and data consistency
...
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry) in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
marination
bf72ec0598
feat: (consistency) Add Primary Address and Contact section in Supplier
...
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
GangaManoj
4353c5e339
fix: Disable Add Row and Delete Row for Bundle Items
2021-08-27 02:32:34 +05:30
GangaManoj
bdbd4f83ab
fix: Create separate section for Bundle Items
2021-08-27 02:29:47 +05:30
GangaManoj
20cfe60e84
feat: Populate Bundle Items table
2021-08-27 01:49:58 +05:30
GangaManoj
efd8a8b28e
feat: Add Bundle Items table
2021-08-27 01:49:28 +05:30
GangaManoj
681c92d646
fix: Make Sales Order field editable so the PO can be linked with an SO later
2021-08-27 01:48:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja ( #26374 )
2021-08-17 18:45:55 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
...
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
Deepesh Garg
8b9c04aae8
test: Fix test cases for payment terms fetch
2021-08-09 18:53:15 +05:30
Deepesh Garg
802c6b3738
test: Improve test case for not coping payment terms
2021-08-09 18:53:15 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e
fix: Disable automcatically_fetch_payment_terms after running its associated tests
2021-08-09 18:53:13 +05:30
GangaManoj
7244afe129
fix: Rename test to reflect changes in code
2021-08-09 18:53:13 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms
2021-07-29 17:23:09 +05:30
GangaManoj
aed39a23dc
fix: Rename tests
2021-07-23 03:45:59 +05:30
GangaManoj
de6d960381
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:36:37 +05:30
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
GangaManoj
cde0cc0678
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-17 22:53:21 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix
2021-07-13 10:31:10 +05:30
Noah Jacob
0be6583083
refactor: suggested changes
2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106
fix: Sider
2021-07-12 08:48:04 +05:30
Noah Jacob
8db974b1b9
test: updated test cases
2021-07-02 22:00:33 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI ( #26184 )
2021-06-24 14:26:36 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI ( #25837 )
2021-06-24 10:09:02 +05:30
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-21 22:36:03 +05:30
Noah Jacob
acef77fb53
test: test case for fetching supplier group details
2021-06-21 15:39:05 +05:30
Noah Jacob
ffe306c2f6
feat: details fetched from supplier group in supplier
2021-06-21 15:36:46 +05:30
Rohit Waghchaure
e5fb23972a
fix: available qty for consumption
2021-06-20 15:28:25 +05:30
Rohit Waghchaure
6bbc8ec3e8
fix: code cleanup and convert public method to private for subcontracting class
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045
fix: semgrep error
2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9
feat: subcontract code refactor and enhancement
2021-06-20 15:27:01 +05:30
Rohit Waghchaure
9e616b09a2
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-20 15:17:20 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Rohit Waghchaure
f5db407461
fix: available qty for consumption
2021-06-19 23:19:45 +05:30
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
Rohit Waghchaure
8c844e4515
fix: material request and supplier quotation not linked if sq created from supplier portal against rfq
2021-06-19 16:08:26 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
marination
5d082b05a9
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 16:31:45 +05:30
marination
3b070d1b05
fix: Flaky test for Report Subcontracted Raw materials to be transferred
2021-06-14 14:51:33 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
2021-06-12 16:00:14 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +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
ea3e61d3b0
fix: Test
2021-06-11 17:29:55 +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
a4ed6a3519
fix: Sider
2021-06-11 12:51:36 +05:30
marination
c5da51dd7a
fix: Report Raw Materials to be Transferred
2021-06-11 12:51:10 +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
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +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
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +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
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +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
Suraj Shetty
018ccc2b6d
test: Fix test name
...
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
2021-05-10 18:01:53 +05:30
Suraj Shetty
ec6b652cd4
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-10 09:18:25 +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
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +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
Jannat Patel
9f8cbe9101
Material request wrong status issue ( #24019 )
...
* fix: material request status fix
* fix: changing precision to global defaults for material request status
* fix: adding back the removed flt
* fix: sider issues fixed
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2021-01-28 12:29:52 +05:30
pateljannat
55e7c5644c
fix:rfq contact email set
2021-01-28 12:00:18 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway
2021-01-18 17:47:25 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Mohammad Hasnain Mohsin Rajan
00981206ad
fix: last purchase rate not updating when voucher cancelled if only one voucher is present ( #24322 )
...
* fix: last purchase rate not updating
* chore: use orm for updating
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:23:18 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway
2021-01-05 11:24:05 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
hasnain2808@gmail.com
46d5f4c7f1
refactor(analytics report): linting
2020-12-25 16:34:43 +05:30
Mohammad Hasnain Mohsin Rajan
61b92b312a
Merge branch 'develop' into fix-analytics-reports
2020-12-22 12:41:43 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation ( #24031 )
...
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
2020-12-21 14:45:50 +05:30
hasnain2808@gmail.com
2da0035a0f
Merge branch 'develop' into fix-analytics-reports
2020-12-16 16:14:23 +05:30
hasnain2808@gmail.com
9962ba86d0
fix: charts not displaying when tree_type changed
2020-12-16 14:41:04 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Marica
406af27b9e
Merge branch 'develop' into putaway
2020-12-14 13:07:50 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway
2020-12-08 11:44:00 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search ( #24055 )
2020-12-08 09:43:29 +05:30
marination
fac4035f23
feat: Apply Putaway Rules within transaction itself
...
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
2020-12-07 21:35:49 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr
2020-12-04 16:30:40 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
Marica
ecce3bca2f
chore: PO cleanup ( #23774 )
...
* chore: Subcontracting section and items section enhancement
- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section
* chore: PO & PO Item Form Cleanup
* chore: PO Get Items from cleanup
* fix: Taxes and Charges field visibility
* chore: Cleanup
* fix: Translation styling
2020-11-30 14:58:00 +05:30
Deepesh Garg
1a4390de44
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e
fix: Move filter setup to doctype controllers
2020-11-25 14:49:10 +05:30
Marica
e762bc67eb
Merge branch 'develop' into putaway
2020-11-24 17:28:34 +05:30
marination
0cec1477f2
chore: Format unassigned Items dialog and add freeze message
2020-11-23 19:19:35 +05:30
marination
9596276b95
fix: Linter and Sider
2020-11-23 10:32:17 +05:30
marination
c7991f8561
feat: Putaway Rule
2020-11-20 11:53:20 +05:30
Rohit Waghchaure
f0b1670abc
fix: tds test case
2020-11-19 18:40:13 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field ( #23776 )
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Marica
188ecd7b39
chore: PO cleanup ( #23774 )
...
* chore: Subcontracting section and items section enhancement
- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section
* chore: PO & PO Item Form Cleanup
* chore: PO Get Items from cleanup
* fix: Taxes and Charges field visibility
* chore: Cleanup
* fix: Translation styling
2020-11-15 09:17:42 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Marica
6bbdc58d56
Merge branch 'develop' into link-to-mr
2020-11-05 09:31:39 +05:30
Marica
364916fa7b
Merge branch 'develop' into dialog-cleanup
2020-11-05 09:27:57 +05:30
marination
2b3412ea05
chore: Reposition RFQ fields
2020-11-04 22:07:33 +05:30
Marica
7b42e8e27c
Merge branch 'develop' into dialog-cleanup
2020-11-03 16:26:06 +05:30
marination
542ae6ab97
chore: Linter and Sider fixes
...
- Translatable strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
2020-11-02 08:50:48 +05:30
Marica
e0ec58d8fa
Merge branch 'develop' into link-to-mr
2020-11-01 23:48:58 +05:30
marination
08e5031be2
chore: Supplier Quotation Get Items From cleanup
2020-10-30 17:36:20 +05:30
marination
e14fdf4a3c
chore: RFQ cleanup and Title case for 'Get Items From'
...
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
Rohit Waghchaure
71913c36a7
fix: po_detail field has no value for subcontracted stock entry
2020-10-30 14:35:16 +05:30
prssanna
71e5b60df1
refactor: refactor contextual print setting implementation
2020-10-29 14:19:34 +05:30
Marica
16a1f7e7e3
Merge branch 'develop' into link-to-mr
2020-10-27 11:49:35 +05:30
Rohit Waghchaure
9caac6976c
fix: incorrect supplied qty error
2020-10-26 12:19:00 +05:30
rohitwaghchaure
4c688b71f3
fix: consumed qty logic for subcontracted raw materials ( #23314 )
...
* fix: consumed qty logic for subcontracted raw materials
* added test case
* fix: sales order workflow test case
2020-10-26 12:19:00 +05:30
Marica
97e065f94f
Merge branch 'develop' into link-to-mr
2020-10-23 19:47:18 +05:30
Marica
0bd576aa44
fix: RFQ UX fixes ( #23382 )
...
* chore: RFQ UX fixes
* fix: RFQ to SUpplier Quotation Dialog
* fix: Remove 'No Quote' functionality
- No Quote in Suppliers table is removed
- It's use everywhere has been removed too (tests, server side files, DOM event)
* chore: More Info section and Project field
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:38:30 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Nabin Hait
db474aea95
Merge branch 'develop' into link-to-mr
2020-10-22 21:45:07 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items ( #23702 )
...
* fix: Add Taxes if missing via Update Items
* chore: PO Test for adding tax row via Update Items
* chore: SO Test for adding tax row via Update Items
2020-10-22 17:04:31 +05:30
Shivam Mishra
5e00ed926c
feat: update icons
2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" ( #23683 )
2020-10-19 16:55:20 +05:30
Marica
ca5ad076d5
Merge branch 'develop' into link-to-mr
2020-10-16 16:49:38 +05:30
marination
359778e235
chore: Code cleanup, reduce redundancy
2020-10-16 16:47:23 +05:30
rohitwaghchaure
f8ce64c0ca
Merge pull request #23443 from marination/rfq-email
...
feat: Supplier Email Preview in RFQ
2020-10-14 18:16:59 +05:30
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker ( #23549 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-14 10:29:25 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Marica
0ed3e947ba
Merge branch 'develop' into rfq-email
2020-10-13 16:55:25 +05:30
Marica
c5e139a542
fix: Travis ( #23606 )
...
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places
* fix: Item Barcode and Test
* fix: Over Receipt on subcontracting test
* fix: POS Invoice and Loyalty Program Tests
* fix: POS serialized item test and subcontracting exploded items in PO
* fix: Subcontracting test considering sourced_by_supplier items
* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
Marica
9cc05bb83e
Merge branch 'develop' into rfq-email
2020-10-12 18:02:15 +05:30
rohitwaghchaure
4164d08d17
Merge pull request #23323 from marination/supplier-quotn-comparison
...
feat: Supplier Quotation Comparison - v3
2020-10-12 17:55:15 +05:30
Marica
14b9c79ddc
Merge branch 'develop' into supplier-quotation-ux
2020-10-12 17:16:28 +05:30
barredterra
242579b77c
fix: use party name as title
2020-10-07 14:34:21 +02:00
marination
b9e2f17f4f
fix: More secure query
2020-10-01 21:31:51 +05:30
marination
f57ba86bce
chore: Add Date and Valid Till to List View
2020-10-01 21:10:00 +05:30
marination
5006345a0a
chore: Fetch RFQs in Get Items from RFQ based on Supplier selected
...
- Rfq will appear only if selected supplier is in the RFQ
2020-10-01 20:41:05 +05:30
marination
4993ef19d6
feat: Supplier Quotation UX fixes
2020-10-01 16:35:09 +05:30
marination
29d7528a95
fix: Hide Preview Email button on submitted doc
2020-10-01 14:55:21 +05:30
marination
f90c3602a7
fix: Price should be total amount, modified deskpage
2020-10-01 14:38:17 +05:30
marination
65fc48da25
fix: Email Template and Codacy
...
- Email Preview works well with email template
- Codacy for docstrings
2020-09-29 12:46:19 +05:30
marination
a6ea86432e
fix: Skip Update Password in Preview
...
- dont show update password button in preview, its for the suppliers mail only
- modified docstrings
- update supplier row contact only if None
2020-09-28 21:05:11 +05:30
marination
f911228871
fix: UX and code cleanup
...
- Added a small note in muted text at bottom of Dialog
- Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway
- Renamed `update_contact_of_supplier` to `link_supplier_contact`
- On sending mail, new users and contacts that were created get updated in RFQ doc
- Added docstrings to functions
2020-09-28 20:21:44 +05:30
marination
056c86033d
fix: Reuse function to render email preview
...
- Reused `supplier_rfq_mail` to render preview
- Print hid Salutation and Subject
- Completely dynamic greeting
2020-09-28 17:42:22 +05:30
marination
bd36f2b94d
feat: Supplier Email Preview in RFQ
2020-09-28 15:59:03 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
marination
a119688e32
fix: (RFQ/SQ) Link to Material Requests in Tools section
2020-09-24 15:57:43 +05:30
Marica
d5e6eb75cf
Merge branch 'develop' into supplier-quotn-comparison
2020-09-23 21:06:18 +05:30