Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,290 Commits 3 Branches 0 Tags 1 GiB
82490d9f55
Commit Graph

34296 Commits

Author SHA1 Message Date
Rohit Waghchaure
0d7f98b496 fix: item rate not fetching 2023-01-28 13:51:33 +05:30
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
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
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
1f4fa90072
Revert "fix: use correct filter name in reports" 2023-01-25 16:19:44 +05:30
Daizy Modi
def759d2e8 fix: use correct filter name in reports 2023-01-25 15:57:39 +05:30
Devin Slauenwhite
a504b6eac0 fix: make title field readonly 2023-01-24 18:21:08 -05:00
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
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
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
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
Sagar Sharma
f89600aee8
Merge branch 'develop' into refactor/qb/pick-list 2023-01-18 17:52:23 +05:30
Rohit Waghchaure
1de4742ffb fix: local variable 'stock_rbnb' referenced before assignment 2023-01-18 15:29:39 +05:30
Sagar Sharma
eee3bd2554
Merge branch 'develop' into refactor/qb/pick-list 2023-01-18 13:01:59 +05:30
Deepesh Garg
6b31c27ed6
fix: Missing constructor args in Bank Reco Tool (#33705) 2023-01-17 21:03:39 +05:30
Vishal Dhayagude
c4e1f81ccb
Merge branch 'develop' into fg_based_operating_cost 2023-01-17 19:20:37 +05:30
Anand Baburajan
c6cfacc108
Merge branch 'develop' into misc_asset_fixes 2023-01-17 15:09:37 +05:30
Deepesh Garg
db9beb3cdd
fix: Rate from LDC in TDS reports (#33699) 2023-01-17 14:53:24 +05:30
Vishal Dhayagude
f19212b5c8
Merge branch 'develop' into fg_based_operating_cost 2023-01-17 13:02:25 +05:30
Anand Baburajan
d97127bff2
Merge branch 'develop' into misc_asset_fixes 2023-01-17 12:57:22 +05:30
Sagar Sharma
eeed3356ac
Merge branch 'develop' into refactor/qb/pick-list 2023-01-17 12:25:16 +05:30
rohitwaghchaure
e68c4e2aa8
Merge pull request #33695 from rohitwaghchaure/fixed-patch-item_reposting_for_incorrect_sl_and_gl 
fix: patch item_reposting_for_incorrect_sl_and_gl
 2023-01-17 12:18:34 +05:30
Rohit Waghchaure
dbde3a3421 fix: patch item_reposting_for_incorrect_sl_and_gl 2023-01-17 11:47:53 +05:30
Anand Baburajan
c4d3a8a600
Merge branch 'develop' into misc_asset_fixes 2023-01-17 11:21:37 +05:30
Sagar Sharma
1cadef97bf
Merge branch 'develop' into refactor/qb/pick-list 2023-01-17 10:08:36 +05:30
Sagar Sharma
fb950417bf
Merge branch 'develop' into dev_fix_bug_from_78b438f6 2023-01-17 10:04:36 +05:30
Deepesh Garg
0639d9e32a
chore: Typo in payment reconciliation (#33686) 2023-01-17 08:06:30 +05:30
Florian HENRY
e19161a8ee fix: Sales ORder Connections on Material Request 2023-01-16 21:03:18 +01:00
anandbaburajan
86cf5c89ab chore: add depr_entry_posting_status in create_asset 2023-01-17 00:31:21 +05:30
anandbaburajan
cebb5a42f4 chore: add missing /n in options 2023-01-17 00:26:50 +05:30
Anand Baburajan
011a4c3faa
Merge branch 'develop' into misc_asset_fixes 2023-01-17 00:00:09 +05:30
rohitwaghchaure
66ae807a26
Merge pull request #33684 from rohitwaghchaure/fixed-work-order-summary 
feat: [minor] date type based on filter in Work Order Summary report
 2023-01-16 23:57:43 +05:30
rohitwaghchaure
d6915df81d
Merge pull request #33680 from rohitwaghchaure/refactor-picked-qty 
refactor: picked qty in sales order item
 2023-01-16 23:31:56 +05:30
Rohit Waghchaure
20c8873208 feat: provision to select date type based on filter 2023-01-16 23:29:13 +05:30
anandbaburajan
a144bb01fe chore: stying 2023-01-16 23:26:39 +05:30
Anand Baburajan
070bc8badd
Merge branch 'develop' into misc_asset_fixes 2023-01-16 23:23:12 +05:30
anandbaburajan
cf7b43f7f0 fix: handle_post_depr_entries_fail, show error alert and send email 2023-01-16 23:10:02 +05:30
Rohit Waghchaure
1bcff80074 refactor: picked qty in sales order item 2023-01-16 22:50:16 +05:30
Devin Slauenwhite
179a31ed5e
feat: disable currency exchange api. (#33593) 2023-01-16 21:00:10 +05:30
anandbaburajan
61cd0f98fd fix: asset repair link and improve notes 2023-01-16 18:35:40 +05:30
Vishal Dhayagude
352dcddd6d
Merge branch 'develop' into fg_based_operating_cost 2023-01-16 17:02:31 +05:30
Sagar Sharma
1769b45d4b
Merge branch 'develop' into refactor/qb/pick-list 2023-01-16 16:04:20 +05:30
s-aga-r
0ed6552655 refactor: rewrite pick_list.py queries in QB 2023-01-16 16:01:40 +05:30
Deepesh Garg
adaeba1554
fix(minor): Label updates in Statement of Accounts (#33639) 
fix(minor): Label updates in Satement of Accounts
 2023-01-16 14:03:54 +05:30
Deepesh Garg
312625fdc5
fix: Patch to update reference_due_date in Journal Entry (#33616) 2023-01-16 13:43:54 +05:30
ruthra kumar
9627b46ee7
Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation 
perf: improve reconciliation performance for JE with 100s of accounts
 2023-01-16 09:41:17 +05:30
ruthra kumar
56aa1866da
Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool 
fix: attribute error while submitting Repost PLE
 2023-01-16 09:36:22 +05:30
Raffael Meyer
dceef0397a
fix: allow to create sales order from expired quotation (#33582) 2023-01-16 08:53:37 +05:30
ruthra kumar
be382054e5
revert: Reverting changes done on 33495 (#33662) 
'ordered_qty' will not be fetched from `tabBin`
 2023-01-16 08:50:39 +05:30
ruthra kumar
333907b7a5
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646) 2023-01-16 08:49:35 +05:30
Poruri Sai Rahul
8119442c94
FIX: Remove usage of "six.string_types" (#33603) 
FIX: Remove usage of six.string_types

six is no longer a dependency
 2023-01-16 08:47:28 +05:30
s-aga-r
b3759890d7 chore: Sales Order link in Pick List 2023-01-15 21:09:16 +05:30
ruthra kumar
2c50f43cdd fix: attribute error while submitting Repost PLE 2023-01-15 20:51:54 +05:30
ruthra kumar
828eaf0930 fix: minor filter issue while reconciliation tool from bench console 2023-01-15 18:09:51 +05:30
ruthra kumar
11cf694d9a perf: improve reconciliation speed on JE's with 1000's of rows 
1. No need to keep old PLE's on reconciliation.
2. Added Validation to catch debit-credit mismatch on JE's
3. Only update outstanding amount for newly reconciled invoices
 2023-01-15 17:51:46 +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
Sagar Sharma
bfbc9ea8f7
Merge branch 'develop' into item-attr-abbr-lowercase 2023-01-15 12:55:01 +05:30
s-aga-r
f70d757b82 fix: zero rm-cost in SCR 2023-01-14 22:24:18 +05:30