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

48256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Moreno
1cc1c9aa38
fix: Typo in Nicaraguan chart of accounts (#37620) 
fix: Typo in Nicaraguan chart of accounts
 2023-10-21 18:02:02 +05:30
Gursheen Kaur Anand
9d392970f0
fix(minor): filter bank accounts in bank statement import (#37525) 
fix: filter by company in bank account
 2023-10-21 17:59:12 +05:30
Gursheen Kaur Anand
b0d440c34b
fix: set empty value for tax template in item details (#37496) 
* fix: empty tax template for items with invalid templates

* fix: test for empty tax template

* fix: test for item tax template calculation

* fix: test for pos inv tax template calculation
 2023-10-21 17:58:43 +05:30
Akhil Narang
21c3d9c371
refactor: use gzip library's compress() and decompress() methods directly (#37611) 
The util methods in framework were added for python2.7 compat, so can be removed

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

[skip ci]
 2023-10-21 11:19:45 +05:30
Deepesh Garg
dae66eab36 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 20:12:43 +05:30
Deepesh Garg
9474908449 fix: Purchase Invoice GL entires for assets 2023-10-20 19:49:41 +05:30
Deepesh Garg
eec4057e8d fix: Purchase Invoice GL entires for assets 2023-10-20 19:42:14 +05:30
Ankush Menat
08bc77fb95
Merge pull request #37614 from maharshivpatel/fix-new-logo 
chore: new erpnext logo as per espresso
 2023-10-20 17:53:41 +05:30
Maharshi Patel
fff97b1cd2 chore: new erpnext logo as per espresso 2023-10-20 17:34:57 +05:30
Deepesh Garg
2a7d1c4c8d
Merge pull request #37595 from vorasmit/purchase-gl 
fix: add regional support to extend purchase gl entries
 2023-10-20 16:51:58 +05:30
Deepesh Garg
0b674b608b Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 16:50:52 +05:30
rohitwaghchaure
14b009b093
fix: incorrect cost center in the purchase invoice (#37591) 2023-10-20 16:22:29 +05:30
s-aga-r
530922848f
Merge pull request #37605 from blaggacao/fix/rename-dt-fetch-stop-link-action 
fix(delivery): rename dt fetch stop action
 2023-10-20 16:08:44 +05:30
David Arnold
79d51a0a0b
fix(delivery): rename dt fetch stop action 2023-10-20 12:31:46 +02:00
David Arnold
85488cd0dc
feat(delivery): link to delivery notes list view from delivery trip 2023-10-20 12:25:19 +02:00
Ankush Menat
ce7ac29d06
fix: Correctly extract last message (#37602) 
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
 2023-10-20 10:20:40 +00:00
s-aga-r
4f363f5bf3 fix: partial reservation against SBB 2023-10-20 15:46:06 +05:30
Smit Vora
ff7108a3b1 fix: update existing doc if possible 2023-10-20 09:33:37 +05:30
Smit Vora
77cc91d06b fix: add regional support to extend purchase gl entries 2023-10-19 22:35:55 +05:30
s-aga-r
45395027d3 fix: incorrect serial and batch get reserved 2023-10-19 19:57:50 +05:30
Gursheen Anand
6d5ccde864 feat: add cols for supplier inv details 2023-10-19 17:55:24 +05:30
s-aga-r
961d2d9926 refactor: rename field against_pick_list 2023-10-19 17:51:34 +05:30
Gursheen Anand
75441017c6 chore: linting issues 2023-10-19 17:13:58 +05:30
Gursheen Anand
ed2457bddf feat: proprietorship & partnership options in entity type 2023-10-19 16:59:49 +05:30
Gursheen Anand
4471ad581e fix: sort by section code 2023-10-19 16:54:10 +05:30
Gursheen Anand
7ecc0d5a04 chore: change column order 2023-10-19 16:44:08 +05:30
s-aga-r
78fe567419 refactor: rename field against_pick_list_item 2023-10-19 16:38:43 +05:30
s-aga-r
5ae9c2f62b feat: add field From Voucher Type in SRE 2023-10-19 16:21:32 +05:30
Gursheen Anand
705dadae8e refactor: avoid relying only on against in tds docs query 2023-10-19 16:21:15 +05:30
Ankush Menat
40cdde8820 ci: seutp v15 config 
https://github.com/frappe/frappe/issues/22817
 2023-10-19 15:55:02 +05:30
s-aga-r
64497c9228 feat: reserve stock for SO on PR submission 2023-10-19 15:53:38 +05:30
s-aga-r
188175be84 feat: add fields to hold SO and SO Item ref in PR Item 2023-10-19 14:50:38 +05:30
s-aga-r
2b4fa98941 refactor: rename field Auto Reserve Stock for Sales Order 2023-10-19 14:50:35 +05:30
rohitwaghchaure
d09618bf05
chore: remove debugger (#37584) 2023-10-19 12:35:36 +05:30
Deepesh Garg
6750af90f7
Merge pull request #37562 from GursheenK/subscription-tax-filters 
fix(minor): filter tax template based on company in subscription
 2023-10-18 17:49:09 +05:30
rohitwaghchaure
10311ff114
fix: payment entry count on supplier dashboard (#37571) 2023-10-18 17:42:35 +05:30
rohitwaghchaure
2851a41310
fix: Issues related to RFQ and Supplier Quotation on Portal (#37565) 
fix: RFQ and Supplier Quotation for Portal
 2023-10-18 16:31:35 +05:30
s-aga-r
36a996d704 chore: make Reserve Stock checkbox visible in SO 2023-10-18 12:42:25 +05:30
Gursheen Anand
1a2f659de2 fix: filter tax template based on company 2023-10-18 11:42:19 +05:30
Ankush Menat
1d186efaab
Merge pull request #37554 from frappe/e_com_perms 
fix: e-commerce permissions for address
 2023-10-18 11:08:16 +05:30
s-aga-r
fbd8660403
Merge pull request #37539 from HarryPaulo/fix-purchase-order-analyse-invoiced-qty 
fix: billed_qty to show a sum of all invoiced qty from the purchase order item.
 2023-10-18 11:07:34 +05:30
ruthra kumar
2bcda494b2
Merge pull request #37549 from ruthra-kumar/use_account_in_key_for_ar_ap_reports 
refactor: use account in key while grouping voucher in ar/ap report
 2023-10-18 09:09:16 +05:30
Deepesh Garg
7f1d916f04 chore: rearrange functions 2023-10-18 08:59:28 +05:30
Deepesh Garg
14760d9aea
Merge pull request #37550 from deepeshgarg007/sales_order_item_dimensions 
chore: Add accounting dimensions to Sales Order Item table
 2023-10-17 22:54:04 +05:30
Ankush Menat
c197d37404 Merge branch 'develop' into e_com_perms 2023-10-17 22:29:44 +05:30
Ankush Menat
f4d74990fe fix: E-commerce permissions 2023-10-17 22:28:04 +05:30
Deepesh Garg
e15546b42f chore: rearrange functions 2023-10-17 21:28:59 +05:30
ruthra kumar
244cec64b2 test: report output if party is missing 2023-10-17 20:40:50 +05:30
Deepesh Garg
8c61fe2ca5 fix: rearrange functions 2023-10-17 20:36:09 +05:30
Ankush Menat
0931e93b4c
Merge pull request #37552 from frappe/addr_fetch 
fix: Ignore addr permission in internal code
 2023-10-17 20:00:44 +05:30