CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,462 Commits 424 Branches 1,723 Tags
145bcbaa6d7544ffa144561a588509dbd00bb081
Commit Graph

38462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
145bcbaa6d feat: Accounts, Selling & Assets Onboarding cleanup (#28499) 2021-11-22 18:24:51 +05:30
mergify[bot]
1b4659f028 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* 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-22 13:23:22 +05:30
mergify[bot]
e40d63dc13 fix(e-invoicing): totals validation of e-invoices (#28476) 2021-11-22 11:23:33 +05:30
Deepesh Garg
2a165d6250 Merge pull request #28474 from frappe/mergify/bp/version-13-pre-release/pr-28471 
fix: bug with qrcode generation due to default print format name (backport #28471)
 2021-11-22 11:16:53 +05:30
Saqib Ansari
2c6d973dd6 fix: bug with qrcode generation due to default print format name 
(cherry picked from commit ac27391a1f)
 2021-11-22 05:08:15 +00:00
Deepesh Garg
007057e5f2 Merge pull request #28462 from frappe/mergify/bp/version-13-pre-release/pr-28459 
fix(India): GST category not getting auto updated (backport #28459)
 2021-11-19 13:06:29 +05:30
Deepesh Garg
08207242c1 fix: Add test for gst category check 
(cherry picked from commit cdbc991e3f)
 2021-11-19 06:52:22 +00:00
Deepesh Garg
24c113bf68 fix(India): GST category not getting auto updated 
(cherry picked from commit f8a26a9fac)
 2021-11-19 06:52:22 +00:00
Ankush Menat
bceeb0f751 test: basic test for serialize reco cancel 
(cherry picked from commit ed99aca36f)
 2021-11-18 14:35:13 +05:30
Ankush Menat
cf9397eea0 fix: can not cancel stock reconciliation with sr no 
(cherry picked from commit 8c85012a70)
 2021-11-18 14:35:13 +05:30
mergify[bot]
6fdd5e990a chore: remove manual collapsing of section (#28435) (#28451) 
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:14:44 +05:30
mergify[bot]
b4db3362e0 fix: added job_card_item link in material request (#28222) (#28434) 
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-17 19:37:20 +05:30
rohitwaghchaure
16b90688bb Merge pull request #28430 from frappe/mergify/bp/version-13-pre-release/pr-28417 
fix: currency wise pricing rule not working (backport #28417)
 2021-11-17 14:38:51 +05:30
Rohit Waghchaure
c118fa1ada fix: currency wise pricing rule not working 
(cherry picked from commit 43aeb541c2)
 2021-11-17 08:33:33 +00:00
rohitwaghchaure
801e6df37a Merge pull request #28426 from frappe/mergify/bp/version-13-pre-release/pr-28425 
fix: performance issue while submitting the Journal Entry (backport #28425)
 2021-11-17 13:34:30 +05:30
Rohit Waghchaure
70a130e78d fix: performance to submit the JV 
(cherry picked from commit 7472760ea3)
 2021-11-17 07:25:29 +00:00
rohitwaghchaure
af251e439a Merge pull request #28419 from rohitwaghchaure/merge-hotfix-to-pre-release-for-13-15 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-11-16 22:37:01 +05:30
Rohit Waghchaure
d556645455 Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-11-16 21:25:53 +05:30
Marica
e6451a3a85 Merge pull request #28414 from frappe/mergify/bp/version-13-hotfix/pr-28228 
fix: Pull only Items that are in Job Card in a Stock Entry against Job Card (backport #28228)
 2021-11-16 19:09:13 +05:30
marination
a34eae7bc7 fix: test_job_card_partial_material_transfer test 
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274d79)
 2021-11-16 13:08:31 +00:00
marination
d086039f1b fix: Server side test 
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba7a8)
 2021-11-16 13:08:30 +00:00
marination
619c066f67 fix: (travis) Production Plan Summary Report breaks if no WO 
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2b86)
 2021-11-16 13:08:29 +00:00
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
Rohit Waghchaure
575d41c024 Merge branch 'version-13-pre-release' into version-13 v13.14.1 2021-11-12 23:34:56 +05:30
Rohit Waghchaure
7fc2f24470 bumped to version 13.14.1 2021-11-12 23:54:56 +05:50
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
Deepesh Garg
2747f263c7 Merge pull request #28366 from frappe/mergify/bp/version-13-pre-release/pr-28363 
fix: Default party account getting overriden in invoices (backport #28363)
 2021-11-12 13:38:28 +05:30
mergify[bot]
350274edb9 fix: commision rate not fetch from sales person (#28350) 2021-11-12 13:14:22 +05:30
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