Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,520 Commits 3 Branches 0 Tags 1 GiB
1659f1eb6d
Commit Graph

7631 Commits

Author SHA1 Message Date
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
 2022-04-14 12:32:11 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit 
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
 2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Deepesh Garg
228195ba74
Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions 
fix: Do not show disabled dimensions in reports
 2022-04-12 16:11:07 +05:30
Deepesh Garg
9a1c560c82 fix: Do not show disabled dimensions in reports 2022-04-12 15:27:08 +05:30
Deepesh Garg
553178bfe7 test: Add test 2022-04-11 15:29:20 +05:30
Deepesh Garg
54eef3daad Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes 2022-04-11 15:09:30 +05:30
Deepesh Garg
3ce64170db feat: Item-wise provisional accounting for service items 2022-04-11 14:35:22 +05:30
Ankush Menat
086d31b59f fix: dont validate currency exchange in setup 
Redues ~4-5 seconds of time and chances of setup failure.
 2022-04-11 13:19:17 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst 
feat(india): e-invoicing for intra-state union territory transactions
 2022-04-10 18:54:17 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries (#30652) 
Individual GL/SLEs aren't supposed to be cancelled by users.
 2022-04-08 18:05:04 +05:30
Sagar Vora
3b4754f3f6 fix: define tax_columns below consistency 2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470 fix: dont reassign mutable (list) to a different field 2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button 
fix: Exchange gain and loss button in Payment Entry
 2022-04-07 16:49:05 +05:30
Deepesh Garg
22e8ae9dac test: Pricing rule test for transactions 2022-04-07 13:20:53 +05:30
Saqib Ansari
45fca6bed7 feat(india): e-invoicing for intra-state union territory transactions 2022-04-07 13:09:05 +05:30
Deepesh Garg
8feb4f08c5 fix: Exchange gain and loss button in Payment Entry 2022-04-06 20:51:51 +05:30
Deepesh Garg
9bf5f76ac8 fix: Deferred Revenue/Expense Account validation 2022-04-06 17:33:46 +05:30
Deepesh Garg
41a979ef34 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_user_perm 2022-04-06 10:15:16 +05:30
Saqib Ansari
c4b5fa8ed1
Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382 
fix: Added validation for single_threshold in Tax With Holding Category (backport #30382)
 2022-04-05 15:52:28 +05:30
Saqib Ansari
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix 2022-04-05 13:12:08 +05:30
Sherin KR
e796267214 fix: Validation for single threshold in Tax With Holding Category (#30382) 
(cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)
 2022-04-04 13:38:43 +00:00
Saqib Ansari
b91bf40f1b fix: server error while viewing gst e-invoice 2022-04-04 14:40:07 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype 2022-04-04 13:31:46 +05:30
Deepesh Garg
18a3c5d536 fix: Ignore user perm for party account company 2022-04-04 12:32:33 +05:30
Sagar Sharma
0a3cdc2623 chore: rename "is_subcontracted" field label to "Is Subcontracted" 2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Saqib Ansari
bfc34e1084
fix: check for debit credit difference even after round-off adjustment (#30050) 2022-04-01 11:03:16 +05:30
Deepesh Garg
8598d64d2c
Merge pull request #30502 from dj12djdjs/fix-pe-ex-rate-precision 
fix(accounts): payment entry exchange rate precision
 2022-04-01 09:48:15 +05:30
Deepesh Garg
df06d263ae
Merge pull request #30510 from deepeshgarg007/tax_mapping 
fix: Taxes getting overriden from mapped to target doc
 2022-04-01 09:43:19 +05:30
Saqib Ansari
9af353ffa9
Merge pull request #30461 from nextchamp-saqib/fix-asset-warehouse-validation 
fix(asset): do not validate warehouse on asset purchase
 2022-03-31 14:15:16 +05:30
Deepesh Garg
544533ced2
Merge pull request #30486 from deepeshgarg007/account_currenct_change_test 
fix: Account currency validation
 2022-03-31 13:39:04 +05:30
Deepesh Garg
4720969ce6 fix: Taxes getting overriden from mapped to target doc 2022-03-31 12:14:16 +05:30
Devin Slauenwhite
62266b29aa fix: exchange rate precision 2022-03-30 14:22:44 -04:00
Deepesh Garg
45f78977bf
Merge pull request #30493 from nabinhait/party-account-in-ar-ap-report 
feat: Receivable/Payable Account column and filter in AR/AP report
 2022-03-30 21:16:32 +05:30
Deepesh Garg
d93edbc859 fix: make test record 2022-03-30 21:07:56 +05:30
Sagar Vora
7bece37918 fix: update get_cached_value usage based on changes in definition 2022-03-30 15:35:56 +05:30
Saqib Ansari
5408980223 Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:31:54 +05:30
Saqib Ansari
291415d255
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete 
fix: enable row deletion in reference table
 2022-03-30 15:00:16 +05:30
Deepesh Garg
d4cc7c553e fix: Account currency validation 2022-03-30 12:43:18 +05:30
Saqib Ansari
6528218ac3 perf: skip warehouse validation for non-stock items 2022-03-29 18:43:33 +05:30
Saqib Ansari
b60fad6113 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation 2022-03-29 10:50:21 +05:30
Saqib Ansari
136466d255 fix(asset): do not validate warehouse on asset purchase 2022-03-29 10:47:27 +05:30