nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,554 Commits 401 Branches 1,700 Tags
d6ed6d53e9cac2f65cd0fbb067ba8cf8cc5e2ef1
Commit Graph

37554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
d6ed6d53e9 fix: Handle is_search_module_loaded for redis version < 4.0.0 (#27574) 
- Return False if error occurs
 2021-09-18 14:23:44 +05:30
vama
666eaae6ce fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
 2021-09-18 13:21:45 +05:30
Anoop
9ffb65b5a4 fix(healthcare): Duplicate Contact error on add Patient (#27427) 
* fix: duplicate contact error when linking existing Customer to Patient
validation for existing User email and mobile before creating user on Patient update

* test: patient - test contact, user creation

* fix: test_patient_contact clearing contact breaking other tests
sider issues

* fix: use db_set instead of set_value

* fix(test): overlapping appointments

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-18 01:02:31 +05:30
Frappe PR Bot
e6d0a57f0c ci: fix docs checker for empty body (#27569) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-17 17:20:59 +05:30
Frappe PR Bot
6ed40463a0 fix: unecessary keyword args were passed in mapper functions (#27563) (#27565) 
(cherry picked from commit e03d9aa889)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 13:11:54 +05:30
Frappe PR Bot
e990bb8816 fix: Remove duplicates from customer_code field (bp #27555) 
(cherry picked from commit 41f11eca72)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-17 05:15:03 +00:00
Frappe PR Bot
450e1e8ed4 fix: no validation on item defaults (#27549) 
* fix: no validation on item defaults (#27393)

* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 5eba1ccd51)

# Conflicts:
#	erpnext/setup/doctype/item_group/item_group.py
#	erpnext/stock/doctype/item/item.py

* fix: resolve conflicts

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 12:25:39 +00:00
Frappe PR Bot
adc5bf7b9c Merge pull request #27543 from frappe-pr-bot/backport/version-13-hotfix/27538 
fix: Validate if item exists on uploading items in stock reco
 2021-09-16 16:07:56 +05:30
Frappe PR Bot
e9683fad47 fix(ProdPlan): Get SubAssy Items does not work (bp #27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched

(cherry picked from commit 78fe92542c)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 10:22:43 +00:00
Frappe PR Bot
5a34520f3f fix(minor): Employee filter in Unpaid Expense Claims report (#27530) (#27531) 
(cherry picked from commit 866763c16a)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-16 00:14:00 +05:30
Frappe PR Bot
8b3ef8e96e test: automated test for running all stock reports (#27510) (#27522) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular

(cherry picked from commit 70c203d19e)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-15 22:23:07 +05:30
Frappe PR Bot
0fb112107f fix: not able to submit stock entry with 350 items (#27523) (#27526) 
(cherry picked from commit e6a1ad8016)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 21:06:44 +05:30
Deepesh Garg
978028c880 fix(minor): Remove b2c limit check from CDNR Invoices (#27516) 
* fix(minor): Remove b2c limit check from CDNR Invoices

* fix: Remove unnecessary format
 2021-09-15 18:51:06 +05:30
Frappe PR Bot
4bd1bceee2 fix: table data deleted on submitted maintenance schedule (bp #27513) 
(cherry picked from commit 5e0b21582a)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-15 17:45:48 +05:30
Frappe PR Bot
7d733af983 feat: link items to supplier / customer (#27479) 
* Merge pull request #27281 from DeeMysterio/party-specific-items

feat: link items to supplier / customer
(cherry picked from commit aa82624f31)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflict

Co-authored-by: DeeMysterio <dikshajadhav11.dj@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-15 17:19:50 +05:30
Frappe PR Bot
a87cc12024 feat: provision to add scrap item in job card (#27483) (#27512) 
(cherry picked from commit c5a77f60ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 17:17:59 +05:30
Marica
9e0fb74ab2 Merge pull request #27508 from marination/shopping-cart-fixes 
fix: Shopping Cart and Variant Selection
 2021-09-15 14:00:14 +05:30
Frappe PR Bot
604f13c69e fix: Values with same account and different account number in consolidated balance sheet report (#27493) (#27504) 
(cherry picked from commit 625626b973)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 11:49:19 +05:30
Frappe PR Bot
5f4a58fb83 fix: Autoname for customer and supplier (#27505) 
* fix: Autoname for customer and supplier (#27398)

(cherry picked from commit 759f2b7920)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json

* fix: Resolve conflicts

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 11:31:51 +05:30
vama
50fe23308a fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) 
* fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343

* fix: Linting issues

* fix: remove unnecessary caching

[skip ci]

Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
Co-authored-by: Ankush Menat <ankush@iwebnotes.in>
 2021-09-15 11:07:36 +05:30
Frappe PR Bot
247d9bf5c4 fix: Patch for updating tax withholding category dates (#27489) (#27495) 
(cherry picked from commit c53b78e712)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-15 10:30:41 +05:30
Frappe PR Bot
e4cbe12a71 fix: calculate operating cost based on BOM Quantity (#27464) (#27501) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases

(cherry picked from commit 2e2985e4f1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 01:18:56 +05:30
Marica
2a9fbc609d Merge pull request #27488 from marination/validate-cart-settings 
fix: Args missing error on changing Price List currency with cart enabled
 2021-09-14 18:43:15 +05:30
Ankush Menat
4081ecfcd7 chore: sort imports 2021-09-14 18:35:17 +05:30
Marica
d76e5dcb93 Merge pull request #27486 from marination/job-card-excess-transfer-hotfix 
fix: Handle Excess/Multiple Item Transfer against Job Card
 2021-09-14 17:57:39 +05:30
Deepesh Garg
d5f4160260 Merge pull request #27481 from deepeshgarg007/gstin_filter_issue_v13 
fix: GSTR-1 Reports not showing any data
 2021-09-14 16:59:18 +05:30
Deepesh Garg
49fa06f849 Merge pull request #27473 from deepeshgarg007/tds_validity_v13 
feat: Validity dates in Tax Withholding Rates
 2021-09-14 15:28:52 +05:30
Deepesh Garg
ca2420f921 fix: Update fiscal year 2021-09-14 15:06:35 +05:30
Deepesh Garg
0b07107144 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_validity_v13 2021-09-14 15:03:30 +05:30
Nabin Hait
10754831c3 fix: Maintain same rate in Stock Ledger until stock become positive (#27227) 
* fix: Maintain same rate in Stock Ledger until stock become positive

* fix: Maintain same rate in Stock Ledger until stock become positive
 2021-09-14 13:34:36 +05:30
Frappe PR Bot
c9e7e72a29 fix(HR): Ignore invalid fields when updating employee details (#27456) (#27474) 
(cherry picked from commit 95460d9818)

Co-authored-by: Chillar Anand <chillar@avilpage.com>
 2021-09-14 12:48:31 +05:30
Frappe PR Bot
8fd1aec76c fix: employee advance return through multiple additional salaries (#27470) 
* fix: employee advance return through multiple additional salaries (#27438)

* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports

(cherry picked from commit b98740b44a)

* fix: remove naming rule

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-14 12:01:19 +05:30
Deepesh Garg
9708bf3750 fix: Linting Issues 2021-09-14 12:01:02 +05:30
Deepesh Garg
173ae56aec fix: Test Case 2021-09-14 12:01:02 +05:30
Deepesh Garg
f101241907 fix: Hardcode fiscal year and posting date 2021-09-14 12:00:35 +05:30
Deepesh Garg
0bb16b6b59 fix: Debug CI 2021-09-14 12:00:35 +05:30
Deepesh Garg
7d61181f8b test: Update test case 2021-09-14 12:00:09 +05:30
Deepesh Garg
e8edeecc05 fix: Linting and patch fixes 2021-09-14 12:00:09 +05:30
Deepesh Garg
5c9f2bf4a4 fix: Advance TDS test case 2021-09-14 12:00:09 +05:30
Deepesh Garg
dab0fe56f1 feat: Validity dates in Tax Withholding Rates 2021-09-14 12:00:08 +05:30
Frappe PR Bot
52a99d8da6 fix: editable price list rate field in sales transactions (#27455) (#27461) 
(cherry picked from commit a5baf909b7)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-13 18:48:05 +05:30
Frappe PR Bot
64796d3029 fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27453) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349)

* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test

(cherry picked from commit bab644a249)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts in test file

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-13 15:13:43 +05:30
Saqib
bb8d90d741 feat: (get_items_from) filter material request item in purchase order (#24725) 2021-09-13 11:46:00 +05:30
Ankush Menat
5c1f0c98f8 Revert "fix: Salary component account filter (#26605)" (#27446) 
This reverts commit aaea5edbdb.
 2021-09-13 10:09:01 +05:30
Frappe PR Bot
00c4e346c7 fix(ux): clean invalid fields from variant setting (#27442) 
* fix(ux): clean invalid fields from variant setting (#27412)

(cherry picked from commit 6ef879fca2)

# Conflicts:
#	erpnext/stock/doctype/item_variant_settings/item_variant_settings.js

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-12 16:41:31 +05:30
Frappe PR Bot
74fa6fab4c fix(ux): apply proper filtering in stock reports (#27411) (#27443) 
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
(cherry picked from commit d743c41b54)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-12 16:41:17 +05:30
Sagar Vora
dd352df168 Merge pull request #27437 from frappe-pr-bot/backport/version-13-hotfix/27433 
fix: Template Error due to use of single quote
 2021-09-11 17:59:03 +05:30
Sagar Vora
0ecaf23722 fix: Template Error due to use of single quote (#27433) 
(cherry picked from commit dae0a1c1d6)
 2021-09-11 12:25:27 +00:00
Devin Slauenwhite
becf471a3a fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-11 12:22:49 +00:00
Frappe PR Bot
8337ec9fe0 test: basic tests for controllers/queries (bp #27422) 
(cherry picked from commit 62fc544280)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-10 13:09:16 +05:30