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