Sagar Vora
1f4fa90072
Revert "fix: use correct filter name in reports"
2023-01-25 16:19:44 +05:30
Sagar Sharma
58dab9ca8b
Merge pull request #33810 from resilient-tech/fix-quality-inspection-item-query
...
fix: use correct filter name in reports
2023-01-25 16:15:04 +05:30
Daizy Modi
def759d2e8
fix: use correct filter name in reports
2023-01-25 15:57:39 +05:30
marination
f19eadab9a
feat: Consider filtered items table in JS for totals computation
...
- Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API
- Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows
2023-01-25 13:10:03 +05:30
Devin Slauenwhite
a504b6eac0
fix: make title field readonly
2023-01-24 18:21:08 -05:00
Rohit Waghchaure
92d857d49c
fix: purchase invoice performance issue
2023-01-24 22:32:07 +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
Sagar Sharma
a067a904a1
Merge pull request #33797 from s-aga-r/fix-sco-status
...
chore: add `Cancelled` status in SCO `get_indicator`
2023-01-24 17:33:57 +05:30
Sagar Sharma
302f5e27be
Merge branch 'develop' into fix-sco-status
2023-01-24 17:33:29 +05:30
s-aga-r
840f9d8987
chore: add Cancelled status in SCO get_indicator
2023-01-24 17:30:37 +05:30
rohitwaghchaure
a5478c61af
Merge pull request #33790 from rohitwaghchaure/fix-web-supplier-quotation-from-rfq
...
fix: web supplier quotation
2023-01-24 15:59:04 +05:30
Raffael Meyer
d155042edd
ci: documentation helper ( #33757 )
...
refactor: documentation helper
2023-01-24 11:42:44 +05:30
Anand Baburajan
84383087a6
Merge pull request #33789 from AnandBaburajan/update_translations_for_naming_series_error
...
chore: update translations for naming series error
2023-01-23 18:48:10 +05:30
anandbaburajan
4e6066f929
chore: fix translations
2023-01-23 18:07:32 +05:30
Rohit Waghchaure
7800db7c0d
fix: web supplier quotation
2023-01-23 14:21:10 +05:30
Anand Baburajan
7d5df407c4
Merge branch 'develop' into update_translations_for_naming_series_error
2023-01-23 14:19:39 +05:30
anandbaburajan
bbde1f611f
chore: update translations for naming series error
2023-01-23 14:16:31 +05:30
s-aga-r
9ae3a54ce9
chore: add method get_picked_items_details()
2023-01-23 13:48:26 +05:30
rohitwaghchaure
b3a216c8f8
Merge pull request #33785 from rohitwaghchaure/get-items-from-transit-entry
...
feat: get items from Transit Stock Entry
2023-01-23 13:03:53 +05:30
Rohit Waghchaure
62141b0b63
feat: get items from Transit Stock Entry
2023-01-23 12:01:57 +05:30
Deepesh Garg
a3c89dbc10
fix: TDS deduction in payment entry ( #33747 )
...
* fix: TDS deduction in payment entry
2023-01-22 23:31:19 +05:30
Xeanth
ad437fd5ba
fix: use stock qty to calculate POS reserved stock ( #33735 )
2023-01-22 18:06:01 +05:30
Sagar Sharma
7a8e89e2fe
fix: incorrect rate and amount in MR Item ( #33547 )
...
* fix: incorrect `rate` and `amount` in MR Item
2023-01-22 18:04:13 +05:30
Sagar Sharma
72be489b1b
Merge pull request #33778 from barredterra/fix-missing-const
...
fix: missing constant definition
2023-01-21 22:28:49 +05:30
barredterra
547d37b1db
fix: missing constant definition
2023-01-21 17:29:43 +01:00
Deepesh Garg
2f03dcb5b6
fix: Better budget exceeding validation messages ( #33713 )
...
* fix: Better budget exceeding validation messages
* chore: remove unwanted changes
2023-01-21 19:33:14 +05:30
s-aga-r
57c3216683
refactor: rewrite get_available_item_locations_for_serial_and_batched_item query in QB
2023-01-21 14:05:51 +05:30
s-aga-r
5b76e8b193
refactor: rewrite get_available_item_locations_for_serialized_item query in QB
2023-01-21 12:45:39 +05:30
s-aga-r
58dd40a2d7
refactor: rewrite get_available_item_locations_for_other_item query in QB
2023-01-21 12:15:45 +05:30
rohitwaghchaure
f6f64083d2
Merge pull request #33760 from rohitwaghchaure/allow-to-change-bom-in-sco
...
fix: not able to change default BOM in the Subcontracting Order
2023-01-21 12:04:50 +05:30
s-aga-r
29bf787313
refactor: rewrite get_picked_items_qty query in QB
2023-01-21 11:28:23 +05:30
ruthra kumar
4cbd63edbf
Merge pull request #33710 from openrefactory/patch-2
...
Removed an unnecessary check in code which always evaluates to true
2023-01-21 09:41:04 +05:30
OpenRefactory, Inc
49aed7ff69
fix: removed an unnecessary check which always evaluates to true
2023-01-21 06:15:51 +05:30
Kevin Shenk
e4bceaaf66
feat: Copy project_name, from_time, to_time from timesheet details to sales invoice ( #33726 )
...
feat: Copy project_name, from_time, to_time from timesheet details to sales invoice
2023-01-20 23:39:37 +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
11b2994fe8
fix: not able to change default BOM in the Subcontracting Order
2023-01-20 23:27:49 +05:30
Rohit Waghchaure
02566a02a8
fix: incorrect actual qty for the packed item
2023-01-20 22:38:56 +05:30
rohitwaghchaure
d462d6de06
Merge pull request #33595 from vishdha/fg_based_operating_cost
...
feat: Add operating cost based on bom quanity without creating job card
2023-01-20 22:36:42 +05:30
Dany Robert
1e607cd4c7
fix(pricing rule): free item duplication ( #33746 )
...
* fix(pricing rule): free item duplication
* chore: linting issues
2023-01-20 20:07:37 +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
327b6fdb32
fix: calculate correct amount for qty == 0 ( #33739 )
2023-01-20 19:35:27 +05:30
Sabu Siyad
a94aa7a79f
fix(ecommerce): breadcrumb: fallback to /all-products ( #33718 )
...
* fix(ecommerce): breadcrumb: fallback to `/all-products`
* fix(item_group): use `==` instead of `is`
* test(ecommerce): breadcrumb
2023-01-20 18:54:54 +05:30
Ritwik Puri
17045f88a1
fix: use hash based naming for tax withheld vouchers child table ( #33643 )
2023-01-20 18:53:39 +05:30
Dany Robert
ef90e24931
chore: linting issue
2023-01-19 10:25:05 +00:00
Dany Robert
e8e20da78e
fix(gp): fetch buying amount from dn related to so
2023-01-19 09:39:43 +00:00
Sagar Sharma
cceb7922a5
Merge pull request #33619 from SvbZ3r0/item-attr-abbr-lowercase
...
fix: rewrite logic for duplicate check in Item Attribute
2023-01-19 13:27:43 +05:30
Sagar Sharma
333b2ae721
Merge branch 'develop' into item-attr-abbr-lowercase
2023-01-19 12:55:49 +05:30
rohitwaghchaure
ecfebfec57
Merge pull request #33723 from rohitwaghchaure/fixed-issue-of-item-variant
...
fix: don't add template item in sales/purchase transaction
2023-01-19 12:42:04 +05:30
Rohit Waghchaure
2c83fff1a1
fix: don't add template item in sales/purchase transaction
2023-01-18 23:29:06 +05:30
mergify[bot]
cc569c955f
fix: the frappe throw message is corrected in the group task validation ( #33698 )
...
fix: the frappe throw message is corrected in the group task validation (#33698 )
2023-01-18 21:47:22 +05:30
