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
Gursheen Anand
fed8cf4196 fix: test for reposting pi 2023-10-12 17:40:57 +05:30
Gursheen Anand
528ed9c986 fix: check child rows before update 2023-10-12 16:54:41 +05:30
ruthra kumar
2c56ee97c7 refactor: back calculate total amt for TDS 2023-10-12 16:03:26 +05:30
Gursheen Anand
e2cccc4005 chore: correct typo 2023-10-12 15:57:38 +05:30
Gursheen Anand
569d0961f2 test: reposting entries for JV 2023-10-12 15:06:04 +05:30
Gursheen Anand
de46fa8e66 refactor: use qb for JV tests 2023-10-12 15:04:56 +05:30
Rishik Sahu
5ebf7c8c29 fixed-#37231-changed-doc-to-d/closes-the-isse 2023-10-12 14:03:49 +05:30
Gursheen Anand
bfa0c0981c feat: repost ledger button in JV 2023-10-12 13:31:15 +05:30
Gursheen Anand
c77c296b8b feat: validate before allowing repost 2023-10-12 13:10:59 +05:30
Gursheen Anand
9ab55a5bd8 refactor: better abstraction for controller code 2023-10-12 12:48:14 +05:30
Gursheen Anand
e4d657e6fd feat: update after submit in JV 2023-10-12 12:46:50 +05:30
Gursheen Anand
f4c8d63fe0 feat: allow on submit for selected fields 2023-10-12 12:20:01 +05:30
Gursheen Anand
d94f45531a refactor: remove controller logic for setting balances 2023-10-12 12:13:21 +05:30
Gursheen Anand
4d38bd8517 refactor: exclude balances while setting currency 2023-10-12 12:09:58 +05:30
Gursheen Anand
c99e7ca999 refactor: exclude balance while setting acc details 2023-10-12 12:07:36 +05:30
Gursheen Anand
aba3065573 refactor: remove balance formatter 2023-10-12 12:04:44 +05:30
Gursheen Anand
e95dce6d8d refactor: remove balance fields from jv account 2023-10-12 11:54:12 +05:30
Deepesh Garg
ff7c77e9fd
Merge pull request #37418 from barredterra/de-is-return 
fix: german tranlations of "Is Return"
 2023-10-12 07:49:52 +05:30
ruthra kumar
510f12a1e8
Merge pull request #37436 from ruthra-kumar/validate_for_repost_only_for_critical_fields 
refactor: for non-repost fields, don't validate
 2023-10-11 20:03:16 +05:30
ruthra kumar
30adfa9844
Merge pull request #37459 from ruthra-kumar/validate_advances 
refactor: add validation for Advances in SI/PI
 2023-10-11 20:02:36 +05:30
Gursheen Anand
35d92abe73 fix: remove multiple against account values from gle 2023-10-11 15:56:59 +05:30
Gursheen Anand
28445058ef fix: split exchange gain loss account entries 2023-10-11 15:56:13 +05:30
Gursheen Anand
aab5737ff3 fix: make JV account against field a dynamic link 2023-10-11 15:55:02 +05:30
ruthra kumar
0cdd6435a5 refactor: add validation for Advances in SI/PI 2023-10-11 14:42:23 +05:30
rohitwaghchaure
f3238f9105
fix: production plan reserved qty incorrect calculation (#37400) 2023-10-11 14:08:11 +05:30
s-aga-r
847f774c8b
Merge pull request #37452 from s-aga-r/FIX-4407 
fix(ux): allow MR to Stop until fully received
 2023-10-11 13:50:20 +05:30
ruthra kumar
c1782c5015 refactor: for non-repost fields, don't validate 2023-10-11 13:30:21 +05:30
Dany Robert
6a27cbd61d
Merge branch 'frappe:develop' into rounded-row-wise-tax 2023-10-11 12:31:13 +05:30
Ankush Menat
cea0d65fbd chore: disable beta release 2023-10-11 12:22:06 +05:30
Ankush Menat
99d3d317fe
Merge pull request #37453 from akhilnarang/fix-ci 
fix: use mariadb instead of mysql
 2023-10-11 11:53:47 +05:30
Akhil Narang
4a6108e912
fix: use mariadb instead of mysql 
Drop mysql-client in favour of mariadb-client

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2023-10-11 11:17:47 +05:30
s-aga-r
0d7a0f393d fix(ux): allow MR to Stop until fully received 2023-10-11 10:51:40 +05:30
David Arnold
e97af14ff4
fixup! feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-10 23:50:57 +02:00
David Arnold
c809e61103
feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-10 22:33:06 +02:00
Dany Robert
bda82bf1e9 fix(gp): wrong allocated_amount on multi sales person invoice 2023-10-10 10:30:09 +00:00
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
s-aga-r
78eaf5d035
fix: fetch dependent task subject and project (#37401) 2023-10-10 11:05:24 +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
David Arnold
fb7c5f6d91
fix(sales): add sales user to read stock settings for js refresh code path (#37317) 2023-10-10 07:56:54 +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
barredterra
38ca164662 fix: german tranlations of "Is Return" 2023-10-09 23:45:58 +02:00
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
Deepesh Garg
c9dfb909a5
Merge pull request #37310 from deepeshgarg007/lead_details_qb 
chore: rewrite query using query builder
 2023-10-09 20:07:58 +05:30
Deepesh Garg
8f9dd5407b
Merge pull request #37324 from blaggacao/fix/portal-tx-row-total-display 
fix(portal): used rounded total in transaction rows, if enabled
 2023-10-09 19:37:26 +05:30
Deepesh Garg
6d43f90dc2 Merge branch 'develop' of https://github.com/frappe/erpnext into lead_details_qb 2023-10-09 19:23:16 +05:30
Rucha Mahabal
788df14ae8
Merge pull request #37376 from barredterra/hrms-translations 2023-10-09 13:18:55 +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