nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,470 Commits 461 Branches 1,748 Tags
d03bc7d8dcb2dee9c670c5b28dd46e30c55f78b5
Commit Graph

38470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
b0a58f4111 fix: Default party account getting overriden in invoices 
(cherry picked from commit 88648570d7)
 2021-11-12 07:35:03 +00:00
Deepesh Garg
a9452f1277 fix: Default party account getting overriden in invoices 
(cherry picked from commit 88648570d7)
 2021-11-12 07:34:40 +00:00
Ankush Menat
da64d0b0f9 fix: workspace links to ecommerce settings (#28360) 2021-11-12 10:54:31 +05:30
mergify[bot]
fc5372f201 fix: Unable to edit supplier scorecard criteria name once created (#28348) (#28352) 
(cherry picked from commit 944bf8da71)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
 2021-11-11 20:12:06 +05:30
Deepesh Garg
0f92c68e70 Merge pull request #28340 from frappe/mergify/bp/version-13-hotfix/pr-28334 
fix(India): Sales Invoice with duplicate items not showing correct taxable value (backport #28334)
 2021-11-11 12:55:48 +05:30
Deepesh Garg
1edafd04fc fix(India): Sales Invoice with duplicate items not showing correct taxable value 
(cherry picked from commit 0dca97eb9f)
 2021-11-11 06:09:44 +00:00
Deepesh Garg
279ccece57 Merge pull request #28333 from nemesis189/dispatch-address-not-visible-v13 
fix: Dispatch address details not displayed in v13
 2021-11-11 10:58:19 +05:30
Subin Tom
8ed909da3f fix: Dispatch address details not displayed in v13 2021-11-10 20:36:31 +05:30
Saqib
6661cc7703 fix(pos): get mode of payments query (#28323) 2021-11-10 13:38:21 +05:30
mergify[bot]
eb5320b885 fix(pos): get mode of payments query (#28321) (#28325) 
(cherry picked from commit 6d05bb5274)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-11-10 13:37:35 +05:30
Ankush Menat
5f29cd8685 fix: default value for allow neg stock in repost_item_valuation 
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.

(cherry picked from commit 12e81df2b7)
 2021-11-10 13:32:01 +05:30
mergify[bot]
a40b21cd20 fix(Bank Reconciliation): get credit amount for bank account of type liability (#28319) 2021-11-10 12:57:57 +05:30
Ankush Menat
c04c2108f3 fix: ignore cancelled entries in incorrect balance qty report 
(cherry picked from commit e498389b00)
 2021-11-10 12:13:02 +05:30
Rohit Waghchaure
ab904c22cc Merge branch 'version-13-pre-release' into version-13 v13.14.0 2021-11-09 20:16:01 +05:30
Rohit Waghchaure
6b77bac7da bumped to version 13.14.0 2021-11-09 20:36:00 +05:50
rohitwaghchaure
b9da89a90b Merge pull request #28305 from rohitwaghchaure/change-log-for-v13-14-0 
chore: Added change log for version 13.14.0
 2021-11-09 20:13:44 +05:30
Rohit Waghchaure
f3cfb93a5f chore: Added change log for version 13.14.0 2021-11-09 20:09:09 +05:30
mergify[bot]
fa2f1348ec fix(India setup): setup company independent fixtures for patch (#28304) 
(cherry picked from commit 88b5bda34b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:50:14 +05:30
Wolfram Schmidt
c7f75aad79 fix: add Email option to contact email field (#28296) 
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json

(cherry picked from commit 6907ad8adb)
 2021-11-09 18:37:54 +05:30
Ankush Menat
b45d9065da fix: patch to update job card status 
(cherry picked from commit ccf84ae88a)
 2021-11-09 18:37:07 +05:30
Ankush Menat
f2aa5015cb fix: avoid mutating iterator while iterating over it 
(cherry picked from commit fdfa39c231)
 2021-11-09 18:37:07 +05:30
Ankush Menat
65844932cc fix: use completion qty instead of transfer quantity for JC status 
(cherry picked from commit 37799fe3dd)
 2021-11-09 18:37:07 +05:30
mergify[bot]
47b609ef1a fix(India setup): setup company independent fixtures for patch (#28299) 
(cherry picked from commit 88b5bda34b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 17:50:38 +05:30
mergify[bot]
077073f9a3 perf: improve financial statement loading time (#28295) 
(cherry picked from commit b7a44fe0a3)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2021-11-09 17:33:52 +05:30
rohitwaghchaure
9869b17ee0 Merge pull request #28291 from frappe/mergify/bp/version-13-hotfix/pr-28150 
feat: provision to close the Work Order (backport #28150)
 2021-11-09 16:40:46 +05:30
rohitwaghchaure
346c76cf38 Merge pull request #28290 from frappe/mergify/bp/version-13-pre-release/pr-28150 
feat: provision to close the Work Order (backport #28150)
 2021-11-09 16:38:10 +05:30
rohitwaghchaure
81e7ebc112 Merge pull request #28293 from frappe/mergify/bp/version-13-pre-release/pr-28219 
feat: provision to have limited parameters for in-process quality inspection (backport #28219)
 2021-11-09 16:37:37 +05:30
Sagar Vora
442177aeee fix: specify fields to be set in Lead (#28289) 2021-11-09 16:05:03 +05:30
Diksha Jadhav
bb9713a7b2 refactor: use fetch from property for qi template on job card 
(cherry picked from commit 467324c87f)
 2021-11-09 10:23:00 +00:00
Diksha Jadhav
ac54e80856 feat: provision to have limited parameters for in-process quality inspection 
(cherry picked from commit 6c45f8b2c4)
 2021-11-09 10:22:59 +00:00
Diksha Jadhav
3c78ac21d9 feat(manufacturing): add link field for quality inspection template on operation 
(cherry picked from commit 281a9cc749)
 2021-11-09 10:22:58 +00:00
rohitwaghchaure
8079dc1bae Merge pull request #28219 from DeeMysterio/in-process-qi 
feat: provision to have limited parameters for in-process quality inspection
 2021-11-09 15:49:37 +05:30
Anupam
47851ce754 fix: get_planned_qty chnages 
(cherry picked from commit 663a7afe4d)
 2021-11-09 10:17:09 +00:00
Anupam
7e256e220b fix: test cases 
(cherry picked from commit 27709a1c71)
 2021-11-09 10:17:09 +00:00
Anupam
26c23719a0 fix: testcases: 
(cherry picked from commit 7044ae5e39)
 2021-11-09 10:17:08 +00:00
Anupam
f96ac4e204 fix: linter isuue 
(cherry picked from commit cc15cf6ae2)
 2021-11-09 10:17:07 +00:00
Anupam
b993d45ba5 fix: sider isuue 
(cherry picked from commit ba47bd02b6)
 2021-11-09 10:17:02 +00:00
Anupam
e57f53e771 fix: validate job card 
(cherry picked from commit 9b4c7e4796)
 2021-11-09 10:17:00 +00:00
Anupam
21cc87990a fix: test cases 
(cherry picked from commit 9c0906f1b5)
 2021-11-09 10:17:00 +00:00
Anupam
fcafc0e184 fix: linter issues 
(cherry picked from commit e36da4d137)
 2021-11-09 10:16:59 +00:00
Anupam
ab1f12ff66 fix: linter issues 
(cherry picked from commit 59e4fd980c)
 2021-11-09 10:16:59 +00:00
Anupam
fcb80faadc fix: added testcase 
(cherry picked from commit 530a0f481e)
 2021-11-09 10:16:58 +00:00
Anupam
ac3605c96a fix: sider issue 
(cherry picked from commit 264b0df9ff)
 2021-11-09 10:16:57 +00:00
Anupam
e5e16b5dc4 fix: sider issue 
(cherry picked from commit 55e97dce8a)
 2021-11-09 10:16:57 +00:00
Anupam
91a06b690c fix: sider issue 
(cherry picked from commit e290fe0721)
 2021-11-09 10:16:56 +00:00
Anupam
e144f199a4 feat: added confirm dialog on closing of workorder 
(cherry picked from commit 5d4c5652af)
 2021-11-09 10:16:55 +00:00
Anupam
7bdc948a48 feat: provision to close the Work Order 
(cherry picked from commit 23af036894)
 2021-11-09 10:16:55 +00:00
Anupam
515b8dd8ca fix: get_planned_qty chnages 
(cherry picked from commit 663a7afe4d)
 2021-11-09 10:16:26 +00:00
Anupam
dac0d87e16 fix: test cases 
(cherry picked from commit 27709a1c71)
 2021-11-09 10:16:25 +00:00
Anupam
365572f5ea fix: testcases: 
(cherry picked from commit 7044ae5e39)
 2021-11-09 10:16:25 +00:00