Sabu Siyad
2f4940cc26
fix(pos): item selector image border radius
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 13:21:47 +05:30
Vishal
71412f6877
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt
2022-11-16 13:53:21 +05:30
Ankush Menat
c013db6ea1
fix: cast POS query inputs to integers ( #32975 )
...
fix: cast POS query inputs to integers
2022-11-15 18:10:45 +05:30
Deepesh Garg
06a42caa5b
Merge pull request #32923 from deepeshgarg007/rate_quotation
...
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 19:52:27 +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
Deepesh Garg
362ec7b673
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 18:28:08 +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
Deepesh Garg
90fbab4b1e
Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter
...
fix: Create POS Opening Entry POS Profile filter.
2022-11-05 16:44:39 +05:30
Deepesh Garg
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances
...
fix: Auto advance allocation against partial invoices
2022-11-05 16:27:59 +05:30
Deepesh Garg
428971f127
test: Check parital payment allocation
2022-11-04 15:50:39 +05:30
Maharshi Patel
1328a45f2a
fix: Create POS Opening Entry POS Profile filter.
...
pos_profile_query was variable instead of function.
2022-11-04 15:29:17 +05:30
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9
...
fix: add missing translation function on report related documents
2022-11-03 09:46:43 +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
721ac6b847
test: SO advance paid on Payment submission and cancellation
2022-11-02 15:54:23 +05:30
Deepesh Garg
b98d25dafb
Merge pull request #32777 from deepeshgarg007/sales_order_advance_paid_amount
...
fix: Reset advance paid amount on Order cancel and amend
2022-10-31 21:38:43 +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
cca36cab70
Merge pull request #32744 from ruthra-kumar/so_terms_report_enhancement
...
refactor: additional filters on Payment Terms status report
2022-10-29 11:09:43 +05:30
Deepesh Garg
25eac80ae6
Merge pull request #32718 from deepeshgarg007/total_sales_amount_project
...
fix: Total Sales amount update in project via Sales Order
2022-10-28 20:46:00 +05:30
ruthra kumar
fed39a53cb
test: due date filter on Payment Terms report
2022-10-28 18:15:58 +05:30
ruthra kumar
4765f937ea
fix: key error in filter access
2022-10-28 17:50:01 +05:30
ruthra kumar
aadb6b1772
feat: additional filters on Payment terms report
...
Filter on Status and Due dates
2022-10-28 17:46:06 +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
6063c4e3c0
fix: Total Sales amount update in project via Sales Order
2022-10-26 18:01:39 +05:30
Deepesh Garg
4cd65027c4
fix: Add condition for discount section collapse
2022-10-26 16:48:24 +05:30
Ernesto Ruiz
b7b53b5857
fix: correct linters
2022-10-25 22:34:21 -06:00
Ernesto Ruiz
083a78135c
fix: add translate function to period in sales_analytics.py
2022-10-25 22:17:06 -06:00
Rohit Waghchaure
5f84993bae
test: added test case to validate seachfields for customer, supplier
2022-10-24 16:10:47 +05:30
Raffael Meyer
4ad3002861
fix: allow to create Sales Order from expired Quotation ( #32641 )
2022-10-19 22:07:02 +05:30
Deepesh Garg
fd49503ba2
fix: Party account for multi-order invoices
2022-10-13 15:08:34 +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
7546562139
feat: Tab Break in Quotation
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
Maharshi Patel
e392ea1104
fix: POS properly validate stock for bundle products
...
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
2022-09-27 23:44:56 +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
ruthra kumar
77fdc37cb7
fix: use default supplier currency if default supplier is enabled
2022-09-17 16:34:33 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
MOHAMMED NIYAS
69ffef8c0e
fix: lost quotation not to expired
2022-08-29 14:47:43 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order
2022-08-26 11:18:56 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics
...
fix: for Tree Type item and item group show net amout
2022-08-25 11:05:18 +05:30
ruthra kumar
3b4c0a3fc0
fix(minor): don't print tax rate if its '0' ( #31838 )
2022-08-16 16:35:46 +05:30
ruthra kumar
bb40e38451
fix: limit pos recent order page result
2022-08-09 19:35:43 +05:30
hrzzz
91762097a5
fix: for Tree Type item and item group show net amout
2022-08-03 13:09:23 -03:00
ruthra kumar
9439a7fd30
Merge pull request #31576 from ruthra-kumar/return_not_updating_so_billed_percentage
...
fix: credite note for returned delivery note updates SO's billed percentage
2022-07-25 11:24:00 +05:30
Deepesh Garg
538f5a9964
Merge pull request #31497 from HarryPaulo/develop
...
fix: translated message for credit limit blocking
2022-07-22 14:22:58 +05:30
Deepesh Garg
80b354f1c7
Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return
...
fix: use current pos profile on sales return
2022-07-22 13:10:53 +05:30
ruthra kumar
243f66fcd3
test: SO percentage billed when cr_note made against delivery return
2022-07-21 13:05:34 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice ( #31615 )
2022-07-21 12:17:58 +05:30
ruthra kumar
5b85af5f1a
fix: use current pos profile on sales return
2022-07-21 12:16:16 +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
Ankush Menat
3031592368
chore: form tour location
...
closes https://github.com/frappe/frappe/issues/17247
[skip ci]
2022-07-11 11:50:57 +05:30
Deepesh Garg
f73408bfd6
fix: Unable to open quotation
2022-07-07 10:47:48 +05:30
hrzzz
8cd3eb5286
fix: translation / linters
2022-07-04 08:02:02 -03:00
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
hrzzz
fbb71a2611
fix: translated message for credit limit blocking
2022-06-30 16:14:51 -03:00
Ankush Menat
20dac08f5f
refactor: clean up product bundle client side code ( #31455 )
...
refactor: clean up product bundle cient side code
- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema
2022-06-27 15:54:54 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn
2022-06-25 19:46:20 +05:30
Nabin Hait
f904ac599e
fix: merge conflicts and sider issues
2022-06-25 11:40:23 +05:30
Deepesh Garg
58fe220479
fix: Quotation and Sales Order item sync
2022-06-24 19:43:50 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
Devin Slauenwhite
199b8dd0e3
Merge branch 'develop' into fix-reserve-qty
2022-06-22 14:06:35 -04:00
hrzzz
8b1ff96e30
fix: translation for filter status on report
2022-06-21 15:10:19 -03:00
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss
2022-06-21 10:45:02 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
Devin Slauenwhite
6a6c560375
fix: move to transcation settings
2022-06-17 15:51:11 -04:00
Devin Slauenwhite
7855a59843
Merge branch 'develop' into fix-reserve-qty
2022-06-17 14:39:31 -04:00
Devin Slauenwhite
494bbf0124
feat: add checkbox to reserve qty on sales return
2022-06-17 13:51:33 -04:00
Deepesh Garg
e457288dba
chore: fix condition
2022-06-17 18:56:53 +05:30
Deepesh Garg
02f9441e1a
fix: Quotation lost update
2022-06-17 18:54:42 +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
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
Marica
fafdaff4d4
Merge branch 'develop' into so-to-wo-bom
2022-06-15 12:58:13 +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
Nihantra C. Patel
37e9622426
fix: Spelling mistake in quotation depend on ( #31362 )
...
Update quotation.json
2022-06-15 12:02:57 +05:30
marination
9f2d325e67
fix: Pick Template BOM if variant BOM absent in WO popup from SO
...
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked
2022-06-14 17:20:44 +05:30
Deepesh Garg
5b2ba087a3
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-14 10:50:47 +05:30
Deepesh Garg
fb3da124e5
chore: linting issues
2022-06-14 10:50:38 +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
Deepesh Garg
eb93564db6
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-11 21:56:24 +05:30
Deepesh Garg
118c786e63
fix: Partially Ordered status for quotation
2022-06-11 21:55:59 +05:30
Deepesh Garg
2fc04f661a
fix: Company address filter in quotation
2022-06-10 19:23:17 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch ( #31315 )
...
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction
Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
2022-06-10 13:52:17 +05:30
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier ( #31302 )
2022-06-09 19:18:52 +05:30
Ankush Menat
65b21ee7d6
fix: internal transfer GLE validation
2022-06-08 19:26:40 +05:30
Deepesh Garg
2041738e04
Merge pull request #31194 from ruthra-kumar/bug_sales_order_analysis_report
...
fix: incorrect billed_qty in sales order analysis report when multiple delivery notes for item
2022-06-06 16:39:13 +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
Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report
2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix
...
fix: Permission for selling and buying settings
2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM ( #31168 )
...
* fix: Auto Insert Item Price If Missing when discount and blank UOM
fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom
* unit tests added for item with discount
I have added test for auto_insert_price where discount is used.
* unit test issue fixed
fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.
Co-authored-by: Ankush Menat <me@ankush.dev>
2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c
fix: Permission for selling and buying settings
2022-05-31 19:41:46 +05:30
ruthra kumar
4f1bfbb93d
test: multiple delivery notes and billed quantity
2022-05-31 17:24:36 +05:30
ruthra kumar
0331e37982
fix: incorrect billed_qty when item has multiple Delivery note
...
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
2022-05-31 17:15:31 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
Deepesh Garg
5edd1dbb35
Merge pull request #31004 from ruthra-kumar/bug_payment_terms_status_rpt
...
fix: duplicate entries in payment terms report output
2022-05-20 07:53:40 +05:30
Ankush Menat
0e875f5049
fix: hide template items from sales/purchase order
2022-05-16 12:14:07 +05:30
ruthra kumar
e826093150
fix: multiple entries for same payment term
2022-05-13 14:24:06 +05:30
Ankush Menat
ee0a277540
fix: prevent bypassing forced valuation rate
...
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
2022-05-12 19:01:26 +05:30
Gavin D'souza
7bf0e4f8e5
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 15:58:31 +05:30
Saqib Ansari
867494edad
fix(pos): creating pos returns resets pricing rules & discounts ( #30935 )
2022-05-09 15:05:05 +05:30
Ankush Menat
91cd5f5d4a
fix: show group warehouse in Sales Order ( #30891 )
2022-05-04 13:07:58 +05:30
Deepesh Garg
19d66e5219
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency
2022-04-30 22:15:27 +05:30
Deepesh Garg
0cb36cc18c
Merge branch 'develop' into payment_term_rpt_on_selling
2022-04-28 21:22:38 +05:30
Ankush Menat
9a8e3ef235
fix(UX): only show pick list when picking is pending
...
[skip ci]
2022-04-27 14:43:42 +05:30
Ankush Menat
47e1a0104c
fix: dont map picked qty and consider pick qty for new PL
...
Co-Authored-By: marination <maricadsouza221197@gmail.com>
2022-04-27 13:44:19 +05:30
Ankush Menat
8207697e43
fix: compare against stock qty while validating
...
Other changes:
- only allow whole number of bundles to get picked
2022-04-27 12:51:18 +05:30
Ankush Menat
c3fc0a4f55
perf: single update per Sales Order.
...
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f
feat: Pick list from SO with Product Bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc
refactor: misc pick list refactors
...
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
2022-04-27 12:05:15 +05:30
Saqib Ansari
078f26bef3
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix
...
fix(pos): search field doesn't reset on checkout
2022-04-26 14:47:22 +05:30
Saqib Ansari
b1ac5ff9d2
fix(pos): number pad translations
2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5
fix(pos): search field doesn't reset on checkout
2022-04-26 14:28:33 +05:30
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
ruthra kumar
b0ead459a0
feat: add payment terms status rpr to Selling homepage
2022-04-26 13:30:13 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account
2022-04-25 12:17:50 +05:30
marination
8d632e9b9c
style: Re-run pre-commit
2022-04-22 16:27:29 +05:30
marination
b848e61954
fix: Skip unpublished Variants with published templates in shopping cart quote validation
2022-04-22 16:25:56 +05:30
Devin Slauenwhite
53d8168dea
fix: linter format string after translation
2022-04-22 16:25:28 +05:30
Devin Slauenwhite
ea6d6e31b3
fix: linter trilaing whitespace
2022-04-22 16:25:21 +05:30
Devin Slauenwhite
48da3b4482
fix: sider issues
2022-04-22 16:23:18 +05:30
Devin Slauenwhite
b88d5d135e
fix(test): validate exception without website item
2022-04-22 16:23:07 +05:30
Devin Slauenwhite
86832fb7fe
test: assert error if quotation contains non website item
2022-04-22 16:22:58 +05:30
Devin Slauenwhite
678a1179d4
fix: shopping cart quotation without website item
2022-04-22 16:22:32 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account
2022-04-21 15:06:58 +05:30
Deepesh Garg
d96bfe13a8
Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report
...
fix: SO's without delivery note will also be fetched
2022-04-18 19:58:37 +05:30
rahib-hassan
bcfbb3e9c8
fix: code formatting
2022-04-18 15:04:47 +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
5cdd0d6719
fix: Move tax withholding category field
2022-04-16 20:34:56 +05:30
Deepesh Garg
0a67b0239e
fix: Consistent customer and supplier forms
2022-04-16 19:43:59 +05:30
ruthra kumar
13487e2408
test: Sales order analysis report
2022-04-16 12:02:32 +05:30
ruthra kumar
e28e6726f1
fix: SO analysis rpt will fetch SO's without Delivery note as well
2022-04-14 18:37:46 +05:30
rahib-hassan
4130493b58
fix: Label typo
2022-04-14 16:03:08 +05:30
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account
2022-04-11 14:55:42 +05:30
Ankush Menat
c3e1f0e369
refactor: ignore mandatory fields during setup
2022-04-11 13:19:17 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-09 19:57:59 +05:30
mergify[bot]
51d77cd85e
fix(pos): cannot change paid amount in pos payments ( #30660 )
2022-04-09 16:28:10 +05:30
rahib-hassan
1babc5f367
feat: separated discount accounting settings for sales and purchase
2022-04-08 08:05:10 +05:30
Ankush Menat
8d57c853f3
feat: barcode scanning in quotation ( #30637 )
2022-04-07 21:40:03 +05:30
Sagar Vora
fa4f57f470
fix: dont reassign mutable (list) to a different field
2022-04-07 16:51:27 +05:30
Deepesh Garg
f3e6a26d34
Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter
...
feat: 'customer' column and more filter to Payment terms status report
2022-04-07 13:01:16 +05:30
Ankush Menat
ba42c87687
refactor: don't use pandas for basic reports ( #30597 )
2022-04-06 15:40:41 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-06 10:00:51 +05:30
ruthra kumar
16bfb930f8
test: added test cases for group filters
2022-04-05 11:08:09 +05:30
ruthra kumar
b2ed9fd3fe
refactor: use group fields from Sales Order and Sales Order Items
2022-04-04 17:00:47 +05:30
Saqib Ansari
fed66038b5
fix(pos): do not reset search input on item selection ( #30537 )
2022-04-04 15:59:16 +05:30
ruthra kumar
e324d668d3
refactor: item filters are linked with group filters
2022-04-04 14:52:19 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Deepesh Garg
c58fde2fb2
fix: Add competitor field back
2022-04-02 20:03:46 +05:30
Deepesh Garg
485f5cfdfe
fix: Resolve conflicts
2022-04-02 17:25:29 +05:30
Deepesh Garg
0f6d52c625
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385
2022-04-02 17:24:19 +05:30
Ankush Menat
47f27a5171
refactor: move scan api to stock utils; add item_info
2022-04-01 21:11:03 +05:30
Ankush Menat
767b827b59
feat: return batch code while scanning serial no
2022-04-01 21:11:03 +05:30
ruthra kumar
7558f1b078
refactor: adding new filters and column to test cases
2022-03-30 18:50:18 +05:30
ruthra kumar
eaeadbc422
feat: additional filters in payment terms status report
2022-03-30 18:50:13 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code ( #30462 )
2022-03-29 11:21:03 +05:30
Deepesh Garg
03952f8819
fix(India): Auto tax fetching based on GSTIN
...
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)
# Conflicts:
# erpnext/patches.txt
# erpnext/regional/india/setup.py
# erpnext/selling/doctype/quotation/quotation.json
2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again
2022-03-24 11:18:13 +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
Saqib Ansari
aff7408775
fix(pos): allow validating stock on save
2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869
fix(pos): specific case when serialized item not removed
2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef
fix(pos): customer group filter in customer selector
2022-03-21 12:47:35 +05:30
Saqib Ansari
d5fd8e0ba6
fix: prevent multiple save on applying coupon code
2022-03-21 11:36:30 +05:30
barredterra
36df21067c
refactor: sales analytics
2022-03-20 03:58:24 +01:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN
...
feat: Create single PL/DN from several SO.
2022-03-17 15:39:45 +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
Krithi Ramani
9f7fee7a4f
Added new field in SO - % Picked
2022-03-15 21:40:51 +05:30
Krithi Ramani
a68213d82e
added new field - Picked Qty, in Sales Order Item
2022-03-15 20:18:23 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable
2022-03-14 15:49:21 +05:30
Saqib Ansari
f5f6650779
Merge pull request #30217 from nextchamp-saqib/fix-so-to-po
...
fix: cannot create purchase order from sales order
2022-03-14 12:35:32 +05:30
Saqib Ansari
58804b8436
fix: cannot create purchase order from sales order
2022-03-14 12:31:13 +05:30
Deepesh Garg
96b5cedcf8
fix: Do not update ignore prcing rule check implicitly
2022-03-13 17:48:37 +05:30
Deepesh Garg
d596e0e4df
fix: Shipping rule application fixes
2022-03-10 20:56:36 +05:30
Saqib Ansari
baee5d109e
Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update
...
fix: customer credit limit validation on update
2022-03-09 11:42:14 +05:30
Deepesh Garg
9be3bc1dbf
Merge pull request #30080 from deepeshgarg007/item_wise_sales_history
...
fix: Item-wise sales history report
2022-03-09 10:18:14 +05:30
Saqib Ansari
1061256358
Merge branch 'develop' into fix-customer-credit-limit-update
2022-03-08 16:01:17 +05:30
Saqib Ansari
a0dc79332d
fix: customer credit limit validation on update
2022-03-08 15:21:27 +05:30
Deepesh Garg
83dd3bd7fc
Merge pull request #29940 from deepeshgarg007/item_discounts_quotation
...
fix: Item discounts for quotation and other docs
2022-03-08 09:08:51 +05:30
Deepesh Garg
e2c144e9e3
fix: Item-wise sales history report
2022-03-06 19:05:02 +05:30
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items
2022-03-02 12:13:56 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation
2022-03-01 11:49:25 +05:30
Ankush Menat
b0d1e6db54
test(refactor): use FrappeTestCase
2022-02-28 17:23:32 +05:30
Deepesh Garg
1b186682ea
Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check
2022-02-28 12:42:21 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items
2022-02-28 11:35:42 +05:30
Saqib Ansari
81514516f3
fix(pos): coupon code is applied even if ignore pricing rule is check
2022-02-25 15:18:06 +05:30
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +05:30
Deepesh Garg
0373914704
fix: Commission not applied while making Sales Order from Quotation
2022-02-24 14:42:56 +05:30
Deepesh Garg
3a547cb0d9
fix: Item discounts for quotation
2022-02-22 16:25:32 +05:30
Saqib Ansari
8e3f1e306d
test: po updates packed item's ordered_qty
2022-02-22 15:34:26 +05:30
Saqib Ansari
8005fee656
feat: update ordered qty for packed items
2022-02-22 15:06:19 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item ( #29903 )
2022-02-21 14:22:14 +05:30
Saqib Ansari
fa38c291bd
fix(pos): removal of coupon code
2022-02-21 11:38:16 +05:30
Saqib Ansari
2743999785
fix: coupon code is applied even if ignore_pricing_rule is enabled
2022-02-17 16:03:43 +05:30
Deepesh Garg
d251bec380
Merge pull request #29137 from ruthra-kumar/payment_terms_report
...
feat: Payment Terms Status report
2022-02-16 14:15:24 +05:30
Deepesh Garg
2f5bfcc055
Merge branch 'develop' into payment_terms_report
2022-02-16 10:06:12 +05:30
Marica
e6fa33012f
Merge branch 'develop' into so-mr-wo-back-update
2022-02-15 17:51:54 +05:30
ruthra kumar
48f37c7659
test: added test for alternate currency
...
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency
2022-02-15 17:21:08 +05:30
ruthra kumar
49fdc6c52e
test: refactor and fix failing test case
2022-02-15 17:20:29 +05:30
Ankush Menat
f89a64db48
fix: dont attempt to set batch number if item doesn't have batch no ( #29812 )
...
This causes other triggers and unnecessary changes (e.g. price list)
2022-02-15 16:10:35 +05:30
marination
0ca58d7627
chore: Patch to update SO work_order_qty and Linter fix
2022-02-15 14:28:00 +05:30
marination
f9d52e7346
test: SO > MR > WO flow
2022-02-15 13:38:15 +05:30
ruthra kumar
a4b8d67323
refactor: create invoices list without if else
2022-02-15 12:20:41 +05:30
ruthra kumar
85ed0fb8d6
fix: default to company currency in report output
2022-02-15 12:20:06 +05:30
ruthra kumar
bc244d0740
refactor: currency field and code cleanup
2022-02-14 17:48:16 +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
Deepesh Garg
4284017e9d
fix: Copyright info
2022-02-07 12:26:01 +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
Deepesh Garg
c5726fd3da
fix: Add test case
2022-02-06 11:35:40 +05:30
Marica
384e6b559b
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 21:10:04 +05:30
Saqib Ansari
e082e3f702
fix(pos): pricing rule on transactions doesn't work
2022-02-02 19:33:48 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items
2022-02-01 12:25:25 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Anupam Kumar
896adc3759
fix: not able to declare opportunity lost without competitors ( #29531 )
2022-01-31 12:09:54 +05:30
Saqib Ansari
6b377703b3
Merge pull request #29454 from nextchamp-saqib/fix-dn-mapping
...
fix(sales order): incorrect no. of items fetched while creating dn
2022-01-31 11:38:57 +05:30
Anupam Kumar
925eca0e4a
fix: multiple CRM fixes ( #29507 )
...
* fix: multiple CRM fixes
2022-01-29 22:32:03 +05:30
Saqib Ansari
4c8408a572
Merge branch 'develop' into fix-dn-mapping
2022-01-29 12:42:19 +05:30
Suraj Shetty
29c7947db0
fix: Further sort sales_order_analysis to get consistent response
...
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.
2022-01-27 11:11:37 +05:30
Saqib Ansari
0b9a850a17
chore: add comment
2022-01-25 17:28:28 +05:30
Saqib Ansari
a73ad6759d
fix(sales order): incorrect no. of items fetched while creating dn
2022-01-25 17:12:41 +05:30
rohitwaghchaure
a3ec78991f
Merge pull request #29353 from anupamvs/crm-contact-duplication-develop
...
fix: contact duplication on converting lead to customer
2022-01-24 10:16:49 +05:30
Saqib Ansari
53addfda15
fix: sider issue
2022-01-21 12:23:52 +05:30
Saqib Ansari
50c276f64f
fix: bypass_credit_limit_check in credit balance report
2022-01-20 10:56:49 +05:30
Anupam
6ebee9b4c4
fix: changed function name
2022-01-19 13:05:48 +05:30
Anupam
e44c4e007a
fix: contact duplication on converting lead to customer
2022-01-19 12:54:00 +05:30
Subin Tom
845c02a989
fix: remove qty indicator from non stock items
2022-01-17 20:49:11 +05:30
Subin Tom
27b35d72e2
fix: sider fix
2022-01-17 19:53:39 +05:30
Subin Tom
ac9a9fb229
fix: removing get_value call by returning is_stock_item in get_stock_availability method
2022-01-17 19:38:05 +05:30
Shariq Ansari
469bddcadf
fix: minor fix
2022-01-13 19:50:26 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Saqib Ansari
aef432ee2f
fix: description not fetched in sales order analytics report ( #29230 )
2022-01-12 13:11:21 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
ruthra
4535a7a301
test: qty and rate changed to remove need for fractional Nos
2022-01-05 10:46:32 +05:30
ruthra
edd980acdc
refactor: remove unused imports
2022-01-05 10:43:20 +05:30
ruthra
9f1e68801d
test: fix failing test case payment terms status
2022-01-05 10:11:19 +05:30
Subin Tom
19bb01c973
fix: POS items added to cart despite low qty ( #29126 )
2022-01-04 19:14:40 +05:30
Saqib Ansari
f4db474be0
fix: minor issues ( #29130 )
2022-01-04 19:12:19 +05:30
ruthra
1bac793083
feat: Payment Terms Status report
...
- calculate status at runtime for payment terms based on invoices
- invoices are used in FIFO method
2022-01-04 15:53:41 +05:30
Subin Tom
9e20fa85c1
fix: Removed validate_non_stock_items, filter_service_items methods
2022-01-03 14:46:53 +05:30
Subin Tom
6b973d658c
fix: sider issues
2022-01-03 10:47:13 +05:30
