schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,986 Commits 322 Branches 1,581 Tags
0ee54b077920bcee607e8a74128f48734cbc1e34
Commit Graph

37986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
0ee54b0779 fix: Partial Trabsfers against JC 
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25dff)
 2021-11-16 13:08:28 +00:00
marination
e3dcccdd18 test: Stock Entry from JC correctness (items mapping and qty) 
(cherry picked from commit 0aa237f38c)
 2021-11-16 13:08:26 +00:00
marination
f3c562bd5b fix: Pull Items that are in JC in Stock Entry against JC 
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da03028f3)
 2021-11-16 13:08:24 +00:00
mergify[bot]
0c65206d69 fix: POS idx issue in taxes table while merging (#28411) 2021-11-16 18:19:57 +05:30
mergify[bot]
09251b3ddf refactor: fix help section background in dark mode (#28406) (#28408) 
(cherry picked from commit 952fc87c99)

Co-authored-by: Ahmed Shareef <46922290+penieldev@users.noreply.github.com>
 2021-11-16 14:32:23 +05:30
rohitwaghchaure
55c13a9917 Merge pull request #28407 from frappe/mergify/bp/version-13-hotfix/pr-28398 
fix: Pricing Rule not created against the Promotional Scheme (backport #28398)
 2021-11-16 14:17:26 +05:30
Rohit Waghchaure
1837204ab0 fix: Pricing Rule not created against the Promotional Scheme 
(cherry picked from commit d82910b08a)
 2021-11-16 08:25:06 +00:00
mergify[bot]
2c9b995c71 fix: remove item-item group name validation (#28392) (#28399) 
(cherry picked from commit 043e3255d6)

Co-authored-by: Rohan <Alchez@users.noreply.github.com>
 2021-11-15 20:01:37 +05:30
mergify[bot]
c1a1e9c399 fix: don't make naming series mandatory for items (backport #28394) (#28396) 
* fix: don't make naming series mandatory for items

Item variants are an exception, hence this needs to be checked
conditionally.

(cherry picked from commit 7fcaeca403)

* fix: patch for naming series property setter

(cherry picked from commit 54184e54ed)

# Conflicts:
#	erpnext/patches.txt

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-15 18:56:15 +05:30
mergify[bot]
2899394bcf fix: Work order creation from sales order (#28388) (#28391) 
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 2eccb7a1ca)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
 2021-11-15 16:10:28 +05:30
mergify[bot]
11f4e1cca3 perf(minor): general ledger report (#28355) 2021-11-15 13:49:58 +05:30
mergify[bot]
d44cab3926 fix: validate hmac unconditionally (#28372) (#28374) 
(cherry picked from commit c0f06bc8e3)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-12 14:53:27 +05:30
mergify[bot]
68ff68a357 fix: Collapse Scrap Items in Job Card (backport #28362) (#28368) 
* fix: Collapse Scrap Items in Job Card (#28362)

(cherry picked from commit a424310581)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-12 14:41:00 +05:30
mergify[bot]
4c99f7159d fix(M-Pesa): validate type before executing get_doc (#28369) (#28373) 
(cherry picked from commit 6d3e9bce5f)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-12 14:39:47 +05:30
mergify[bot]
731f0d71b9 fix(WooCommerce): always expect signature in webhook requests (#28367) 
(cherry picked from commit 24b048925b)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-12 14:09:53 +05:30
Deepesh Garg
399c0a6452 Merge pull request #28365 from frappe/mergify/bp/version-13-hotfix/pr-28363 
fix: Default party account getting overriden in invoices (backport #28363)
 2021-11-12 13:38:41 +05:30
mergify[bot]
350274edb9 fix: commision rate not fetch from sales person (#28350) 2021-11-12 13:14:22 +05:30
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
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
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
Sagar Vora
442177aeee fix: specify fields to be set in Lead (#28289) 2021-11-09 16:05:03 +05:30
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