nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-18 17:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,641 Commits 606 Branches 1,802 Tags
efb037b566b68d26c269623bcd16069d72e7f2c9
Commit Graph

37641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush
efb037b566 refactor!: drop shopify integration from ERPNext (#26700) 
BREAKING CHANGE: remove Shopify integration.

The integration is moved to a separate app with additional enhancements.

The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.

New app: https://github.com/frappe/ecommerce_integrations
 2021-08-02 21:57:52 +05:30
Saqib
78762850ee fix: gl entries for exchange gain loss (#26711) 2021-08-02 20:15:54 +05:30
Ankush
b3740e9afc fix: remove limit from stock balance report (#26773) 2021-08-02 20:13:26 +05:30
Alan
7fe588e236 fix: change format string to percent string interpolation (#26774) 2021-08-02 20:07:55 +05:30
Subin Tom
e99cd2e9da fix: POS Invoice consolidated Sales Invoice field set to no copy (#26706) 2021-08-02 11:39:20 +05:30
Subin Tom
3b7615750a fix: POS Item Cart non-stop scroll issue (#26692) 2021-08-02 11:37:38 +05:30
Subin Tom
58118d7830 fix: missing QR Code in auto email attachment (#26598) 2021-08-02 11:34:43 +05:30
rohitwaghchaure
31fe5f5b92 fix: added progress bar in repost item valuation (#26680) 2021-08-02 11:01:30 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Rohit Waghchaure
8880d13227 Merge branch 'version-13-pre-release' into version-13 v13.8.0 2021-08-01 14:35:10 +05:30
Rohit Waghchaure
8cb560c753 bumped to version 13.8.0 2021-08-01 14:55:09 +05:50
rohitwaghchaure
b86213c890 Merge pull request #26753 from rohitwaghchaure/change-log-v13-8-0 
chore: Added change log for v13.8.0
 2021-08-01 11:37:05 +05:30
Deepesh Garg
36f6e9b58e Merge pull request #26654 from marination/pi-expense-account 
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
 2021-07-31 17:32:24 +05:30
Rohit Waghchaure
6fffc90b46 chore: Added change log for v13.8.0 2021-07-31 16:22:12 +05:30
rohitwaghchaure
41da6f0d13 Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt 
fix: COGS account in purchase receipt
 2021-07-31 14:50:47 +05:30
Nabin Hait
99afe375ea Merge pull request #26237 from rtdany10/patch-5 
feat: Increase number of supported currency exchanges
 2021-07-31 11:34:15 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Deepesh Garg
64267faa8f Merge pull request #26742 from deepeshgarg007/tds_194q_calculations_v13 
fix: TDS calculation for first threshold breach for TDS category 194Q
 2021-07-30 20:41:37 +05:30
Deepesh Garg
6eded547f5 fix: TDS calculation for first threshold breach for TDS category 194Q 2021-07-30 20:12:51 +05:30
Rucha Mahabal
1a2332a81c fix: student category mapping from the program enrollment tool (#26716) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-07-30 18:30:15 +05:30
Saqib
d4ae1febe3 fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30
Rucha Mahabal
821db5cce7 fix: employee status server-side validation (#26442) 
* fix: employee status server-side validation

* fix: test

* test: employee inactive status

* fix: test
 2021-07-30 10:21:42 +05:30
rohitwaghchaure
383c49cfed Merge pull request #26726 from marination/stock-reco-fetch-non-empty-stock 
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
 2021-07-30 00:15:18 +05:30
rohitwaghchaure
50b4b70589 Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 
fix: Parent condition in pricing rules
 2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13 fix: Parent condition in pricing rules 2021-07-29 20:02:49 +05:30
Marica
0eed394f5e Merge branch 'develop' into stock-reco-fetch-non-empty-stock 2021-07-29 19:54:56 +05:30
rohitwaghchaure
22eac9bd0c Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:50:00 +05:30
Ankush
57cd273f7c fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
marination
533ee9a401 feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse 
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
 2021-07-29 19:39:32 +05:30
rohitwaghchaure
020b8ae110 Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:18:58 +05:30
Rohit Waghchaure
a6d276a06f fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:16:20 +05:30
Rohit Waghchaure
c1c5a4ae17 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2 Merge pull request #26712 from ankush/against_acc_pr 
fix: empty "against account" in Purchase Receipt GLE
 2021-07-29 19:10:38 +05:30
Jannat Patel
e99f68fd7e fix: expense claim semgrep issue (#26709) 
* fix: expense claim semgrep issue

* fix: sider
 2021-07-29 18:31:38 +05:30
Ankush
0bb60b37df chore: add timeout to GHA workflows (#26714) 2021-07-29 17:15:12 +05:30
Dany Robert
2833a02e0e Merge branch 'develop' into patch-5 2021-07-29 16:47:28 +05:30
Dany Robert
909995a441 fix: issue with cache.setex 2021-07-29 15:58:27 +05:30
Ankush Menat
5764b49767 fix: remove incorrect field check from reposting 2021-07-29 15:41:22 +05:30
Ankush Menat
c3e739caf8 fix: correct field for GLE against account in PR 2021-07-29 15:34:18 +05:30
Nabin Hait
ebbabf11e9 Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status 
fix: boarding status in Employee Onboarding and Separation
 2021-07-29 15:24:54 +05:30
Ankush
e906acdc49 chore: change location of backport action (#26705) 2021-07-29 13:56:21 +05:30
rohitwaghchaure
04ff0bc40d Merge pull request #26264 from noahjacob/mr_allowance_feat 
feat: over transfer allowance for material transfers
 2021-07-29 11:18:37 +05:30
Ankush
f8343890b9 feat: don't recompute taxes (#26695) 2021-07-29 11:09:34 +05:30
Deepesh Garg
c6fe601efa Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13 
feat: Enhancements in TDS
 2021-07-28 20:58:42 +05:30
Deepesh Garg
e79bfbb104 Merge pull request #26665 from ankush/dont_recompute_taxes 
feat: don't recompute taxes
 2021-07-28 19:36:27 +05:30
rohitwaghchaure
bfd824c56e Merge pull request #26691 from frappe-pr-bot/backport/version-13-pre-release/26689 
fix(bom): remove manual permission checking
 2021-07-28 18:01:58 +05:30
Deepesh Garg
6ac68f3bc7 fix: Patch 2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d fix: Chnage fieldtype from data to check 2021-07-28 17:18:50 +05:30
Ankush
8ed7a21cd5 fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.

(cherry picked from commit d95f16ac8f)
 2021-07-28 11:12:27 +00:00
Ankush
d95f16ac8f fix(bom): remove manual permission checking (#26689) 
get_list does the permission checking.
 2021-07-28 16:38:59 +05:30