Sabu Siyad
|
9e50aa4833
|
feat(pos): multiple item prices (#33005)
* fix(pos): multiple item prices
feat: show uom with product price
feat: multiple item (variant) depending on uom
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): consider uom for new item
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): uom based stock display
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* use `//` instead of `math.floor()`
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(pos): uom by barcode
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* fix: replace `is not` with `!=`
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* fix(pos): barcode_info `next()`: fallback
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* chore: format
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* Update erpnext/selling/page/point_of_sale/point_of_sale.py
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* chore: un-ignore unused local variable
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
---------
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
|
2023-01-28 10:28:31 +05:30 |
|
Deepesh Garg
|
3598bcc9a8
|
chore: ERPNext setup wizard cleanup (#33675)
* chore: ERPNext setup wizard cleanup
* chore: Remove default website
* chore: Remove flaky tests
* chore: remove unwanted tests
|
2023-01-27 14:40:39 +05:30 |
|
ruthra kumar
|
9dd6b3c950
|
Merge pull request #33835 from ruthra-kumar/skip_validation_on_migration
fix(patch): validation error on cost center allocation migration
|
2023-01-27 13:40:57 +05:30 |
|
ruthra kumar
|
de10f2dc00
|
fix(patch): validation error on cost center allocation migration
If Distributed cost centers have GL postings on patch run date,
patch failes with valiation error.
|
2023-01-27 12:08:18 +05:30 |
|
Sagar Vora
|
7e592fdf91
|
Merge pull request #33831 from dj12djdjs/perf-update-items
perf: show update items dialog
|
2023-01-27 04:17:39 +00:00 |
|
Devin Slauenwhite
|
a835c1a418
|
perf: show update items dialog
|
2023-01-26 16:53:05 -05:00 |
|
ruthra kumar
|
b31b850db8
|
fix: disfuctional cost center filter on Journal Entries (#33815)
* fix: missing cost_center filter for journal entries
* test: cost center filter on invoices, journals and payments
|
2023-01-26 20:26:21 +05:30 |
|
Vishal Dhayagude
|
c5ca8d74c4
|
fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800)
* fix: GST Category validation is given for pos customer
|
2023-01-26 15:45:51 +05:30 |
|
Anand Baburajan
|
e3d7426b47
|
Merge pull request #33823 from AnandBaburajan/fix_translations
chore: remove broken translation
|
2023-01-26 13:46:16 +05:30 |
|
anandbaburajan
|
21f425660d
|
chore: remove broken translation
|
2023-01-26 13:15:01 +05:30 |
|
Ankush Menat
|
33b68552f1
|
chore: remove broken translation
[skip ci]
|
2023-01-25 17:35:23 +05:30 |
|
Daizy Modi
|
da323cbb40
|
fix: use correct filter name in item_query (#33814)
|
2023-01-25 17:32:21 +05:30 |
|
Sagar Vora
|
41222659a6
|
Merge pull request #33813 from frappe/revert-33810-fix-quality-inspection-item-query
Revert "fix: use correct filter name in reports"
|
2023-01-25 10:50:03 +00:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|