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

44841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
6c88fb7a8d
Merge branch 'develop' into fix-22-23-05686 2023-03-14 11:44:39 +05:30
Sagar Sharma
48a88b7064
Merge branch 'develop' into FIX-ISS-22-23-05720 2023-03-14 11:44:33 +05:30
Anand Baburajan
72e9c05f46
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-13 21:31:57 +05:30
Deepesh Garg
c6999fc687
fix: Total row in trail balance report (#34395) 
* fix: Total row in trail balance report

* fix: Calculate total after preparing opening and closing
 2023-03-13 21:18:30 +05:30
Deepesh Garg
91f7b0bbd6 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-13 20:52:48 +05:30
Deepesh Garg
76775a3e49 fix: Update patch 2023-03-13 20:51:35 +05:30
Deepesh Garg
492e994c22
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-13 19:37:55 +05:30
Deepesh Garg
fa776d2987
fix: Use customer name instead of name(id) in PSOA (#34412) 2023-03-13 19:37:09 +05:30
Deepesh Garg
d8e54a21fb
test: Update values in Sales Invoice tests (#34419) 2023-03-13 19:34:15 +05:30
Sagar Vora
5c06620f97
fix: set tax category from address before executing get_regional_address_details (#34372) 2023-03-13 19:32:50 +05:30
HENRY Florian
d267111e13
chore: fix french translation (#34381) 
chore: update french translation
 2023-03-13 19:03:16 +05:30
Ernesto Ruiz
796ad01b87
fix: Add translate function to Delayed Tasks Summary Report (#34411) 
fix: Add translate function to Delayed Tasks Summary Report
 2023-03-13 19:02:34 +05:30
Deepesh Garg
c8cc3fc65f
chore: Move source and campaign to additional info section (#34414) 2023-03-13 18:37:19 +05:30
Deepesh Garg
4416ddc4af
fix: Linked invoice cancellation issue via timesheet (#34337) 2023-03-13 18:36:43 +05:30
Sagar Sharma
4a05f3736f
Merge branch 'develop' into FIX-ISS-22-23-05720 2023-03-13 17:50:09 +05:30
s-aga-r
66f650061d test: add test cases for Over Order Allowance against Blanket Order 2023-03-13 17:21:07 +05:30
Sagar Sharma
9d49afebde
Merge branch 'develop' into fix-22-23-05686 2023-03-13 17:05:27 +05:30
Marica
e1d28063b0
Merge branch 'develop' into early-payment-loss 2023-03-13 16:23:24 +05:30
Anand Baburajan
b8703b0b9b
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-13 15:35:08 +05:30
Ankush Menat
b8a61be080
test: fix hypothesis tests (#34416) 2023-03-13 15:16:30 +05:30
Anand Baburajan
097be8bdea
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-13 15:08:08 +05:30
Sagar Sharma
f2e9a67f37
Merge branch 'develop' into FIX-ISS-22-23-05720 2023-03-13 14:32:26 +05:30
s-aga-r
442ee3adba fix: operation time for multi-level BOM in WO 2023-03-13 14:31:38 +05:30
Ankush Menat
5bf6fb43a9 chore: fix broken TR translations 2023-03-13 14:12:12 +05:30
Deepesh Garg
7101e7acc4
fix: Filtering issue in payment entry (#34332) 2023-03-13 14:05:13 +05:30
marination
caa1a3dccf fix: Handle rounding more gracefully 
- Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions
- Use base amounts to calculate base losses instead of using conversion factor which increases rounding error
- Round of total base loss instead of individual income and tax losses to reduce rounding error
- Use default round off account for pending rounding loss in deductions
 2023-03-13 14:01:31 +05:30
ruthra kumar
9f26e3c27a
Merge pull request #34408 from ruthra-kumar/delete_remarks_migration_patch 
chore: delete remarks migration patch
 2023-03-13 09:14:21 +05:30
ruthra kumar
da37573b73 chore: delete remarks migration patch 
Versions higher than V14.18.2, 'remarks' will be moved in 'migrate_gl_to_payment_ledger'
 2023-03-12 13:41:50 +05:30
ruthra kumar
e371bb6672
Merge pull request #34387 from ruthra-kumar/refactor_gl_migration_patch 
refactor(patch): remove inner join to improve SQL performance
 2023-03-11 21:00:19 +05:30
Mehmet Demirel
fa6d37542b
chore: Improve Turkish language translation 
chore: Improve Turkish language translation
 2023-03-11 19:18:44 +05:30
Deepesh Garg
aae53bb910
fix: Error in consolidated financial statement (#34330) 2023-03-11 19:06:56 +05:30
ruthra kumar
a9989b12d5
Merge pull request #34370 from ruthra-kumar/fix_flaky_test_in_payment_terms_report 
fix(test): flaky test case in Payment terms report
 2023-03-11 14:17:45 +05:30
ruthra kumar
9d0a1149d8 chore: remove remarks migrations patch from patches.txt 
'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself
from versions highers than v14.18.2. Removing it from patches.txt
 2023-03-11 13:17:52 +05:30
ruthra kumar
a43304b01b
Merge branch 'develop' into fix_flaky_test_in_payment_terms_report 2023-03-11 13:05:38 +05:30
ruthra kumar
7fcd74ed03 fix(test): flaky test case in Payment terms report 2023-03-10 21:23:12 +05:30
ruthra kumar
1744f1d4e4 refactor: add remarks to column as well 2023-03-10 15:57:11 +05:30
Anand Baburajan
6308b509fc
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-10 15:25:39 +05:30
Deepesh Garg
0157fa15eb chore: Use account closing balance in set gl entries 2023-03-10 13:02:01 +05:30
Sagar Sharma
430378bb6e
Merge pull request #34383 from s-aga-r/FIX-ISS-22-23-05836 
fix: filters not getting applied on `Web Form`
 2023-03-10 00:24:08 +05:30
s-aga-r
9c1e566394 fix: filters not getting applied on Web Form 2023-03-09 22:12:35 +05:30
ruthra kumar
f9cfabf78e refactor(patch): remove inner join to improve SQL performance 2023-03-09 19:42:28 +05:30
Marica
ae0a8a6529
Merge branch 'develop' into early-payment-loss 2023-03-09 18:36:36 +05:30
anandbaburajan
ebb6953274 fix: add missing patch for new fields added in #34214 2023-03-09 17:55:27 +05:30
marination
9abf0ef615 test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount 2023-03-09 16:32:36 +05:30
marination
b09c2381ca fix: Multi-currency SI with base currency PE 
- Return total discount loss in base currency
- Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency
- Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always
- minor: discount msgprint in correct currency
 2023-03-09 16:25:45 +05:30
Deepesh Garg
9a8f8e8b7d
Revert "fix: Default sales team not getting set" (#34376) 
Revert "fix: Default sales team not getting set (#34284)"

This reverts commit 7d0199d743.
 2023-03-09 15:36:52 +05:30
Sagar Sharma
428274df56
Merge pull request #34360 from s-aga-r/FIX-ITEM-ALTERNATIVE-ERR-MSG 
chore: `Alternative Item Code` error msg
 2023-03-09 10:07:35 +05:30
Sagar Sharma
87b5734f5b
Merge branch 'develop' into FIX-ITEM-ALTERNATIVE-ERR-MSG 2023-03-09 10:07:24 +05:30
Sagar Sharma
c312692af5
Merge pull request #34362 from s-aga-r/FIX-ISS-22-23-05697 
fix: `required_qty` get reset to `1` for Alternative Item in WO
 2023-03-09 10:05:08 +05:30
s-aga-r
046834a97a fix: required_qty get reset to 1 for Alternative Item in WO 2023-03-08 20:40:03 +05:30