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

34607 Commits

Author SHA1 Message Date
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Vishal
f18ae5856f chore: minor changes in pos_controller 2023-02-28 11:03:26 +05:30
Vishal
a51bec0269 chore: minor change 2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d chore: minor changes added to code 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Sagar Sharma
ecd15d2a65
Merge branch 'develop' into github-issue-33344 2023-02-27 16:57:29 +05:30
s-aga-r
c09a61f360 fix: set from_warehouse and to_warehouse while mapping SE 2023-02-27 12:26:21 +05:30
Sagar Sharma
bda1340760
Merge branch 'develop' into patch-2 2023-02-27 11:52:31 +05:30
Patrick Eissler
bbb6a62a7d
chore: add german translations (#34167) 
* chore: add german translations

* Apply suggestions from code review

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-27 11:49:22 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency 
fix: currency in coa import
 2023-02-27 11:48:44 +05:30
Sagar Sharma
5dcb723fc7
Merge branch 'develop' into patch-2 2023-02-27 11:14:14 +05:30
Brian Pond
83f3e317e1 fix: Remove missing DocField in fetch_from 2023-02-27 11:10:51 +05:30
ruthra kumar
d8b9b83b11
Merge pull request #34207 from ruthra-kumar/fix_permisssion_error_on_work_order_creation 
fix: permission error while calling get_work_order_items
 2023-02-27 09:55:18 +05:30
Anand Baburajan
feeebb1262
Merge branch 'develop' into manual_asset_schedule_develop 2023-02-26 17:40:26 +05:30
anandbaburajan
dd74839eba fix: manual depr schedule 2023-02-26 17:36:36 +05:30
rohitwaghchaure
6d6e3cb015
Merge pull request #34206 from rohitwaghchaure/fixed-trivial-error-for-stock-reposting 
fix: not able to repost gl entries
 2023-02-24 21:10:27 +05:30
ruthra kumar
a11d3327df fix(test): use standalone method to fetch work orders from SO 2023-02-24 21:07:49 +05:30
ruthra kumar
b6bad728cd fix: permission error while calling get_work_order_items 2023-02-24 21:07:46 +05:30
Rohit Waghchaure
7d10dd9ea8 fix: not able to repost gl entries 2023-02-24 17:50:00 +05:30
Deepesh Garg
e26c6dc76b
Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) 
Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)"

This reverts commit a67284e96d.
 2023-02-24 15:28:14 +05:30
rohitwaghchaure
04f00fd141
Merge pull request #34199 from rohitwaghchaure/fixed-converison-factor-issue 
fix: conversion factor not set
 2023-02-24 14:56:36 +05:30
Rohit Waghchaure
8e46aebc50 fix: conversion factor not set 2023-02-24 14:49:05 +05:30
HarryPaulo
49af5ba434 fix: Performance improvement when adding a new item 2023-02-23 18:11:09 -03:00
rohitwaghchaure
670304fe8e
Merge pull request #34189 from rohitwaghchaure/prevent-to-make-item-price-for-template 
fix: user shouldn't able to make item price for item template
 2023-02-23 20:47:48 +05:30
Rohit Waghchaure
6417ae0ee8 fix: user shouldn't able to make item price for item template 2023-02-23 20:21:50 +05:30
Marica
47ab26dedf
Merge branch 'develop' into alternative-items-quotation 2023-02-23 13:20:28 +05:30
ruthra kumar
a9920715ab
Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue 
perf: Gross Profit report will fetch SLE's on demand and memoize
 2023-02-23 11:55:08 +05:30
ruthra kumar
88d888d9d0 refactor: use docstatus from Delivery Note Item 2023-02-23 11:15:56 +05:30
rohitwaghchaure
3692f960d0
Merge pull request #34172 from rohitwaghchaure/zero-rate-adjust-issue-using-lcv 
fix: zero division error while making LCV
 2023-02-23 10:54:01 +05:30
