Commit Graph

1164 Commits

Author SHA1 Message Date
marination
3e7a8abf29 feat: Provision to set Default Item Manufacturer
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-07 21:00:57 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip 2020-04-02 21:17:52 +05:30
Deepesh Garg
bf884e8b37
Merge pull request #21092 from scmmishra/multiple-option-fix
fix: use setup from Supplier Quotation Controller
2020-03-31 16:28:47 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session (#20867)
Co-authored-by: prafful1234 <prafful@mntechnique.com>
2020-03-31 10:40:42 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip 2020-03-30 13:07:03 +05:30
Shivam Mishra
71fb8e8b57 fix: use setup from Supplier Quotation Controller 2020-03-27 20:47:04 +05:30
Deepesh Garg
e7aefc1163 fix: Add check to skip PR in supplier master 2020-03-17 11:44:02 +05:30
Deepesh Garg
1943fb0de4 feat: Allow PI creation without PO 2020-03-06 18:50:11 +05:30
P-Froggy
f9b3e4be78 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-02-28 20:46:41 +01:00
P-Froggy
55d10f77f9 fix: Add linked bank accounts to supplier dashboard 2020-02-28 13:14:11 +01:00
Rucha Mahabal
6071313965
fix: document creation via onboarding slide (#20644)
* fix: defaults not set in doc created via Onboarding Slide

* fix: default company not set in Supplier
2020-02-20 12:57:21 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083)
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
P-Froggy
e4d8ee5ba8 Revert "Added bank account reference in supplier dashboard"
This reverts commit 7ee8a20964.
2020-02-18 01:05:19 +01:00
P-Froggy
7ccb8b6707 Revert "Merge pull request #1 from P-Froggy/patch-1"
This reverts commit 79c5266d0d, reversing
changes made to bd582cfc39.
2020-02-17 11:33:10 +01:00
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371)
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
2020-02-17 15:58:08 +05:30
P-Froggy
7ee8a20964 Added bank account reference in supplier dashboard 2020-02-17 00:15:29 +01:00
P-Froggy
ab92e330da
Fix: Wrong filter for supplier default bank account
The query for default bank account field in the supplier master only allowed company bank accounts. With this fix it's now possible to one of the supplier bank accounts as default bank account.
2020-02-16 23:08:32 +01:00
P-Froggy
b3712158ae
Bank accounts reference in supplier dashboard
Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.
2020-02-16 19:10:53 +01:00
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
0Pranav
d4c0184f3f fix: missing plus button in request for quotaion for supplier quotation 2020-01-29 09:32:40 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301)
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
2020-01-16 13:37:25 +05:30
Saqib
440a3b75be fix: don't show transfer button if already items are supplied (#20154) 2019-12-31 17:20:04 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
Saqib
0ad7449ae3 feat: allow adding & deleting of items in submitted SO & PO (#19911)
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
rohitwaghchaure
08433c2919 fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071) 2019-12-24 13:03:47 +05:30
RJPvT
818c49279c Update supplier_scorecard.py (#20061) 2019-12-24 12:24:58 +05:30
Marica
93cb64ee30 enhancement`: Added Set Reserve Warehouse field in Purchase Order. (#19991) 2019-12-23 18:24:56 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Rohit Waghchaure
d98ed8047a fix: travis failing 2019-12-06 13:17:56 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
Suraj Shetty
9d6d95c4a2 fix: valuation of "finished good" item in purchase receipt (#19268)
* fix: Remove redundant purchase orders and unwanted condition

* fix: [WIP] Purchase receipt value

* fix: Add raw material cost based on transfered raw material

* fix: get_qty_to_be_received

* fix: Remove debugger statement

* fix: Reset rm_supp_cost before setting subcontracted raw_materials

* test: Fix and modify tests for backflush_based_on_stock_entry

* fix: Add non stock items to Purchase Receipt from Purchase Order

* fix: Ignore valuation rate check for non stock raw material

* fix: Rename check all rows

* fix: Remove amount from test

* test: Fix item rate error

* fix: handling of serial nos in backflush

* fix: Add serial no. of raw materials

* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material

* fix: Raw material batch number selection in purchase receipt

* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30
Marica
7ca472780b fix: Get Current Stock button not working in Purchase Receipt (#19645)
- Field visible in grid view as well for better feedback
2019-11-22 14:37:38 +05:30
Saqib
290253fdd0 fix: last purchase rate greater than selling price (#19617) 2019-11-22 12:12:29 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369)
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
2019-11-18 11:46:55 +05:30
Himanshu
1ad2d4a962 fix: get tags for rfq (#19564)
* fix: get tags for rfq

* chore: remove console log
2019-11-13 19:21:52 +05:30
Deepesh Garg
fbae893f07
Merge pull request #19306 from nabinhait/required_date_fix
fix: Always set required date based on min date on item table
2019-10-21 15:25:23 +05:30
deepeshgarg007
737ec6b26e fix: Travis 2019-10-20 17:36:36 +05:30
Nabin Hait
19070621af tests: added tests for PO scheduled date 2019-10-15 14:11:40 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Saqib
451d1a1744 fix: Bypass credit limit and Project Template field not visible(#19162)
* Fix: Allow Project Template in Quick Entry

* Fix: Label Changes
2019-09-24 19:10:59 +05:30
Deepesh Garg
d9e9d562f8 fix: Travis (develop) (#19140)
* fix: Travis

* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working (#19094) 2019-09-19 18:12:39 +05:30
Rucha Mahabal
51eabfe352 fix: subcontracting material transfer dialog in Purchase Order (#19111)
* fix: subcontracting material transfer dialog in Purchase Order

* fix: dialog title
2019-09-19 16:57:03 +05:30
KanchanChauhan
d114c8f88f fix(Purchase Order): Status updater (#18612) 2019-09-05 15:11:43 +05:30
Deepesh Garg
98b86ecbc2
Merge branch 'develop' into supplier_items 2019-08-23 15:41:30 +05:30
deepeshgarg007
9e6abc4948 fix: Test case fixes 2019-08-20 16:14:44 +05:30