nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,582 Commits 606 Branches 1,802 Tags
abfd975eb6ff755f46b4879d6f962e49bf237ca7
Commit Graph

2121 Commits

Author SHA1 Message Date
Ankush Menat
abfd975eb6 chore: drop outdated navigation video 
new stuff is in work, this one is actually counter-productive rn.

(cherry picked from commit ba61865ee6)
 2023-05-20 19:47:17 +05:30
mergify[bot]
f8c58b6893 fix(UX): misc "home" onboarding improvements (backport #35319) (#35321) 
fix(UX): misc "home" onboarding improvements (#35319)

* fix(UX): cleanup "Home" onboarding

- Remove company, letterhead, data import etc from home onboarding step

* fix(UX): Show quick entry for item

* chore: fix copy here and there

(cherry picked from commit 5574d9a72d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-05-16 16:00:25 +05:30
mergify[bot]
0e7840301f perf: cache and simplify queries for holiday list (backport #35315) (#35318) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-05-16 13:44:35 +05:30
ruthra kumar
e451916803 test: currency inheritance on child accounts 
(cherry picked from commit f6ea8fd8d7)
 2023-05-08 08:40:28 +00:00
mergify[bot]
70014028e9 chore: ERPNext setup wizard cleanup (#33675) 
chore: ERPNext setup wizard cleanup (#33675)

* chore: ERPNext setup wizard cleanup

* chore: Remove default website

* chore: Remove flaky tests

* chore: remove unwanted tests

(cherry picked from commit 3598bcc9a8)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-24 15:28:41 +05:30
mergify[bot]
8f26d62b35 fix: change discuss forum url (#34891) 
fix: change discuss forum url (#34891)

[skip ci]

(cherry picked from commit dd93ea067e)

Co-authored-by: MohsinAli <mmatiyailol@gmail.com>
 2023-04-18 07:42:45 +05:30
mergify[bot]
3738ea5794 feat: add german sales tax template (#34823) 
feat: add german sales tax template (#34823)

Nullsteuersatz nach § 12 Abs. 3 UStG

(cherry picked from commit 59f6b773cd)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-04-14 14:52:02 +05:30
mergify[bot]
cc21241887 fix: Item tax validity comparison fixes (#34784) 
fix: Item tax validity comparison fixes (#34784)

fix: Item tax validity comparsion fixes
(cherry picked from commit 6f6928fa7b)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-09 18:55:11 +05:30
mergify[bot]
3ad5d676ab fix: Shop by category fixes (backport #34688) (#34750) 
fix: Shop by category fixes (#34688)

* fix: Shop by category fixes

* chore: Update tests

(cherry picked from commit 56f5078357)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-05 13:09:34 +05:30
mergify[bot]
de5fabc67a chore: Update user manual link (#34478) 
* chore: Update user manual link (#34478)

(cherry picked from commit be723bb9d4)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-19 18:06:45 +05:30
mergify[bot]
ba2fd71b65 fix: use max function to get default company address (backport #34116) (#34452) 
* fix: use max function to get default company address

(cherry picked from commit b93c18bd4a)

* test: add test for primary address sorting

(cherry picked from commit e0042972c8)

---------

Co-authored-by: Prateek <40106895+prateekkaramchandani@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-03-15 10:38:49 +05:30
mergify[bot]
0bd765b8ca refactor: clear records in batches in 'Transaction Deletion Record' (#34109) 
refactor: clear records in batches in 'Transaction Deletion Record' (#34109)

refactor: clear records in batches
(cherry picked from commit 4a7b1de2d8)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-21 15:06:45 +05:30
Raffael Meyer
d117de7813 feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 770369e5c1)
 2023-02-14 04:00:23 +00:00
mergify[bot]
dd31bd5254 refactor: install fixtures (#33964) 
refactor: install fixtures (#33964)

* refactor: install fixtures

* style: disable semgrep for install_defaults signature

(cherry picked from commit 201573ab9a)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 16:22:26 +05:30
mergify[bot]
b0ed3c8aed fix: Ignore mandatory fields while creating tax templates for new companies (#34005) 
fix: Ignore mandatory fields while creating tax templates for new companies (#34005)

(cherry picked from commit 0efdc6c13a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 12:27:06 +05:30
mergify[bot]
bb8e232aea fix: list view for Terms and Conditions (#33925) 
fix: list view for Terms and Conditions (#33925)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit ab7293bcd3)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-11 11:53:27 +05:30
mergify[bot]
1a33324b4a fix(ecommerce): breadcrumb: fallback to /all-products (#33718) 
fix(ecommerce): breadcrumb: fallback to `/all-products` (#33718)
 2023-01-20 19:25:28 +05:30
s-aga-r
3dab539719 chore: enable No Copy attribute for route in Item Group 
(cherry picked from commit 348dc32514)
 2023-01-05 07:32:43 +00:00
mergify[bot]
7a98ece7f1 refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33433) 2022-12-26 10:12:12 +05:30
Deepesh Garg
f8c09ee720 fix: Unable to import COA through importer 
(cherry picked from commit 3b66920342)
 2022-12-17 11:13:07 +00:00
Deepesh Garg
cd5a2af272 feat: Ignore company related doctype for other apps via hooks 
(cherry picked from commit 1a40c04b72)
 2022-12-16 05:38:27 +00:00
Sabu Siyad
40621b99c8 fix(ecommerce): remove query parameters from referer 
inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit b6bd408f19)
 2022-12-08 11:42:24 +00:00
Rohit Waghchaure
e039a14f6f fix: default clear repost logs 
(cherry picked from commit 5949a7ecff)
 2022-12-02 08:26:49 +00:00
Deepesh Garg
6c3fbf03f9 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33022 2022-11-28 23:06:23 +05:30
barredterra
5652af04ba feat: german tax templates 
(cherry picked from commit 7fd2639e68)
 2022-11-28 16:25:02 +00:00
barredterra
89b9a06204 feat: add connections to Incoterm doctype 
(cherry picked from commit a5966b6f84)
 2022-11-27 15:24:19 +00:00
barredterra
93e029df91 feat: create Incoterm records after install 
(cherry picked from commit ce83f02f24)
 2022-11-27 15:24:16 +00:00
barredterra
b7119318a6 feat: add doctype Incoterm 
(cherry picked from commit 1a1bfc8db9)
 2022-11-27 15:24:15 +00:00
Ankush Menat
1db83247ce chore: hardcode doctype 2022-11-17 12:01:11 +05:30
mergify[bot]
f8b7cfa6dd refactor: Remove usage of deprecated methods (backport #32914) (#32915) 
* refactor: Remove usage of deprecated methods (#32914)

Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815

(cherry picked from commit 7e1742956c)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py

* chore: conflicts

* style: black


Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-10 11:09:13 +05:30
Sagar Sharma
cb0c4b5664 fix: Brand Defaults filters 
(cherry picked from commit 7da32c7db3)
 2022-10-12 13:53:35 +00:00
Nabin Hait
3b79e24c7e fix: always set default expense account in company 2022-09-14 12:55:49 +05:30
mergify[bot]
027e66f637 fix(Employee): shorter tab titles (backport #32192) (#32193) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-09-13 10:36:12 +05:30
Rucha Mahabal
3c688dfa6d feat: tabbed view for Employee form (#31940) (#32095) 2022-09-06 11:04:13 +05:30
Nabin Hait
f0f7afa669 fix: gl entries for asset repair 
(cherry picked from commit b4a2eb2e65)
 2022-08-25 07:55:08 +00:00
Sagar Vora
6656d23e45 perf: use create_custom_fields (#31853) 
* perf: use `create_custom_fields`

* fix: default must be a string

(cherry picked from commit aafb735283)
 2022-08-18 15:31:42 +00:00
mergify[bot]
8737c10ce4 fix(ecommerce): remove query to non-existing field (backport #31771) (#31773) 
fix(ecommerce): remove query to non-existing field (#31771)

(cherry picked from commit 17b9bfd249)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-03 16:49:16 +05:30
Gavin D'souza
3c26415b6f fix(gd): Scan FY only if current_fiscal_year set 2022-07-25 11:54:49 +05:30
Rucha Mahabal
b30f66c029 chore: use get_single_value in place of get_value 2022-07-19 17:51:03 +05:30
Rucha Mahabal
108cce2785 refactor: rewrite raw sql queries with frappe.qb and database API 2022-07-07 19:00:19 +05:30
Rucha Mahabal
64075cbebc Merge branch 'develop' into hr-separation 2022-07-07 17:36:01 +05:30
Ankush Menat
bc3f99321a refactor: department creation (#31548) 
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
  setup and previous function signature made no sense.
 2022-07-07 16:05:18 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Rucha Mahabal
694d35e1c4 fix: Add Designation fixtures 2022-07-04 16:17:26 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation 
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
 2022-07-01 19:01:17 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Rucha Mahabal
a1a6810b58 fix: Remove HR & Payroll from Authorization Control and Rules 2022-07-01 11:28:34 +05:30
Rucha Mahabal
7442a886a6 test: fix Employee and Activation test 2022-07-01 10:34:32 +05:30
Rucha Mahabal
9f7511d6bf fix: Remove HR & Payroll Settings from Company master 
- moved setup to HRMS app
 2022-06-30 18:12:12 +05:30