barredterra
8717148d9b
feat: improve visibility of default values
2022-12-14 14:14:29 +01:00
barredterra
ce9626fead
feat: more control when printing RFQ
2022-12-14 14:03:36 +01:00
barredterra
e057e1dfe7
feat: incoterm named place
2022-12-12 18:49:47 +01:00
Ankush Menat
915e0347b0
chore!: remove activity log feeds ( #33294 )
...
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
log to the point where activity page doesn't even load.
2022-12-12 15:14:30 +05:30
s-aga-r
ca0485a503
fix: add company filter in RFQ Items
2022-11-30 10:03:36 +05:30
Deepesh Garg
3eb1ed19a1
fix: Tax withholding net total for PI in reports
2022-11-29 13:10:31 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order
...
feat: item wise tds in purchase order
2022-11-23 09:52:00 +05:30
ruthra kumar
541cf153f7
test: fix test case for SO/PO advance amount
2022-11-22 12:33:29 +05:30
niralisatapara
b9d0b4e2d3
feat: item wise tds in purchase order
2022-11-21 15:43:03 +05:30
barredterra
77105306f2
feat: add incoterm to purchasing transactions
2022-11-17 22:18:26 +01:00
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer
2022-11-17 16:42:18 +05:30
Sagar Sharma
1349d24514
Merge branch 'develop' into purchase-order/internal-supplier
2022-11-17 14:08:07 +05:30
Ankush Menat
34e4903ed7
refactor: search queries ( #33004 )
...
- guard clauses for readability
- use values or format
2022-11-17 13:04:42 +05:30
s-aga-r
5efbc2cbf8
fix: make is_internal_supplier read-only
2022-11-17 12:36:44 +05:30
Vishal
e5dfd53e6f
chore: minor fix
2022-11-16 14:25:35 +05:30
Vishal
ba6189d054
fix: minor change
2022-11-16 13:58:29 +05:30
Vishal
343b414b40
fix: test case updated for mr
2022-11-16 13:53:21 +05:30
Vishal
89aabdaaaa
fix: test case added for MR internal Transfer
2022-11-16 13:53:21 +05:30
Deepesh Garg
8f65677cb4
Merge pull request #32912 from nabinhait/customer-supplier-tab-break
...
fix(ux): Tab break in Customer and Supplier form
2022-11-10 18:30:14 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods ( #32914 )
...
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```
Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Nabin Hait
fb7ee301b5
fix(ux): Tab break in Customer and Supplier form
2022-11-09 18:03:23 +05:30
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po
...
fix: update advance paid in SO/PO from Payment Ledger
2022-11-02 16:27:56 +05:30
ruthra kumar
1a0a8ac7e2
test: PO advance paid on payment submission and cancellation
2022-11-02 15:53:52 +05:30
ruthra kumar
81d791eea0
test: refactor use @change_settings decorator when possible
2022-11-02 15:40:56 +05:30
Deepesh Garg
92f37ca111
fix: Reset advance paid amount on Oreder cancel and amend
2022-10-31 19:01:54 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse
...
fix: Add condition for discount section collapse
2022-10-28 11:24:25 +05:30
Deepesh Garg
4cd65027c4
fix: Add condition for discount section collapse
2022-10-26 16:48:24 +05:30
Rohit Waghchaure
5f84993bae
test: added test case to validate seachfields for customer, supplier
2022-10-24 16:10:47 +05:30
Sagar Sharma
682fb171cb
Merge branch 'develop' into refactor/buying/reports
2022-10-16 11:50:31 +05:30
Deepesh Garg
fd49503ba2
fix: Party account for multi-order invoices
2022-10-13 15:08:34 +05:30
Sagar Sharma
a161048a9d
Merge branch 'develop' into refactor/buying/reports
2022-10-12 00:38:37 +05:30
Nabin Hait
e71c417f7e
fix: minor cleanup
2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798
fix: more fields reordering related to Tab Break
2022-10-11 13:21:07 +05:30
Nabin Hait
3d9263bf86
feat: Tab Break in Supplier Quotation
2022-10-11 13:18:21 +05:30
Nabin Hait
10a25603ac
feat: Tab Break in Purchase Order
2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c
feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order
2022-10-11 13:18:21 +05:30
Deepesh Garg
d806e32030
fix: PO cancel post advance payment cancel against PO
2022-10-08 21:25:11 +05:30
Sagar Sharma
e78a706994
refactor: rewrite Procurement Tracker Report queries in QB
2022-10-08 10:47:10 +05:30
Sagar Sharma
a14b9c7bac
refactor: rewrite Supplier Quotation Comparison Report queries in QB
2022-10-07 18:07:53 +05:30
Sagar Sharma
a5b3f8cae9
refactor: rewrite Purchase Order Analysis Report queries in QB
2022-10-07 17:30:01 +05:30
Sagar Sharma
128c4bb7cb
Merge branch 'develop' into purchase-order/item/fg-item
2022-09-30 17:06:35 +05:30
Sagar Sharma
f95ed7dca2
fix: add non-stock item filter for fg_item in PO
2022-09-30 17:05:16 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +05:30
ruthra kumar
21095502b9
chore: clean up purchase invoice and purchase invoice item
...
1. remove discount accounting related fields from purchase invoice and
purchase invoice item
2. clean buying settings doctype
2022-09-27 11:10:41 +05:30
hendrik
f41d1500b0
fix: report chart field type
...
* fix: report chart field type
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-09-26 17:47:24 +05:30
Deepesh Garg
d4b01f6ffd
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule
2022-09-20 14:58:48 +05:30
Sagar Sharma
3a9c08e7c9
fix: po_detail or sco_rm_detail not getting set while while mapping SE
2022-09-19 18:47:46 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
Rohit Waghchaure
9d1be48bd2
test: added test case for internal transfer
2022-09-07 13:51:52 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
Sagar Sharma
68907ca783
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On ( #32048 )
...
chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings
2022-09-01 19:31:55 +05:30
Sagar Sharma
addd7347d8
fix: test "test_pending_and_received_qty"
2022-08-19 11:46:27 +05:30
Sagar Sharma
e5e88bb9f1
fix: contact search in request for quotation ( #31828 )
2022-08-13 11:05:48 +05:30
Rohit Waghchaure
0e7c4314b4
fix: minor changed link
2022-08-01 14:03:12 +05:30
Ankush Menat
67a74a4d14
fix: dont check first row on report load
...
- This doesn't actually load the chart but leaves UI and data in
inconsistent state
- On refresh it randomly keeps toggling the first row - confusing
behaviour.
2022-07-15 14:09:58 +05:30
Ankush Menat
ceeea6180e
fix: dont override default report options in charts
...
Sales analytics and purchase analytics reports are clearing the default
options which includes number shortening, axis options etc. This makes
report unreadable when dealing with large numbers.
2022-07-15 14:09:58 +05:30
Marica
dc3d492c83
Merge branch 'develop' into rfq-email-addressing
2022-07-08 15:39:20 +05:30
marination
300e812a1f
chore: Instantiate variable unconditionally
2022-07-08 15:38:44 +05:30
marination
88ac519b24
fix: Use Contact Name instead of Supplier in RFQ Email
2022-07-07 16:59:23 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Sagar Sharma
6f7e67db9d
chore: hide "Duplicate" button in PO
2022-07-05 08:44:35 +05:30
Sagar Sharma
687329f571
chore: update fg_item_qty based on qty in PO Item
2022-07-05 08:31:31 +05:30
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
Sagar Sharma
caeaa3f940
fix: multiple SCO against a PO
2022-07-02 06:20:09 +05:30
Sagar Sharma
b86710bb9a
fix(ui): hide "Update Items" button based on subcontracting conditions
2022-06-30 17:28:42 +05:30
Sagar Sharma
8e4458e0e6
fix: failing test
...
Removed this test case as the new POs will not have the Supplied Items table.
2022-06-30 16:47:43 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting
2022-06-29 17:29:24 +05:30
gn306029
2a619fd789
fix: Modify opts parameter misspell ( #31476 )
...
Modify opts parameter misspell
closes #31474
2022-06-29 14:45:21 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required ( #31408 )
...
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.
This change:
1. Disables updating RM table if no change in qty of FG was made. Since
RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
transferred.
2022-06-27 15:55:08 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
hrzzz
8b1ff96e30
fix: translation for filter status on report
2022-06-21 15:10:19 -03:00
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
s-aga-r
5002f1f1e5
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
2022-06-17 16:47:41 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields ( #31392 )
...
fix(UX): hide UOM-related fields if they are inconsequential
2022-06-17 15:10:21 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() ( #31356 )
...
* refactor: use CURRENT_DATE instead of CURDATE()
* style: reformat to black spec
* refactor: use QB for auto_close queries
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-15 12:07:33 +05:30
s-aga-r
9a68af36ec
Merge branch 'develop' into subcontracting
2022-06-14 19:13:10 +05:30
s-aga-r
ca9d55a2fd
chore: update err msg for FG Item in PO
2022-06-14 13:16:22 +05:30
Conor
00ef499739
refactor: use db independent offset syntax ( #31345 )
...
* chore: use db independent offset syntax
* fix: typo
* style: reformat code to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting
2022-06-13 03:00:53 -07:00
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier ( #31302 )
2022-06-09 19:18:52 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting
2022-06-06 10:27:25 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center
...
fix: Parent dimension filters in orders
2022-06-06 08:58:40 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Deepesh Garg
a6beafbc3c
fix: Permission for selling and buying settings
2022-05-31 19:41:46 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
05f05ab75b
refactor!: Subcontracted Item To Be Transferred
2022-05-20 10:45:33 +05:30
Sagar Sharma
3be663b121
refactor!: Subcontracted Item To Be Received
2022-05-20 10:45:33 +05:30
Sagar Sharma
8486bbf31a
refactor!: Subcontract Order Summary
2022-05-20 10:45:33 +05:30
Sagar Sharma
dafaed3cbd
refactor!: Purchase Order
2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692
refactor!: Make required changes to create SCO from PO
2022-05-20 10:45:30 +05:30
Marica
38e0105125
Merge pull request #30818 from Havenir/feat-request-for-quotation
...
feat: request_for_quotation - show supplier name
2022-05-13 12:16:23 +05:30
Wolfram Schmidt
0bbed414f8
feat: add Link to Opportunity ( #30614 )
...
Adding Link to Opportunity
Following the process of Opportunity to Quotation I added a section and link field to Opportunity for a backlink when using "create"-> Request for Quotation from Opportunity.
2022-05-13 11:59:45 +05:30
marination
90a8e924f5
fix: set_missing_values in SE and re-use the same on all SE mappings
...
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
2022-05-11 14:54:22 +05:30
Ahmad
458f2fcd62
Merge branch 'develop' into feat-request-for-quotation
2022-05-06 11:54:07 +05:00
Francisco Roldan
26654e5e29
fix: supplier quotation comparission report button
2022-05-02 21:07:54 -03:00
Ahmad
04c96b547e
feat: request_for_quotation - refactor
...
- Set supplier as link in while selecting supplier to create quotation
2022-05-02 18:05:21 +05:00
Ahmad
b226e7d2ac
feat: request_for_quotation
...
- Show supplier name if supplier ID is not equal to supplier name
2022-04-27 12:16:03 +05:00
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
rahib-hassan
ebb7bc201b
fix: library import formatting
2022-04-18 14:53:45 +05:30
rahib-hassan
52fd804aed
Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account
2022-04-18 14:13:46 +05:30
Deepesh Garg
0a67b0239e
fix: Consistent customer and supplier forms
2022-04-16 19:43:59 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account
2022-04-14 17:29:28 +05:30
rahib-hassan
4130493b58
fix: Label typo
2022-04-14 16:03:08 +05:30
Suraj Shetty
cef28df8db
test: Do not overwrite frappe.form_dict to retain proxy reference
...
Set frappe.local.form_dict instead
2022-04-13 19:10:19 +05:30
rahib-hassan
1babc5f367
feat: separated discount accounting settings for sales and purchase
2022-04-08 08:05:10 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype
...
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Sagar Sharma
0a3cdc2623
chore: rename "is_subcontracted" field label to "Is Subcontracted"
2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
marination
982a246eec
fix: Add non-existent Item check and cleanup in validate_for_items
...
- Added a validation if invalid item code ia passed via data import/API, etc.
- Used DB APIs instead of raw sql
- Separated checks into separate functions
- Added return types to functions
- Better variable naming and removed redundant utils import in function
2022-03-31 11:47:20 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Deepesh Garg
405dcb1d3c
fix: Add ignore pricelist for missing flows
2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
...
fix: Do not update ignore pricing rule check implicitly
2022-03-16 12:32:25 +05:30
Deepesh Garg
1f79b47a17
fix: Do not update ignore prcing rule check implicitly
2022-03-16 11:55:43 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable
...
fix: Do not update ignore prcing rule check implicitly
2022-03-14 21:46:24 +05:30
marination
a579a211fd
chore: Re-arrange fields for consistency with base currency LHS
2022-03-14 16:15:12 +05:30
marination
dcd88ddc87
fix: Add missing currency option in Supplier Quotation's rounded_total field
2022-03-14 15:57:24 +05:30
Deepesh Garg
96b5cedcf8
fix: Do not update ignore prcing rule check implicitly
2022-03-13 17:48:37 +05:30
Ankush Menat
6c54be0dcd
test: flaky MR report test
...
all test records are on same day so sorting was random in report rows.
2022-03-10 18:08:29 +05:30
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
