Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,511 Commits 3 Branches 0 Tags 1 GiB
90b98440e2
Commit Graph

39511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Rucha Mahabal
e7eef9601d
fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels
 2021-11-22 20:13:15 +05:30
Deepesh Garg
056e3b199c
Merge pull request #28469 from nemesis189/new-company-setup-fy-query 
fix: FY query returning None for new company
 2021-11-22 19:23:07 +05:30
Rohit Waghchaure
db9bd5b912 feat: report to see the consumed materials against the work order 2021-11-22 18:01:20 +05:30
Deepesh Garg
e8370147e8
Merge pull request #28489 from deepeshgarg007/ksa_print_format 
fix: KSA Invoice print format for multicurrency invoices
 2021-11-22 16:34:34 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Deepesh Garg
42c40b33bc fix: KSA Invoice print format for multicurrency invoices 2021-11-22 13:20:43 +05:30
Sagar Sharma
aa689874e3
fix: Closed status error in Work Order Summary (#28460) 
* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:06:59 +05:30
Anupam Kumar
3d0de59131
Merge pull request #28310 from anupamvs/manufacturing-work-order-closed 
fix: function name [is_work_order_stopped -> is_work_order_closed]
 2021-11-22 12:56:24 +05:30
Anupam Kumar
b8ef8bcde9
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 12:56:15 +05:30
Ankush Menat
c436e30ee6 fix: don't use cached doc while reposting 2021-11-22 12:40:18 +05:30
Ankush Menat
aa024fc9da fix: ignore permissions while creating repost 
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.
 2021-11-22 12:40:18 +05:30
Ankush Menat
42f1dd98dd fix: restrict repost valuation to manager roles 2021-11-22 12:40:18 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380) 2021-11-22 12:34:46 +05:30
Saqib
cb52e6dd6b
fix: cost center wise ledger posting for pcv (#28477) 2021-11-22 12:24:32 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387) 
* feat: create party link from customer/supplier

* test: create_party_link method
 2021-11-22 12:23:23 +05:30
Saqib
7677d6d4c3
Merge pull request #28402 from GangaManoj/gross-profit-percentage 
fix: Gross Profit report totals
 2021-11-22 12:21:22 +05:30
Ahmed Shareef
3a2074ce05
fix: add child button in coa tree (#28413) 2021-11-22 11:46:58 +05:30
Ganga Manoj
624e58d1de
fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28443) 2021-11-22 11:36:35 +05:30
Deepesh Garg
8701f537bb
Merge pull request #28471 from nextchamp-saqib/fix-qrcode-generation-ksa 
fix: bug with qrcode generation due to default print format name
 2021-11-22 10:37:27 +05:30
Anupam Kumar
44303f93cc
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 10:36:02 +05:30
Saqib
6e3a276a75
Merge branch 'develop' into new-company-setup-fy-query 2021-11-20 15:16:26 +05:30
Saqib
08ad93d82f
fix: coa balance rendering bug (#28468) 2021-11-20 15:15:46 +05:30
Saqib Ansari
ac27391a1f fix: bug with qrcode generation due to default print format name 2021-11-20 11:22:19 +05:30
Subin Tom
350ed1a6c2 fix: FY query returning None for new company 2021-11-19 21:05:25 +05:30
Mohammed Redah
9d319c2205
fix:Change QR Code Triggerr event 
This fixes the bug if the user changes the date after insertion it will show the wrong values
 2021-11-19 15:13:23 +03:00
Deepesh Garg
f02c787b73
Merge pull request #28461 from frappe/mergify/bp/develop/pr-28459 
fix(India): GST category not getting auto updated (backport #28459)
 2021-11-19 13:05:54 +05:30
Deepesh Garg
ff65399ae9 fix: Add test for gst category check 
(cherry picked from commit cdbc991e3f97c7ed3e120b2e4720298402d1de77)
 2021-11-19 06:51:58 +00:00
Deepesh Garg
a38aca5a54 fix(India): GST category not getting auto updated 
(cherry picked from commit f8a26a9fac2c91b036f1dd4033f3fb4797285043)
 2021-11-19 06:51:58 +00:00
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error 
fix: Shipping Rule picking up old net_rate
 2021-11-19 08:21:53 +05:30
Ankush Menat
f8e371af14 fix(ux): ordering fields for better tab order 2021-11-18 15:48:15 +05:30
Sagar Sharma
488d34af1f
fix: unchecking the "With Operations" in BOM clears operations table #28446 2021-11-18 13:57:13 +05:30
Ganga Manoj
5d8a85db10
Merge branch 'develop' into gross-profit-percentage 2021-11-17 19:23:34 +05:30
Ganga Manoj
6ada1ac887
Merge branch 'develop' into depr-expense-account 2021-11-17 18:56:02 +05:30
Marica
d0c240ee84
Merge pull request #28431 from marination/capacity-dashboard-style 
fix: (style) Warehouse Capacity Dashboard UI
 2021-11-17 18:04:26 +05:30
Ankush Menat
8102e4a210
chore: remove manual collapsing of section (#28435) 2021-11-17 17:05:07 +05:30
Ankush Menat
402205278c chore: remove support email from error message. 
[skip ci]
 2021-11-17 16:33:18 +05:30
marination
23486a929d fix: (style) Warehouse Capacity Dashboard UI 
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard
 2021-11-17 14:21:37 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working 
fix: currency wise pricing rule not working
 2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2 fix: currency wise pricing rule not working 2021-11-17 13:30:17 +05:30
rohitwaghchaure
69421a30d7
Merge pull request #28425 from rohitwaghchaure/improve-performance-to-submit-jv-and-invoice 
fix: performance issue while submitting the Journal Entry
 2021-11-17 12:54:59 +05:30
Rohit Waghchaure
7472760ea3 fix: performance to submit the JV 2021-11-17 11:16:52 +05:30
Anupam Kumar
98308ea089
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-17 10:07:35 +05:30
GangaManoj
cb93cc972d fix: Check all ancestors and not just the root node 2021-11-17 05:22:43 +05:30
GangaManoj
62fbbe8915 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-11-17 04:59:59 +05:30
GangaManoj
8fc31e3cea fix: Make Depreciation Entry posting more flexible 2021-11-17 04:58:13 +05:30
GangaManoj
aa34780265 fix: Filter Depreciation Expense Account by root type 2021-11-17 04:57:40 +05:30
Subin Tom
e7b4204c35 fix: sider issues 2021-11-16 20:39:58 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request (#28186) 2021-11-16 20:31:18 +05:30