nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,372 Commits 402 Branches 1,700 Tags
709fcd50510520bc2a956131cb1fa85fdd8dca76
Commit Graph

39372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
709fcd5051 feat: Receivable/Payable Account column and filter in AR/AP report 2022-04-07 15:56:42 +05:30
Saqib Ansari
d720d15e3d fix(pos): reload doc before set value (#30610) 2022-04-06 22:32:23 +05:30
Ankush Menat
f89c1b2c0c fix: dont trigger closed WO check on new Job card 2022-04-06 18:28:54 +05:30
mergify[bot]
52aa3561e3 fix: hide pending qty only if original item is assigned (#30599) (#30600) 
(cherry picked from commit 8b090a9f7d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-06 16:38:25 +05:30
mergify[bot]
14f46a3e26 fix: check null values in is_cancelled patch (#30594) (#30595) 
(cherry picked from commit bb875fe217)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-06 15:14:37 +05:30
Marica
50e753330f Merge pull request #30520 from frappe/mergify/bp/version-13-hotfix/pr-30146 
refactor: Add exception handling in background job within BOM Update Tool (backport #30146)
 2022-04-06 13:50:08 +05:30
Deepesh Garg
ff142f8809 Merge pull request #30589 from frappe/mergify/bp/version-13-hotfix/pr-30557 
fix: Issues on loan repayment (backport #30557)
 2022-04-06 13:38:39 +05:30
Deepesh Garg
d7af8e1dfe fix: Issues on loan repayment 
(cherry picked from commit 194605823e)
 2022-04-06 06:07:34 +00:00
Deepesh Garg
08bb18ae8a Merge pull request #30586 from frappe/mergify/bp/version-13-hotfix/pr-30555 
fix: Ignore user perm for party account company (backport #30555)
 2022-04-06 11:35:56 +05:30
Deepesh Garg
ae11562611 test: Ignore parent company account creation 
(cherry picked from commit dec0c1b5bb)
 2022-04-06 05:27:32 +00:00
Deepesh Garg
027b7e7de1 fix: Ignore user perm for party account company 
(cherry picked from commit 18a3c5d536)
 2022-04-06 05:27:32 +00:00
Deepesh Garg
3a55cad05f Merge pull request #30575 from deepeshgarg007/pos_shipping 
fix: Do not apply shipping rule for POS transactions
 2022-04-06 10:00:21 +05:30
Deepesh Garg
95298f0400 fix: Use get instead of dot 2022-04-06 09:27:40 +05:30
marination
e186d76337 fix: Linter 2022-04-05 19:05:30 +05:30
marination
ec646a1a44 fix: User Literal from typing_extensions as its not supported in typing in py 3.7 
- https://mypy.readthedocs.io/en/stable/literal_types.html
 2022-04-05 18:45:55 +05:30
Marica
c5c578d7b4 Merge pull request #30582 from frappe/mergify/bp/version-13-hotfix/pr-30578 
chore: Accessibility for E-commerce Doctypes (backport #30578)
 2022-04-05 18:32:02 +05:30
marination
e8f3e23008 fix: Merge Conflicts 2022-04-05 18:22:35 +05:30
marination
c636b366d5 chore: Add Prices, Stock and E-com Settings access from Website Item 
(cherry picked from commit 065623ce25)
 2022-04-05 12:42:40 +00:00
marination
732b302be0 chore: Accessibility for E-commerce Doctypes 
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together

(cherry picked from commit d4301d6d2f)
 2022-04-05 12:42:40 +00:00
Saqib Ansari
e5db8c57f9 Merge pull request #30581 from frappe/mergify/bp/version-13-hotfix/pr-30579 
fix: fetch from fields not working in eway bill dialog (backport #30579)
 2022-04-05 17:07:34 +05:30
Saqib Ansari
072c3d22b1 Merge pull request #30580 from frappe/mergify/bp/version-13-hotfix/pr-30553 
fix(india): minor e-invoicing fixes (backport #30553)
 2022-04-05 17:07:22 +05:30
Saqib Ansari
0700ee8a06 fix: fetch from fields not working in eway bill dialog 
(cherry picked from commit c8779aa446)
 2022-04-05 10:22:59 +00:00
Saqib Ansari
e1bd156f40 fix: server error while viewing gst e-invoice 
(cherry picked from commit b91bf40f1b)
 2022-04-05 10:22:23 +00:00
Saqib Ansari
01404b2b5b fix(india): cannot generate e-invoice for is_pos invoices 
* If mode of payment > 18 characters, the e-invoice portal throws error

(cherry picked from commit 0c26f9a8c8)
 2022-04-05 10:22:23 +00:00
Rucha Mahabal
6b1a27a641 Merge pull request #30576 from frappe/mergify/bp/version-13-hotfix/pr-30569 2022-04-04 20:40:49 +05:30
Rucha Mahabal
cb2a8aab31 fix(test): set company for employee in leave allocation test setup 
(cherry picked from commit 793164ac2e)
 2022-04-04 14:49:20 +00:00
Rucha Mahabal
e41f35aa82 test: leave allocation validations and total value for updates done before and after submission 
(cherry picked from commit 5499cecffd)
 2022-04-04 14:49:20 +00:00
Rucha Mahabal
1093307dcc fix: total leaves allocated not validated and recalculated on updates post submission 
(cherry picked from commit 3538656a7d)
 2022-04-04 14:49:19 +00:00
rohitwaghchaure
3f13ce5620 Merge pull request #30570 from frappe/mergify/bp/version-13-hotfix/pr-30564 
fix: if accepted warehouse not selected during rejection then stock ledger not created (backport #30564)
 2022-04-04 20:15:15 +05:30
Deepesh Garg
c0ebcfb393 fix: Do not apply shipping rule for POS transactions 2022-04-04 20:05:10 +05:30
Marica
761f8e0b1c Merge pull request #30539 from marination/redisearch-app-install-v13 
feat: Redisearch with consent (bp)
 2022-04-04 19:25:29 +05:30
Sherin KR
0a2c72c594 fix: Validation for single threshold in Tax With Holding Category (#30382) 2022-04-04 19:07:51 +05:30
Rohit Waghchaure
3038a5cd5a test: test case to validate rejected qty without accepted warehouse 
(cherry picked from commit ac5df1abbe)
 2022-04-04 12:57:04 +00:00
Rohit Waghchaure
157461ed02 fix: if accepted warehouse not selected during rejection then stock ledger not created 
(cherry picked from commit 0a71cabab1)
 2022-04-04 12:57:04 +00:00
Marica
3e84607cd4 Merge branch 'version-13-hotfix' into redisearch-app-install-v13 2022-04-04 18:01:36 +05:30
mergify[bot]
012cab80bf fix(ux): refresh update to zero val checkbox (#30567) (#30568) 
(cherry picked from commit de83511091)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-04 17:31:26 +05:30
mergify[bot]
b524e657e2 fix(pos): do not reset search input on item selection (backport #30537) 2022-04-04 16:35:46 +05:30
Ankush Menat
4cc23830f1 fix: maintain FIFO queue even if outgoing_rate is not found (#30563) 
port of #30560
 2022-04-04 15:46:49 +05:30
Marica
e5c303e9f4 Merge branch 'version-13-hotfix' into redisearch-app-install-v13 2022-04-04 13:28:09 +05:30
marination
4dc7047a59 chore: Add TODOs(perf) for Redisearch Query 2022-04-04 13:26:08 +05:30
marination
42ec9db5f4 fix: Payload incorrect data (pass item_group.name) 2022-04-04 12:35:14 +05:30
marination
0f9277a8c8 fix: Add default score of 1 to Item Group Autocompleter 
- If score 0 is inserted into suggestions, RS does not consider that suggestion
 2022-04-04 12:06:27 +05:30
marination
5c36d12369 fix: Convert payload to string before adding to autocompleter 2022-04-04 11:34:39 +05:30
marination
b4d427b429 fix: Better Exception Handling and vaeiabl naming 
- Function to handle RS exceptions (create log and raise error)
- Handle `ResponseError` where it is anticipated
- Misc: Better variables
 2022-04-04 11:15:45 +05:30
rohitwaghchaure
d032a0cd77 Merge pull request #30450 from anupamvs/crm-contract-naming-v13 
feat: configurable Contract naming
 2022-04-02 23:43:02 +05:30
Deepesh Garg
00f6565596 Merge pull request #30550 from frappe/mergify/bp/version-13-hotfix/pr-30191 
fix: incorrect payable amount for loan closure (backport #30191)
 2022-04-02 23:32:56 +05:30
Deepesh Garg
7bf6de1883 fix: Resolve conflicts 2022-04-02 20:33:46 +05:30
Deepesh Garg
3fc43cb259 fix: Code cleanup 
(cherry picked from commit 1b2c6a5b78)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:50 +00:00
Abhinav Raut
1d9a6efb1b fix: incorrect payable amount for loan closure 
(cherry picked from commit 8c76a76154)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:50 +00:00
Abhinav Raut
c44a4e559b fix: incorrect payable amount for loan closure 
- Add penalty amount to payable amount for loan closure

(cherry picked from commit 4e92926a52)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:49 +00:00