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

34380 Commits

Author SHA1 Message Date
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
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
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
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
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
s-aga-r
d7ef5ad955 chore: add field show_pay_button in Buying Settings 2023-02-15 14:43:10 +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
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