Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from upstream v13 #38

Merged
merged 379 commits into from
Nov 22, 2021
Merged

Merge from upstream v13 #38

merged 379 commits into from
Nov 22, 2021

Conversation

Alchez
Copy link

@Alchez Alchez commented Oct 21, 2021

No description provided.

rohitwaghchaure and others added 30 commits October 14, 2021 18:31
@rohitwaghchaure
Merge branch 'version-13-hotfix' into 'version-13-pre-release'
952c60b
@rohitwaghchaure
Merge pull request frappe#27961 from rohitwaghchaure/merge-13-hotfix-…
1b7d94d 
…to-pre-release-for-13-13

chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
@mergify @ankush
fix: remove bad description (frappe#27963) (frappe#27964)
02ddd5f 
(cherry picked from commit 4437eb0)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
@marination
fix: Retain space inside Serial no string while cleaning serial nos
2e9d08f 
(cherry picked from commit 41035b0)
@marination
fix: Use strip instead of lstrip and rstrip
db9f56b 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d)
@marination
test: Include serial no with spaces in it in sanitation test
0d1b043 
(cherry picked from commit a934167)
@marination
Merge pull request frappe#27965 from frappe/mergify/bp/version-13-hot…
7b4a5e7 
…fix/pr-27962

fix: Retain space inside Serial no string while cleaning serial nos (backport frappe#27962)
@mergify @nemesis189
fix: POS Profile payment methods table (frappe#27956) (frappe#27966)
268893d 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f3cf36f)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
@deepeshgarg007
fix: Interstate internal transfer invoices not visible in GSTR-1
2896507 
(cherry picked from commit d9d42b1)
@deepeshgarg007
fix: Interstate internal transfer invoices not visible in GSTR-1
4415bf9 
(cherry picked from commit d9d42b1)
@deepeshgarg007
fix: TDS round off not working from second transaction
50e718f 
(cherry picked from commit ca00672)
@deepeshgarg007
fix: TDS round off not working from second transaction
9b71e02 
(cherry picked from commit b7a0853)
@deepeshgarg007
fix: TDS round off not working from second transaction
64b58b1 
(cherry picked from commit ca00672)
@deepeshgarg007
fix: TDS round off not working from second transaction
1796f09 
(cherry picked from commit b7a0853)
@deepeshgarg007
fix: Account number and name incorrectly import using COA importer
f2340b3 
(cherry picked from commit 17a8649)
@deepeshgarg007
fix: Account number and name incorrectly import using COA importer
0012f0b 
(cherry picked from commit 17a8649)
@pateljannat
fix: exclude inactive employees from auto attendance
acc5cff 
(cherry picked from commit 921b4be)
@pateljannat
fix: exclude inactive employees from auto attendance
b648d77 
(cherry picked from commit 921b4be)
@marination
fix: Retain space inside Serial no string while cleaning serial nos
44ab131 
(cherry picked from commit 41035b0)
@marination
fix: Use strip instead of lstrip and rstrip
0fcb3cd 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d)
@marination
test: Include serial no with spaces in it in sanitation test
e69bd39 
(cherry picked from commit a934167)
@pateljannat
Merge pull request frappe#27985 from frappe/mergify/bp/version-13-pre…
4620902 
…-release/pr-27850
@ankush
Merge pull request frappe#27986 from frappe/mergify/bp/version-13-pre…
f038328 
…-release/pr-27962

