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

9240 Commits

Author SHA1 Message Date
ruthra kumar
b495e5a5a1
Merge pull request #37393 from ruthra-kumar/import_financial_statements_in_bundle 
refactor: import 'financial_statements.js' in erpnext bundle
 2023-10-10 11:58:40 +05:30
ruthra kumar
db317d67d5
Merge pull request #37204 from GursheenK/pe-allocation-for-term-inv 
fix: allocate payment amount for split invoices in PE
 2023-10-10 10:11:24 +05:30
ruthra kumar
3d99e5757e
Merge pull request #37123 from blaggacao/fix/payment-request-rounding 
fix: payment request rounding in multi-currency and on status update
 2023-10-10 10:07:25 +05:30
Bernd Oliver Sünderhauf
2d6f1f8598
fix(UX): Un-require description fields on items (#37354) 
fix(UX): Un-require description fields on items.
 2023-10-10 07:26:37 +05:30
Anand Baburajan
6959c928c6
test: add product_code in create_loan_product (#37416) 2023-10-09 20:58:56 +05:30
RitvikSardana
2c899dd13a
fix: customer group and territory not mandatory (#37050) 
* fix: customer group and territory not mandatory

* fix: supplier group not required

* test: added test case for customer and supplier without group

* test: Customer without customer group and territory

* chore: remove unwanted changes

* test: Supplier without supplier group

* test: code cleanup

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-10-09 20:21:25 +05:30
ruthra kumar
411be583a3
Merge pull request #37395 from ruthra-kumar/exception_on_exporting_errored_rows_in_bank_statement_import 
fix: exception on exporting errored rows
 2023-10-08 18:20:30 +05:30
ruthra kumar
d3c6000904 fix: exception on exporting errored rows 2023-10-08 13:16:28 +05:30
ruthra kumar
40e7c43ce3 refactor: import financial_statement in erpnext bundle 2023-10-07 21:03:31 +05:30
ruthra kumar
7d11fe1633
Merge pull request #37289 from GursheenK/ar-ageing-summary 
fix: ageing summary in SOA AR
 2023-10-07 15:09:21 +05:30
ruthra kumar
c006c14aaa
Merge pull request #37359 from ruthra-kumar/change_request_response_strucutre_on_exchangerate 
refactor: add `access_key` field to facilitate use of exchangerate.host provider
 2023-10-05 09:18:56 +05:30
ruthra kumar
9396fb77f4
Merge pull request #37294 from ruthra-kumar/restrict_payment_as_ref_in_je_from_ui 
refactor: block Payment Entry as ref in Journals from UI
 2023-10-05 08:53:35 +05:30
ruthra kumar
81591a34c2 refactor: introduce access_key field 2023-10-05 08:43:08 +05:30
mergify[bot]
f4f40cc776
feat: composite WIP asset (copy #37352) (#37353) 
* feat: wip composite asset

(cherry picked from commit 4907e7acd4ff549f34f6c9d0144af83db0ad9cc1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-04 10:29:18 +05:30
ruthra kumar
ab378196bd
Merge pull request #37304 from GursheenK/party-totals-payable-report 
fix: only float row values for total in AP summary
 2023-10-03 19:45:03 +05:30
ruthra kumar
67440c38ae refactor: use isinstance over type 2023-10-03 17:38:43 +05:30
Anand Baburajan
087f378a4f
refactor: rename loan type to loan product in lending (#37325) 
refactor: rename loan type to loan product
 2023-10-03 00:15:30 +05:30
Deepesh Garg
964cd75f6e
Merge pull request #37235 from niyazrazak/patch-13 
fix: set route options to cost center
 2023-10-02 10:54:02 +05:30
s-aga-r
e7f4b7b190
fix: ignore user permissions for Source Warehouse (#37313) 2023-10-01 21:25:01 +05:30
Gursheen Anand
1dab195560 fix: add only float row values for total 2023-09-29 18:20:02 +05:30
Gursheen Anand
644e25e587 test: process soa for gl and ar 2023-09-29 14:35:43 +05:30
Gursheen Anand
67f878ff8c refactor: separate function for statement dict 2023-09-29 14:34:43 +05:30
ruthra kumar
d391e81505 refactor: block Payment Entry as ref in JE from UI 2023-09-29 13:40:59 +05:30
Gursheen Anand
d9eb44e62d fix: ageing summary in AR 2023-09-29 11:12:19 +05:30
ruthra kumar
f160e49483
Merge pull request #37268 from GursheenK/ar-summary-party-filter 
fix: AP AR filters from Party link
 2023-09-28 11:54:34 +05:30
ruthra kumar
2c7d6aec89 test: multi select party filter in AR report 2023-09-28 11:17:38 +05:30
Gursheen Anand
59e8abfd57 fix: party format in test 2023-09-27 13:57:49 +05:30
Gursheen Anand
4b28154f5e fix: process soa filter for multiselect 2023-09-27 13:04:13 +05:30
Gursheen Anand
f7cb68a45f fix: summary report filters 2023-09-27 13:03:37 +05:30
Gursheen Anand
e7239e02d4 fix: query for multiselect filter 2023-09-27 13:02:52 +05:30
Gursheen Anand
9d15124a6a fix: set route filter values for AR 2023-09-27 13:01:48 +05:30
Gursheen Anand
888ed36eed fix: set route filter values for AP 2023-09-27 13:01:18 +05:30
Deepesh Garg
8c5fcb8257
fix: PCV posting issues (#37029) 
* fix: PCV posting issues

* fix: process closing entries separately in a background job

* test: Update tests

* chore: fix broken ci
 2023-09-27 10:22:09 +05:30
ruthra kumar
a223935f14
Merge pull request #37248 from GursheenK/ar-summary-party-filter 
fix: AP & AR summary filters to match AR
 2023-09-27 09:41:01 +05:30
ruthra kumar
796cc0915a
Merge pull request #37194 from GursheenK/editable-purchase-invoice 
feat: editable purchase invoice
 2023-09-26 16:46:11 +05:30
Gursheen Anand
76a5d94f37 fix: set new AP summary filters 2023-09-26 15:11:54 +05:30
Gursheen Anand
7d96044d8e fix: change filters for AR summary 2023-09-26 15:10:16 +05:30
Gursheen Anand
832d7e7d7b fix: set AR filters after rename 2023-09-26 15:08:40 +05:30
ruthra kumar
ed7f67b1a8 refactor: remove references in repost doctypes upon parent doc delet 2023-09-26 14:35:31 +05:30
NIYAZ RAZAK
5e4b73918d
fix: set route to cost center 
cost center mapping is not correct
 2023-09-25 22:15:08 +03:00
Anand Baburajan
ee178ff2ce
chore: add disabled field for bank account (#37226) 2023-09-25 12:12:11 +05:30
Deepesh Garg
c7969b428d
Merge pull request #37116 from blaggacao/fix/payment-url 
fix: payment url display as link
 2023-09-24 21:50:53 +05:30
milanpethani
62ea097b14 fix: set customer currency in pos_invoice if exists 
if currency exists in the profile and customer currency doesn't exists still it will update currency to None, so update customer currency only if exists

(cherry picked from commit 041d52e82880610a99903ecf4c459e98bd1fff76)
 2023-09-24 12:23:58 +00:00
Deepesh Garg
9dbb9e7515
Merge pull request #37211 from deepeshgarg007/trial_balance_net_values 
feat: Toggle net values in Trial Balance report
 2023-09-24 17:45:11 +05:30
Gursheen Anand
61c6ebbb95 fix: validation for si 2023-09-23 20:30:50 +05:30
Gursheen Anand
8ef0d88708 fix: call validate before setting repost flag 2023-09-23 20:29:38 +05:30
Gursheen Anand
1856050ef9 fix: do not run bg job for single doc 2023-09-23 19:30:42 +05:30
Gursheen Anand
a856091ff4 refactor: remove repeated validation for voucher 2023-09-23 19:18:06 +05:30
Gursheen Anand
ba7212c98b refactor: remove unused method 2023-09-23 19:11:46 +05:30
Gursheen Anand
5346c67b02 fix: apply gl report filters 2023-09-23 17:50:45 +05:30