ruthra kumar
60d3b86cdb
Merge pull request #34176 from ruthra-kumar/fix_ui_freeze_on_sales_invoice 
fix: ui freeze on item selection in sales invoice
 2023-02-23 10:35:50 +05:30
rohitwaghchaure
e3de216e06
Merge pull request #34173 from rohitwaghchaure/incorrect-color-showing-in-report 
fix: incorrect color in the BOM Stock Report
 2023-02-23 09:54:45 +05:30
ruthra kumar
6412583e98 fix: ui freeze on item selection in sales invoice 2023-02-23 09:36:21 +05:30
vishnu
e3c000d0be chore: change column label 2023-02-22 10:53:11 +00:00
vishnu
19c0b7a523 fix: currency in coa import 2023-02-22 10:24:45 +00:00
Rohit Waghchaure
a8f03ebf7f fix: incorrect color in the BOM Stock Report 2023-02-22 14:24:18 +05:30
Rohit Waghchaure
80e94a08cf fix: zero division error while making LCV 2023-02-22 13:29:06 +05:30
Sankara Subramanian V
a06d24037b
refactor(region): Splitting of KSA(Saudi Arabia) Regional logic from ERPNext (#33895) 
* feat: remove KSA regional code
 2023-02-21 22:52:20 +05:30
ruthra kumar
dde5bbc9a7
Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices 
fix: check for duplicate pos invoices in closing entry
 2023-02-21 18:45:39 +05:30
ruthra kumar
47add0b751 fix: check for duplicate in pos closing and pos merge log entry 2023-02-21 17:50:57 +05:30
ruthra kumar
4a7b1de2d8
refactor: clear records in batches in 'Transaction Deletion Record' (#34109) 
refactor: clear records in batches
 2023-02-21 14:27:00 +05:30
Deepesh Garg
c88444a6c4
fix: Filters in item-wise sales history report (#34145) 2023-02-21 14:26:33 +05:30
anandbaburajan
76861eb332 fix: fiscal year error for existing assets in fixed asset register 2023-02-21 13:04:01 +05:30
Deepesh Garg
35cdd996a9
fix: Use normal rounding for Tax Withholding Category (#34114) 2023-02-21 12:57:49 +05:30
Sagar Sharma
77b88961f6
Merge branch 'develop' into dn-create-button 2023-02-21 10:19:09 +05:30
marination
6b789e2f04 fix: Map only non alternative items from Quotation in Sales Invoice 
- Since there's no item selection, only Quotation selection :/
 2023-02-20 21:17:43 +05:30
marination
19456127cf fix: Handle Get Items From in Sales Order 
- Map all non alternatives from Quotation to SO if no selected items
- Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form
 2023-02-20 20:52:14 +05:30
Ankush Menat
3f2a2c96f6
fix: Add company perm check unconditionally (#34142) 
fix: Add employee perm check unconditionally
 2023-02-20 16:07:27 +05:30
rohitwaghchaure
5e9620b98b
Merge pull request #34139 from rohitwaghchaure/fixed-stock-ledger-report-filter-issue 
fix: inventory dimension filter not overriding with existing filter for stock ledger report
 2023-02-20 13:04:23 +05:30
rohitwaghchaure
3871cf7110
Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue 
fix: purchase invoice performance issue
 2023-02-20 12:47:07 +05:30
Rohit Waghchaure
0e388ba872 fix: inventory dimension filter not overriding with existing filter for stock ledger report 2023-02-20 12:28:43 +05:30
Marica
3c96791d52
fix: Use block variable 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-20 12:04:14 +05:30
s-aga-r
44ee9f0f19 chore: Linters 2023-02-20 11:43:32 +05:30
s-aga-r
1b010add26 fix(ux): ReferenceError: me is not defined Delivery Note 2023-02-20 11:17:49 +05:30
Sagar Sharma
c8fda8a8b5
Merge branch 'develop' into github-issue-33344 2023-02-19 22:17:20 +05:30
Alirio Castro
183e42af1a
fix: differency entry journal debit/credit missing (#34104) 
* fix: difference entry journal is wrong

* fix: difference entry journal is wrong
 2023-02-19 19:40:13 +05:30
Johannes Obermeier
2a90fad710
feat(stock): Support more barcodes in an item by validate the barcode with the barcodenumber module (#33863) 
feat(stock): Support more barcodes in an article by validate the barcode with the barcodenumber module
 2023-02-19 19:36:05 +05:30
Sagar Sharma
f342e6e765
Merge branch 'develop' into github-issue-33344 2023-02-19 12:17:33 +05:30
ruthra kumar
c722f2819c
fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-19 12:09:10 +05:30
Sagar Sharma
2c3973156f
Merge branch 'develop' into github-issue-33344 2023-02-19 12:07:27 +05:30
Richard Case
5b7d23de15
feat: bank reconciliation and plaid changes (#33986) 
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
 2023-02-19 11:50:17 +05:30
Shadrak Gurupnor
5e48e61c66
fix: forced delete linked desktop_icons (#34107) 
* fix: forced delete linked desktop_icons

* fix: black
 2023-02-19 11:42:35 +05:30
ruthra kumar
9c6466f15b
fix: consider rounded total amount while making payment request (#34110) 2023-02-19 11:41:41 +05:30
Devin Slauenwhite
c76352340d
fix(ux): customer/supplier docfield layout (#34125) 2023-02-19 11:37:32 +05:30
Sagar Sharma
07c6ad6fa7
Merge branch 'develop' into github-issue-33344 2023-02-18 22:24:06 +05:30
s-aga-r
35489fbbf9 refactor: remove method get_serial_no_batchwise from get_item_details.py 2023-02-18 22:23:53 +05:30
s-aga-r
6b144baa69 refactor: rewrite get_item_details.py queries in QB 2023-02-18 22:23:51 +05:30
rohitwaghchaure
dff9655d46
Merge pull request #34115 from rohitwaghchaure/fixed-convert-to-item-warehouse-reposting 
feat: provision to convert transaction based reposting to item wareho…
 2023-02-18 21:31:20 +05:30
Rohit Waghchaure
f1383b5ef9 feat: provision to convert transaction based reposting to item warehouse based reposting 2023-02-18 19:31:48 +05:30
Sagar Sharma
91983fb4c6
Merge branch 'develop' into purchase-order-portal 2023-02-17 23:17:00 +05:30
Prateek
b93c18bd4a fix: use max function to get default company address 2023-02-17 20:25:13 +05:30
rohitwaghchaure
47264481ad
Merge branch 'develop' into purchase-invoice-performance-issue 2023-02-17 16:41:30 +05:30
anandbaburajan
e50bd52162 fix: asset repair status after deletion and asset status after manual depr entry 2023-02-17 15:32:24 +05:30
Sagar Sharma
ee21850ab8
Merge branch 'develop' into purchase-order-portal 2023-02-17 11:08:30 +05:30
ruthra kumar
067f8c1d70
Merge pull request #34071 from ruthra-kumar/rearrange_patch_order 
patch: reorder migration patches
 2023-02-17 11:04:36 +05:30
ruthra kumar
68202639f5 chore: reorder migration patches. 
'migrate_gl_to_payment_ledger',
'migrate_remarks_from_gl_to_payment_ledger' should always run last.
 2023-02-17 10:03:55 +05:30
rohitwaghchaure
4399a93843
Merge pull request #34091 from rohitwaghchaure/fixed-incorrect-consumed-qty-in-scr 
fix: incorrect consumed qty in subcontracting receipt
 2023-02-16 15:10:14 +05:30
Sagar Sharma
758f47bba6
Merge branch 'develop' into purchase-order-portal 2023-02-16 14:28:05 +05:30
Rohit Waghchaure
156e45970a fix: incorrect consumed qty in subcontracting receipt 2023-02-16 14:17:27 +05:30
HENRY Florian
4d79ffe3c6
fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) 
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-02-16 13:46:19 +05:30
Sagar Sharma
fb5796f18f
Merge branch 'develop' into purchase-order-portal 2023-02-16 11:22:19 +05:30
Tej Pochiraju
3f44ef8790
Allow bulk import of party specific item (#34083) 
Co-authored-by: Tej Pochiraju <tej@iotready.co>
 2023-02-16 10:11:25 +05:30
Sagar Sharma
471e77b931
Merge branch 'develop' into purchase-order-portal 2023-02-15 22:46:07 +05:30
Sagar Sharma
c7a540b7e2
Merge branch 'develop' into github-issue-33930 2023-02-15 22:37:52 +05:30
s-aga-r
6c6195bae6 fix: create Delivery Trip from Delivery Note list 2023-02-15 22:37:26 +05:30
Sagar Sharma
421e34a181
Merge branch 'develop' into purchase-order-portal 2023-02-15 21:49:09 +05:30
s-aga-r
ffa9c6e4d9 chore: copy item_code to Batch while creating new batch from SCR 2023-02-15 20:16:42 +05:30
s-aga-r
20bdc63b03 fix: show Purchase Order Portal Pay button based on configuration 2023-02-15 20:14:39 +05:30
marination
74fab53e28 test: Alternative items in Quotation 
- Taxes and totals, mapping, back updation
 2023-02-15 15:04:00 +05:30
s-aga-r
d7ef5ad955 chore: add field show_pay_button in Buying Settings 2023-02-15 14:43:10 +05:30
Marica
22010b745c
Merge branch 'develop' into alternative-items-quotation 2023-02-15 13:05:33 +05:30
Anand Baburajan
ef56060166
Merge branch 'develop' into more_asset_bug_fixes 2023-02-15 11:55:55 +05:30
rohitwaghchaure
2e43123048
Merge pull request #34065 from barredterra/print-rfq-letterhead 
fix: change parameter name for letter head
 2023-02-15 09:31:06 +05:30
rohitwaghchaure
9235918d65
Merge pull request #34061 from rohitwaghchaure/feat-allow-to-make-in-transit-entry 
feat: allow to make in transit transfer entry from material request
 2023-02-15 09:08:22 +05:30
barredterra
d5b7f2e49e test: download RFQ PDF 2023-02-14 19:53:39 +01:00
barredterra
8e40c04494 refactor: download RFQ PDF 2023-02-14 19:53:03 +01:00
barredterra
f7fd30fecf fix: change parameter name for letter head 
To match changes from https://github.com/frappe/frappe/pull/19627
 2023-02-14 19:34:36 +01:00
Rohit Waghchaure
5b6128848f feat: allow to make in transit transfer entry from material request 2023-02-14 19:03:07 +05:30
Anand Baburajan
b0cfb0b9ef
Merge branch 'develop' into more_asset_bug_fixes 2023-02-14 18:09:55 +05:30
anandbaburajan
a58f2e6c03 fix: asset_depreciation_and_balances report doesn't reflect manual depr entries 2023-02-14 17:59:16 +05:30
Sagar Sharma
447310702e
Merge branch 'develop' into fix-so-on-hold 2023-02-14 16:01:43 +05:30
ruthra kumar
960085853a
Merge pull request #34048 from ruthra-kumar/typeerror_on_sales_order_analysis 
fix: typeerror on Sales Order analysis report
 2023-02-14 15:27:36 +05:30
Sagar Sharma
5faa62c49a
Merge branch 'develop' into fix-so-on-hold 2023-02-14 11:06:10 +05:30
rohitwaghchaure
3014bac293
Merge pull request #34046 from FHenry/dev_fix_BOM_import 
fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table
 2023-02-14 10:29:26 +05:30
ruthra kumar
00a4191966 fix: typeerror on Sales Order analysis report 2023-02-14 09:56:35 +05:30
Raffael Meyer
770369e5c1
feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 09:29:27 +05:30
Florian HENRY
86be259341 fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table 2023-02-13 23:34:20 +01:00
Deepesh Garg
ce748cec3a
fix: Amount validation in Payment Request against Purchase Order (#34042) 2023-02-13 20:56:24 +05:30
HENRY Florian
231fe4156f
fix: should never get cutomer price on purchase document (#34002) 
* fix: never get cutomer price on purchase document

chores: syntax

chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details

chores: syntax

* feat: add test for get_item_detail price list oriented

* feat: add test for get_item_detail price price oriented

* feat: add test for get_item_detail price price oriented

* chore: clean test code
 2023-02-13 20:56:05 +05:30
anandbaburajan
c533213225 fix: opening_accumulated_depreciation and precision in charts 2023-02-13 17:22:31 +05:30
Deepesh Garg
ff4ae69408
Merge branch 'develop' into gross_profit_memory_and_performance_issue 2023-02-13 15:38:26 +05:30
Deepesh Garg
a67284e96d
fix: Concurrency issues in Sales and Purchase returns (#34019) 2023-02-13 15:31:19 +05:30
ruthra kumar
4f2553e7b6
Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation 
fix: rare instances of IntegrityError while cancelling journals against cr note
 2023-02-13 14:14:27 +05:30
ruthra kumar
192a3395a5
refactor: filter only immediate upcoming payment term for each SO (#33923) 
* fix: ignore closed or 'on hold' orders

* refactor: filter immediate upcoming term

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:36:40 +05:30
ruthra kumar
e5a2b15fba
fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) 
* fix: incorrect difference amount while reconiling cr/dr notes

* fix(test): catch incorrect difference amount calculation

Fixed issues where difference amount was calculated for Cr Notes and Invoices of
the same currency.

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:08:42 +05:30
Deepesh Garg
148703bfc2
feat: Setting to allow Sales Order creation against expired quotation (#33952) 
* feat: Setting to allow Sales Order creation against expired quotation

* chore: linting issues
 2023-02-13 10:27:55 +05:30
Deepesh Garg
ce3f9622cb
Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation 2023-02-13 09:42:41 +05:30
Deepesh Garg
48bb2c942b
fix: Ignore Payment Ledger Entry on dunning cancel (#34025) 
* fix: Ignore Payment Ledger Entry on dunning cancel

* chore: fix translation issue
 2023-02-13 09:42:01 +05:30
Deepesh Garg
77f6789706
Revert "Update tr.csv" (#34026) 
Revert "chore: Update Turkish translations (#33985)"

This reverts commit 6ea0a69d3a.
 2023-02-13 08:27:00 +05:30
ruthra kumar
3e5691072a perf: fetch SLE's on demand and memoize 2023-02-12 14:49:17 +05:30
ruthra kumar
b9a7ff7c3d fix: IntegrityError while cancelling journals against cr note 2023-02-12 14:06:40 +05:30
Sagar Sharma
b0e8dfc1d0
Merge branch 'develop' into fix-so-on-hold 2023-02-12 13:37:21 +05:30
s-aga-r
d76759e066 fix: update reserved_qty when Sales Order marked as Hold 2023-02-12 13:36:26 +05:30
Richard Case
a0eb5e5535
fix: add payment hook to point of sale JS (#33988) 2023-02-11 20:40:15 +05:30
Raffael Meyer
e4953df4a3
fix: set per_billed based on hours when amounts are zero (#33984) 
* fix: set per_billed based on hours when amounts are zero

* test: calculate_percentage_billed
 2023-02-11 12:36:37 +05:30
Sabu Siyad
0df28c7174
fix(ecommerce): throw invalid doctype error in shop by category (#33901) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 12:28:42 +05:30
Raffael Meyer
201573ab9a
refactor: install fixtures (#33964) 
* refactor: install fixtures

* style: disable semgrep for install_defaults signature
 2023-02-11 12:15:42 +05:30
Deepesh Garg
0efdc6c13a
fix: Ignore mandatory fields while creating tax templates for new companies (#34005) 2023-02-11 12:03:48 +05:30
Raffael Meyer
ab7293bcd3
fix: list view for Terms and Conditions (#33925) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:09:26 +05:30
Mehmet Demirel
6ea0a69d3a
chore: Update Turkish translations (#33985) 
We are the ERPNext Turkey Team.
We request confirmation of the translation we sent.
 2023-02-11 09:27:18 +05:30
Deepesh Garg
e478a5d0ce
feat: Add filters in Loan Interest Report (#33907) 2023-02-11 09:17:24 +05:30
Deepesh Garg
47c91324b1
fix: Amount for debit and credit notes with 0 qty line items (#33902) 2023-02-11 09:04:00 +05:30
Akshay
185c543b73
chore: typo in stock_entry get_uom_details (#33998) 
fix: typo in stock_entry get_uom_details
 2023-02-10 20:42:35 +05:30
Marica
bd7e6e264e
Merge branch 'develop' into alternative-items-quotation 2023-02-06 16:30:10 +05:30
marination
db2076db69 refactor: Order based alternative items mapping 
- Alternatives must be followed by a non-alternative item row
- On submit, store non-alternative rows in hidden checkbox to avoid recomputation
- Check for valid/mappable rows by row name
- UI: Select from table rows.Add single row for original/alternative item in dialog
- UI: Indicator for alternative items in dialog grid
- UI: Indicator legend and description of table
- DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg
 2023-02-06 16:25:38 +05:30
Anand Baburajan
4686217d3c
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-05 14:14:39 +05:30
Anand Baburajan
396f455258
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-05 12:19:21 +05:30
Anand Baburajan
f8270f093d
Merge branch 'develop' into manual_depr_entries_develop 2023-02-05 12:19:17 +05:30
Sagar Sharma
2fedd595a9
Merge branch 'develop' into github-issue-33533 2023-02-05 09:36:17 +05:30
rohitwaghchaure
7d794bc70a
Merge branch 'develop' into fixed-negative-stock-error 2023-02-04 22:35:58 +05:30
rohitwaghchaure
67b5471d09
Merge pull request #33941 from developsessions/fix_wrong_due_date_calculation 
fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)
 2023-02-04 22:34:47 +05:30
Anand Baburajan
82490d9f55
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-04 18:37:34 +05:30
Anand Baburajan
07a0e2b7a8
Merge branch 'develop' into manual_depr_entries_develop 2023-02-04 18:37:34 +05:30
developsessions
c8cd351b39 style: apply results of lint run 2023-02-04 09:12:29 +01:00
anandbaburajan
3380dc5dea chore: use continue, not break 2023-02-04 11:20:26 +05:30
developsessions
9d0096ad9e fix: failed test, convert date time to string 2023-02-03 21:21:43 +01:00
Anand Baburajan
bb424965ee
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-03 23:00:40 +05:30
anandbaburajan
b961321de5 fix: allow PI cancel if linked asset is cancelled 2023-02-03 22:58:22 +05:30
Anand Baburajan
2d54bf7199
Merge branch 'develop' into manual_depr_entries_develop 2023-02-03 22:25:27 +05:30
anandbaburajan
e5da0d7a63 chore: refactor AssetDepreciationSchedule 2023-02-03 22:23:17 +05:30
anandbaburajan
8ea9e4576f fix: asset value for manual depr entries 2023-02-03 21:43:18 +05:30
developsessions
be1f941996 fix: Add missing 1 required positional argument: 'bill_date' 2023-02-03 14:50:44 +01:00
developsessions
c80aaad437 style: lint wrong from position 2023-02-03 13:55:36 +01:00
s-aga-r
dc0ddf8d7e fix: stock entry from item dashboard (stock levels) 2023-02-03 18:08:34 +05:30
developsessions
ce8a1086a7 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 2023-02-03 11:30:29 +01:00
s-aga-r
56356ffbb9 chore: add Item Name column in Warehouse wise Item Balance Age and Value report 2023-02-03 12:28:23 +05:30
s-aga-r
d7a665cb84 chore: column width in Warehouse wise Item Balance Age and Value report 2023-02-03 12:27:41 +05:30
Rohit Waghchaure
9ae7578b07 test: test case 2023-02-02 18:54:42 +05:30
Rohit Waghchaure
6d513e2519 fix: negative stock error 2023-02-02 18:40:15 +05:30
marination
03321f5f13 chore: Code simplification 
- Map is not required, avoid filter multiple times, use single loop instead
- Better variable name
- Reduce LOC
 2023-02-02 17:28:03 +05:30
ruthra kumar
2afed7de03
Merge pull request #33777 from ruthra-kumar/performance_tuning_remarks_migration 
fix(patch): reduce memory usage while migrating remarks
 2023-02-02 16:47:15 +05:30
ruthra kumar
ae2de3cf65
Merge pull request #33776 from ruthra-kumar/performance_tuning_ple_migration 
patch: reduce memory usage by paging through records
 2023-02-02 16:46:51 +05:30
ruthra kumar
cb1d33880c
Merge pull request #33502 from ruthra-kumar/toggle_account_balances_in_coa 
feat: Toggle display of Account Balance in Chart of Accounts
 2023-02-02 09:20:53 +05:30
marination
b3fe7c6dad fix: Consider only ordered alternative/original item for Quotation status 
- The original and its alternatives make a set of items where one is chosen
- While setting order status of Quotation, check if the chosen item from the set is fully ordered or not
- Filter out unselected items from the set
- Create a map containing the set of items and if they were ordered or not for ease of grouping
- The simple items will work as it used to
 2023-02-01 19:10:32 +05:30
Gokulnath
2884738864
feat: adding warehouse filter for gross profit report (#33397) 
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-01 18:44:15 +05:30
rohitwaghchaure
fbf2d7e9de
Merge pull request #33918 from rohitwaghchaure/fixed-incorrect-bin-qty 
fix: incorrect actual qty in Bin
 2023-02-01 18:22:56 +05:30
Rohit Waghchaure
f8c852c54c fix: incorrect actual qty in Bin 2023-02-01 17:49:11 +05:30
Suraj Shetty
ffeda0cee9
Merge pull request #33916 from gavindsouza/permlevel-apis 2023-02-01 16:24:18 +05:30
Dany Robert
2cc7239dd5
fix: currency formatting in item-wise sales history (#33903) 
* fix(item-sales-history): currency formatting

* chore: linting issues

* fix: convert raw sql to qb
 2023-02-01 14:27:38 +05:30
Gavin D'souza
940ad6e3f2 fix: Fetch all fields via get_returned_qty_map_for_row 2023-02-01 13:53:37 +05:30
Gavin D'souza
3518d4be1d fix(update_billing_percentage): Remove permlevel checks on aggregated 
value
 2023-02-01 12:58:08 +05:30
Raffael Meyer
3c7b460fd8
fix: german chart of accounts "SKR03" (#33909) 
* fix: german chart of accounts "SKR03"

- Added some missing account types and tax rates
- Added some missing accounts

* style: convert indentation to tabs

* fix: space before percentage sign

* feat: add some expense accounts

* refactor: replace unicode characters with utf-8

for better readability

* revert: add back groups for Bank and Cash accounts

Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100
 2023-02-01 12:16:58 +05:30
Deepesh Garg
103a91ed40
Merge pull request #33808 from dj12djdjs/fix-lead-rename 
fix: make title field readonly
 2023-02-01 12:02:33 +05:30
ruthra kumar
9bb64107c5 perf: reduce memory usage while migrating remarks 
Page through records using primary key
 2023-02-01 10:44:44 +05:30
barredterra
7156184933 feat: add incoterm named place to RFQ 2023-01-31 23:23:54 +01:00
marination
ece6358e60 fix: Iterate over list instead of map's output and formatting 2023-01-31 17:13:05 +05:30
rohitwaghchaure
c5834c1db4
Merge pull request #33896 from rohitwaghchaure/inventory-dimension-mandatory 
feat: mandatory and mandatory depends on in inventory dimension
 2023-01-31 15:18:14 +05:30
rohitwaghchaure
ddb4396117
Merge pull request #33715 from s-aga-r/fix-pick-list 
fix: consider existing pick-list
 2023-01-31 15:10:19 +05:30
s-aga-r
6ffdeb1af8 fix: consider stock_qty if picked_qty is zero 2023-01-31 14:39:57 +05:30
Rohit Waghchaure
22d0e1373b test: added test case 2023-01-31 14:36:26 +05:30
Rohit Waghchaure
423f2b5627 feat: mandatory and mandatory depends on in inventory dimension 2023-01-31 14:19:14 +05:30
Sagar Sharma
6e015fd6be
Merge branch 'develop' into fix-mr-rate-and-amount 2023-01-31 12:39:38 +05:30
Sagar Sharma
57c8871de0
Merge branch 'develop' into fix-pick-list 2023-01-31 12:38:58 +05:30
s-aga-r
0b76a26c8a refactor: test_consider_existing_pick_list() 2023-01-31 12:38:30 +05:30
s-aga-r
bb7fe795fe test: add test cases 2023-01-31 12:38:30 +05:30
s-aga-r
207eeefc85 fix(test): test_pick_list_for_items_with_multiple_UOM() 2023-01-31 12:38:30 +05:30
s-aga-r
5138ef0160 fix: pymysql.err.ProgrammingError 2023-01-31 12:38:30 +05:30
s-aga-r
7b3d496ce0 fix: get_picked_items_details 2023-01-31 12:38:30 +05:30
s-aga-r
be41052dc8 chore: add status field in Pick List 2023-01-31 12:38:30 +05:30
s-aga-r
b642718f08 fix: consider existing pick list 2023-01-31 12:38:27 +05:30
Deepesh Garg
b3dc22de29
fix: Fetch commission rate from sales partner (#33851) 2023-01-31 09:33:33 +05:30
barredterra
11d165c274 fix(Fixed Asset Register): error when selecting more than one fiscal year 2023-01-30 19:33:58 +01:00
Anand Baburajan
5d8a2d3d3b
Merge branch 'develop' into fix_disposal_was_made_on_original_schedule_date_develop 2023-01-30 21:36:51 +05:30
anandbaburajan
f487660a7c fix: disposal_was_made_on_original_schedule_date 2023-01-30 21:33:43 +05:30
ruthra kumar
5f38859a04
Merge pull request #33736 from rtdany10/gp-report-fix 
fix(gp): fetch buying amount from dn related to so
 2023-01-30 19:04:36 +05:30
marination
fa9b327501 chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table 2023-01-30 16:27:01 +05:30
Dany Robert
d69c839369 chore: linting issues 2023-01-30 10:45:08 +00:00
Dany Robert
1f6ab86a65 feat(gp): test for inv and dn related via so 2023-01-30 10:35:43 +00:00
marination
94cacb60de feat: Filter rows to be mapped on server side mapping function 
- Pass dialog selections to `make_sales_order`
- Map either original item or its alternative depending on mapping
- Only qty check for simple rows (without alternatives and not an alternative itself)
 2023-01-30 13:54:30 +05:30
s-aga-r
6b781d78e0 fix: amount in Material Request 2023-01-30 12:51:59 +05:30
Deepesh Garg
a34a1f8fd2
fix: Amount validation in Payment Request against Purchase Order (#33855) 
fix: Amount validation in Payment Request againt Purchase Order
 2023-01-29 21:34:28 +05:30