nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,700 Commits 458 Branches 1,746 Tags
d7c4b8a3830538631b2f157500a88f80612c03bb
Commit Graph

39700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 cdbc991e3f)
 2021-11-19 06:51:58 +00:00
Deepesh Garg
a38aca5a54 fix(India): GST category not getting auto updated 
(cherry picked from commit f8a26a9fac)
 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
GangaManoj
059d1f3b74 fix: Rename loop variable 2021-11-19 05:35:41 +05:30
GangaManoj
a4043c035d fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 2021-11-19 05:27:06 +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
Anupam Kumar
37aa2cb271 Merge branch 'develop' into manufacturing-work-order-closed 2021-11-16 19:35:20 +05:30
marination
c192c135d4 Merge branch 'develop' of https://github.com/frappe/erpnext into cost-of-poor-quality 2021-11-16 19:15:47 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
0c9acc799b Merge pull request #28228 from marination/se-required-items-from-jc 
fix: Pull only Items that are in Job Card in a Stock Entry against Job Card
 2021-11-16 18:37:32 +05:30
Marica
612bb5c749 Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
Marica
6bd0c1dbf1 Merge pull request #28269 from marination/pr-return-ux 
refactor:  (ux) Accepted/Rejected/Received Qty UX
 2021-11-16 18:00:42 +05:30
Subin Tom
a1807a2f98 fix: POS idx issue in taxes table while merging (#28389) 2021-11-16 17:46:26 +05:30
Saqib
5f30104e00 Merge branch 'develop' into gross-profit-percentage 2021-11-16 16:00:07 +05:30
Saqib
950261d860 Merge branch 'develop' into serialized-item-consumption 2021-11-16 15:59:53 +05:30
Marica
4afcbfdc08 Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
a5f8274d79 fix: test_job_card_partial_material_transfer test 
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable
 2021-11-16 15:13:19 +05:30