Commit Graph

37731 Commits

Author SHA1 Message Date
Ankush
d8ed9dfcf4
chore: update CODEOWNERS (#26536) (#26537) 2021-07-17 12:49:56 +05:30
Ankush
70a7252469
chore: update CODEOWNERS (#26536) 2021-07-17 12:48:40 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Nabin Hait
4e6f49209f Merge branch 'version-13-pre-release' into version-13 2021-07-16 15:21:33 +05:30
Nabin Hait
e079a1bb33 bumped to version 13.7.0 2021-07-16 15:41:33 +05:50
rohitwaghchaure
ad12fd75a8
Merge pull request #26529 from rohitwaghchaure/patch-to-fix-missing-fg-item-develop
fix: added patch to fix missing FG item
2021-07-16 15:12:46 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item
fix: added patch to fix missing FG item
2021-07-16 15:05:23 +05:30
Nabin Hait
e8abb201c1
Merge pull request #26526 from rohitwaghchaure/patch-to-fix-missing-fg-item-pre
fix: added patch to fix missing FG item
2021-07-16 15:05:16 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor (#26527) 2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956 fix: added patch to fix missing FG item 2021-07-16 14:34:24 +05:30
Rohit Waghchaure
0c6ca09e06 fix: added patch to fix missing FG item 2021-07-16 14:33:25 +05:30
Nabin Hait
f6d6897f34
Merge pull request #26525 from nabinhait/change-log-v13-7-0
chore: Added change log for v13.7.0
2021-07-16 13:09:31 +05:30
Nabin Hait
a0df79ee8c chore: Added change log for v13.7.0 2021-07-16 13:07:39 +05:30
Ankush
627a8a8cfd
chore: disable semgrep on push events (bp #26523) 2021-07-16 13:03:18 +05:30
Ankush
a6d80dcc2a
chore: disable semgrep on push events (#26523) 2021-07-16 13:01:57 +05:30
rohitwaghchaure
9ed36627d2
Merge pull request #26521 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-develop
fix: FG item not fetched in manufacture entry
2021-07-16 11:40:23 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
rohitwaghchaure
bae2890389
Merge pull request #26514 from ankush/backport/develop/pr-26240
feat: provision to make subcontracted purchase order from the production plan (#26240)
2021-07-16 11:29:34 +05:30
Ankush
b164070a4f
ci: make semgrep ignore existing errors (bp #26516) 2021-07-15 19:31:59 +05:30
Ankush
1b5f3cf605
ci: make semgrep ignore existing errors (#26516) 2021-07-15 19:30:05 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor (#26219) 2021-07-15 18:32:15 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field (#26502) 2021-07-15 18:11:22 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer (#26500) 2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 (#26511) 2021-07-15 16:49:55 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 (#26510) 2021-07-15 16:47:50 +05:30
Noah Jacob
2f775ee53c
fix: WIP needs to be set before submit on skip_transfer (#26507) 2021-07-15 16:29:28 +05:30
rohitwaghchaure
a51e230f4a
Merge pull request #26509 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item-pre
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:59 +05:30
Rohit Waghchaure
9997cce1ea fix: FG item not fetched in manufacture entry 2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:05 +05:30
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer (#26499) 2021-07-15 15:31:42 +05:30
Rohit Waghchaure
74b97b5ec9 fix: FG item not fetched in manufacture entry 2021-07-15 14:52:21 +05:30
Deepesh Garg
cc73e7d6fa
Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:45 +05:30
Deepesh Garg
5ad759897f
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:32 +05:30
Deepesh Garg
1524e7f5ba
Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:23 +05:30
Anuja Pawar
888d1f94ce
Merge branch 'develop' into sa-vat-report 2021-07-15 12:17:46 +05:30
18alantom
12f7befa13 fix: check if field_filters is None 2021-07-15 12:09:33 +05:30
18alantom
ca1169eeba fix: check if field_filters is None 2021-07-15 12:03:41 +05:30
Marica
4aebb64165
Merge pull request #26498 from marination/paging-btns-htofix
fix: Paging buttons not working on item group portal page
2021-07-14 21:21:20 +05:30
Marica
f225196028
Merge pull request #26497 from marination/paging-btns-pre-release
fix: Paging buttons not working on item group portal page
2021-07-14 21:19:59 +05:30
Marica
0394c8679c
Merge pull request #26496 from marination/paging-btns
fix: Paging buttons not working on item group portal page
2021-07-14 20:51:29 +05:30
marination
219623279f fix: Paging buttons not working on item group portal page 2021-07-14 20:50:22 +05:30
marination
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +05:30
Anuja Pawar
259947dae9
Merge branch 'develop' into sa-vat-report 2021-07-14 20:47:41 +05:30
Anuja Pawar
b43974a9a6 fix: more sider fixes 2021-07-14 20:37:48 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns 2021-07-14 20:15:22 +05:30
marination
4c6e952902 fix: Paging buttons not working on item group portal page 2021-07-14 20:01:36 +05:30
Afshan
74d7baa80a
fix: filter by accounts with group by accounts (#26438)
* fix: filter by accounts with group by accounts

* fix: parsing json

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-07-14 19:59:11 +05:30