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
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
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
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
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
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
Afshan
e0cb6c3b9d
fix: removed extra space from label "Rate" ( #23683 )
2020-10-19 16:55:20 +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
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
Marica
d5e6eb75cf
Merge branch 'develop' into supplier-quotn-comparison
2020-09-23 21:06:18 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard ( #23406 )
2020-09-23 17:14:37 +05:30
Marica
cbac025a5f
Merge branch 'develop' into supplier-quotn-comparison
2020-09-21 22:08:38 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator ( #23350 )
...
* fix: reset owner values in doctype to Administrator
* fix: updated modified value
* fix: also fixed modified by
* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Marica
2cfaf71d59
Merge branch 'develop' into supplier-quotn-comparison
2020-09-18 15:22:59 +05:30
Marica
9ce5c77a21
Merge branch 'develop' into supplier-quotn-comparison
2020-09-15 18:50:34 +05:30
marination
f995f517c9
fix: Test
2020-09-15 17:06:27 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items
2020-09-15 11:30:22 +05:30
marination
4bb8d0c193
chore: Test for PO
2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO ( #22869 )
...
* feat: uom in update items for SO & PO
* fix: supplied items doesn't updates on uom change
* chore: add uom and conv factor change test
* fix: test
* fix: purchase order updates are not tracked
* fix: fetch conversion factor on uom change
* fix: codacy
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
marination
59239172a1
feat: Supplier Quotation Comparison - v3
2020-09-14 17:34:21 +05:30
Rucha Mahabal
a1b5d57076
test: make rfq from opportunity
2020-09-02 13:14:01 +05:30
marination
bc6c4e864d
fix: Status in Report and filter query
2020-08-31 20:32:17 +05:30
marination
8f452b8663
fix: Codacy and indicator message
2020-08-24 18:57:07 +05:30
marination
f49665077c
feat: Quoted Item Comparison Report Enhancements v2
2020-08-24 18:26:48 +05:30
Afshan
ba33900712
Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO
2020-08-11 20:17:05 +05:30
Afshan
b5b2586968
fix: referencing frm
2020-08-11 20:15:57 +05:30