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

47097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
s-aga-r
795020dddc
Merge pull request #37414 from s-aga-r/FIX-4347 
fix: consider received qty while creating SO -> MR
 2023-10-15 19:11:14 +05:30
Deepesh Garg
15df4924e8
Merge pull request #36797 from rtdany10/uae-item-tax 
fix(regional): item wise tax calc issue
 2023-10-15 18:17:40 +05:30
Deepesh Garg
621da178e1 Merge branch 'develop' of https://github.com/frappe/erpnext into rounded-row-wise-tax 2023-10-15 18:10:27 +05:30
s-aga-r
46add06a29 fix: GL Entries not getting created for PR Return 2023-10-15 15:46:29 +05:30
ruthra kumar
dd099be690
Merge pull request #37478 from ruthra-kumar/tds_from_journals 
refactor: back calculate total amt for TDS
 2023-10-15 10:51:42 +05:30
ruthra kumar
dfd40ca7b3
Merge pull request #37319 from ruthra-kumar/test_fixtures_for_sales_purchase_invoice 
test: use fixtures for sales and purchase invoice
 2023-10-15 10:16:22 +05:30
ruthra kumar
fbabf4ac2e refactor(test): make sure TDS Payable is available for testing 2023-10-15 08:57:38 +05:30
ruthra kumar
0207d6e7c9 refactor(test): make use of @change_settings in PI test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
a2e064d214 refactor(test): use test fixture in purchase invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
3bdf4f628c refactor(test): use test fixture in subscription 2023-10-15 08:57:38 +05:30
ruthra kumar
de9baef84a refactor(test): use @change_settings to fix failing test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
8ebe5733ac refactor(test): fix broken test cases in Sales Invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
58065f31b1 refactor(test): use @change_settings in sales invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
fc50b174eb refactor(test): unset accounts frozen date 2023-10-15 08:57:38 +05:30
ruthra kumar
c322e5f381 test: use fixtures for sales and purchase invoice 2023-10-15 08:57:38 +05:30
s-aga-r
b2cee396ac fix: consider received qty while creating SO -> MR 2023-10-14 20:43:32 +05:30
s-aga-r
afef9dc8df
Merge pull request #37182 from s-aga-r/MOVE-PAYMENTS-GATEWAYS 
refactor!: move payment gateways to the payments app
 2023-10-14 16:48:11 +05:30
ruthra kumar
f4a294c5ce
Merge pull request #37495 from ruthra-kumar/keyerror_on_comparison_report 
fix: keyerror on gl and pl comparision report
 2023-10-14 12:15:19 +05:30
ruthra kumar
8ca0e4eacc
Merge pull request #37435 from rtdany10/sp-gp-fix 
fix(gp): wrong `allocated_amount` when grouped by Sales Person
 2023-10-14 12:12:14 +05:30
ruthra kumar
ad00df0af6 fix: keyerror on gl and pl comparision report 2023-10-13 15:39:54 +05:30
Ankush Menat
5167fb2bae
Merge pull request #37475 from iamrishiksahu/fix/#37231-doc-is-not-defined 
fix: fixed the doc not defined issue.
 2023-10-13 15:30:39 +05:30
ruthra kumar
479fe915af
Merge pull request #37484 from ruthra-kumar/ignore_links_on_closing_balance_patch 
refactor(patch): ignore links on closing balance patch
 2023-10-13 09:18:41 +05:30
ruthra kumar
17ca8756a7 refactor(patch): ignore links on closing balance patch 2023-10-12 20:43:15 +05:30
Anand Baburajan
18e3a8907a
fix: don't set finance books if gross_purchase_amount is not set (#37480) 2023-10-12 19:41:11 +05:30
ruthra kumar
2c56ee97c7 refactor: back calculate total amt for TDS 2023-10-12 16:03:26 +05:30
Rishik Sahu
5ebf7c8c29 fixed-#37231-changed-doc-to-d/closes-the-isse 2023-10-12 14:03:49 +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
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
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