fix: Retain space inside Serial no string while cleaning serial nos (backport frappe#27962)
@pateljannat
Merge pull request frappe#27984 from frappe/mergify/bp/version-13-hot…
07a9f16 
…fix/pr-27850
@deepeshgarg007
Merge pull request frappe#27978 from frappe/mergify/bp/version-13-hot…
a883f16 
…fix/pr-27970

fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport frappe#27970)
@deepeshgarg007
Merge pull request frappe#27979 from frappe/mergify/bp/version-13-pre…
41a0e12 
…-release/pr-27970

fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport frappe#27970)
@deepeshgarg007
Merge pull request frappe#27980 from frappe/mergify/bp/version-13-hot…
c99fe8b 
…fix/pr-27934

fix: TDS round off not working from second transaction (backport frappe#27934)
@deepeshgarg007
Merge pull request frappe#27981 from frappe/mergify/bp/version-13-pre…
eecfb25 
…-release/pr-27934

fix: TDS round off not working from second transaction (backport frappe#27934)
@deepeshgarg007
Merge pull request frappe#27982 from frappe/mergify/bp/version-13-hot…
9f71863 
…fix/pr-27967

fix: Account number and name incorrectly imported using COA importer (backport frappe#27967)
@deepeshgarg007
Merge pull request frappe#27983 from frappe/mergify/bp/version-13-pre…
f8348ab 
…-release/pr-27967

fix: Account number and name incorrectly imported using COA importer (backport frappe#27967)
anupamvs and others added 28 commits November 9, 2021 10:16
@anupamvs
fix: sider issue
47f8f3d 
(cherry picked from commit 55e97dc)
@anupamvs
fix: sider issue
8ddeb83 
(cherry picked from commit 264b0df)
@anupamvs
fix: added testcase
f3da88e 
(cherry picked from commit 530a0f4)
@anupamvs
fix: linter issues
7c7493c 
(cherry picked from commit 59e4fd9)
@anupamvs
fix: linter issues
cb209d9 
(cherry picked from commit e36da4d)
@anupamvs
fix: test cases
dce943b 
(cherry picked from commit 9c0906f)
@anupamvs
fix: validate job card
116210d 
(cherry picked from commit 9b4c7e4)
@anupamvs
fix: sider isuue
8851b7a 
(cherry picked from commit ba47bd0)
@anupamvs
fix: linter isuue
029e667 
(cherry picked from commit cc15cf6)
@anupamvs
fix: testcases:
365572f 
(cherry picked from commit 7044ae5)
@anupamvs
fix: test cases
dac0d87 
(cherry picked from commit 27709a1)
@anupamvs
fix: get_planned_qty chnages
515b8dd 
(cherry picked from commit 663a7af)
@DeeMysterio
feat(manufacturing): add link field for quality inspection template o…
3c78ac2 
…n operation

(cherry picked from commit 281a9cc)
@DeeMysterio
feat: provision to have limited parameters for in-process quality ins…
ac54e80 
…pection

(cherry picked from commit 6c45f8b)
@DeeMysterio
refactor: use fetch from property for qi template on job card
bb9713a 
(cherry picked from commit 467324c)
@rohitwaghchaure
Merge pull request frappe#28293 from frappe/mergify/bp/version-13-pre…
81e7ebc 
…-release/pr-28219

feat: provision to have limited parameters for in-process quality inspection (backport frappe#28219)
@rohitwaghchaure
Merge pull request frappe#28290 from frappe/mergify/bp/version-13-pre…
346c76c 
…-release/pr-28150

feat: provision to close the Work Order (backport frappe#28150)
@mergify @ruchamahabal
fix(India setup): setup company independent fixtures for patch (frapp…
fa2f134 
…e#28304)

(cherry picked from commit 88b5bda)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
@rohitwaghchaure
chore: Added change log for version 13.14.0
f3cfb93
@rohitwaghchaure
Merge pull request frappe#28305 from rohitwaghchaure/change-log-for-v…
b9da89a 
…13-14-0

chore: Added change log for version 13.14.0
@rohitwaghchaure
bumped to version 13.14.0
6b77bac
@rohitwaghchaure
Merge branch 'version-13-pre-release' into version-13
ab904c2
@nextchamp-saqib
fix(pos): get mode of payments query (frappe#28323)
6661cc7
@deepeshgarg007
fix: Default party account getting overriden in invoices
b0a58f4 
(cherry picked from commit 8864857)
@deepeshgarg007
Merge pull request frappe#28366 from frappe/mergify/bp/version-13-pre…
2747f26 
…-release/pr-28363

fix: Default party account getting overriden in invoices (backport frappe#28363)
@rohitwaghchaure
bumped to version 13.14.1
7fc2f24
@rohitwaghchaure
Merge branch 'version-13-pre-release' into version-13
575d41c
Merge remote-tracking branch 'upstream/version-13' into parsimony-pro…
ec8ca8b 
…duction-v13
@vjFaLk vjFaLk merged commit 0d0e610 into ParsimonyGit:parsimony-production-v13 Nov 22, 2021
@Alchez Alchez deleted the parsimony-production-v13 branch March 2, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vjFaLk vjFaLk Awaiting requested review from vjFaLk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.