marination
cef7dfd0b4
feat: Dialog to select alternative item before creating Sales order
...
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
2023-01-26 14:36:25 +05:30
marination
91982d1e4f
feat: Filter out alternative item rows in taxes and totals for Quotation
...
- Added a Quotation Item field `is_alternative_item`
- Use filtered rows for taxes and totals computation
2023-01-24 18:03:53 +05:30
rohitwaghchaure
b5d2eedfa6
Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item
...
fix: incorrect actual qty for the packed item
2023-01-20 23:38:55 +05:30
Rohit Waghchaure
02566a02a8
fix: incorrect actual qty for the packed item
2023-01-20 22:38:56 +05:30
Deepesh Garg
597ef0a498
fix: Short closed order, receipt and delivery note status on cancellation ( #33743 )
...
* fix: Short closed order, receipt and delivery note status on cancellation
* test: Cancelled status check
2023-01-20 19:44:06 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus ( #33594 )
2023-01-15 17:34:16 +05:30
Deepesh Garg
906ad10d16
fix: Return against internal purchase invoice ( #33635 )
2023-01-15 17:32:57 +05:30
s-aga-r
b26e96cdf4
chore: linter
2023-01-12 13:41:53 +05:30
s-aga-r
6878f40d1d
chore: add row-index in error msgs
2023-01-12 12:02:00 +05:30
Rohit Waghchaure
d1d4671320
feat: provision to disable get last purchase rate
...
fix: set_incoming_rate condition
2023-01-09 18:10:52 +05:30
Rohit Waghchaure
7249657d15
fix: timeout error in the Purchase Invoice
2023-01-09 14:53:54 +05:30
s-aga-r
751bdc98ed
fix: set supplier details while mapping SE(Send to Subcontractor)
2023-01-03 17:17:23 +05:30
Sagar Sharma
d072169340
Merge branch 'develop' into fix/github-issue/28766
2022-12-29 16:38:53 +05:30
s-aga-r
c716dcc01e
fix: consider child nodes while getting bin details
2022-12-29 14:01:42 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) ( #32714 )
...
* fix: Set default uom conversion factor to 1 for invoices
* chore: set default conversion_factor as 1
* chore: remove print statements
2022-12-29 10:41:36 +05:30
barredterra
36997d9788
fix: translation for warning on Overbilling/-receipt/-delivery
2022-12-13 18:59:20 +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
Deepesh Garg
6db52930d8
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-08 18:05:05 +05:30
Deepesh Garg
81397ba3ee
Merge pull request #33227 from barredterra/add-translation-variable-order
...
fix: add translation variable index
2022-12-08 15:17:07 +05:30
barredterra
748c74ba52
fix: add translation variable order
2022-12-05 18:24:22 +01:00
Deepesh Garg
ef9d126254
fix: Allow item rate udpates for non-stock invoices
2022-12-05 10:17:19 +05:30
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
Deepesh Garg
bfb81ef56f
fix: Due date for month end payment term
2022-11-30 20:53:41 +05:30
Deepesh Garg
8287fb5104
Merge pull request #33143 from deepeshgarg007/auto_repeat_dates
...
fix: Auto repeat date validations
2022-11-29 09:28:19 +05:30
Deepesh Garg
6a47fb6c9e
chore: Update condition
2022-11-28 22:47:44 +05:30
Deepesh Garg
fa15221455
fix: Auto repeat date validations
2022-11-28 19:22:35 +05:30
Deepesh Garg
104fdcb9f9
fix: Dispatch address display
2022-11-24 16:41:40 +05:30
ruthra kumar
bf76b85dfd
fix: update advace paid in SO/PO in account currency
2022-11-22 12:33:18 +05:30
s-aga-r
8a73e963ce
fix: don't set rejected-qty in return SCR
2022-11-16 14:28:32 +05:30
s-aga-r
01f56c621c
Revert "fix: get consumed_qty based on received_qty in SCR"
...
This reverts commit 70c9b8dc50
2022-11-15 14:32:16 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers ( #32776 )
2022-11-07 09:21:03 +05:30
Sagar Sharma
70c9b8dc50
fix: get consumed_qty based on received_qty in SCR
2022-11-06 13:33:47 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return
2022-11-05 16:36:07 +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
Sagar Sharma
324bfa9fde
test: fix test case
2022-11-05 16:18:31 +05:30
Sagar Sharma
760c26e9c0
fix: make BOM required in SCR Item
2022-11-05 15:52:14 +05:30
Sagar Sharma
54072ec9cd
fix: map BOM while mapping the return SCR
2022-11-05 15:51:29 +05:30
Deepesh Garg
181df2fe63
fix: Auto advance allocation against partial invoices
2022-11-04 15:49:37 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice
...
feat: Item Wise TDS Calculation
2022-11-04 13:08:10 +05:30
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
niralisatapara
12456f9850
feat: item wise tds calculation
2022-11-03 10:46:30 +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
niralisatapara
2ca0cf6fc4
feat: item wise tds calculation
2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad
Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop
2022-11-02 11:21:02 +05:30
ruthra kumar
4487065b67
fix: update advance paid in SO/PO from Payment Ledger
2022-11-01 10:29:31 +05:30
Deepesh Garg
06e8e28531
fix: Mode of payment for returns in POS Sales Invoice
2022-10-31 19:58:46 +05:30
Rohit Waghchaure
5f84993bae
test: added test case to validate seachfields for customer, supplier
2022-10-24 16:10:47 +05:30
Rohit Waghchaure
46d148defd
fix: searchfield not working for cuctsomer, supplier as per customize form
2022-10-24 15:48:34 +05:30
Deepesh Garg
9aa5e20ef7
chore: check only for inter-company transfers
2022-10-12 15:53:28 +05:30
