Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,411 Commits 3 Branches 0 Tags 1 GiB
80e269887d
Commit Graph

37411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush
80e269887d
fix(ux): item description should fall back to name (#26339) 
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.

Also fixed wrong condition for erasing description while duplicating
item.
 2021-07-19 20:42:44 +05:30
Deepesh Garg
354e2984c2
Merge pull request #26541 from deepeshgarg007/travis_tax_setup 
fix: Typo and remove duplicate function
 2021-07-19 10:42:58 +05:30
Deepesh Garg
2686d04800 fix: Typo and remove duplicate function 2021-07-18 17:54:35 +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
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
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
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
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
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +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
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer (#26499) 2021-07-15 15:31:42 +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
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
f40da4ac4c fix: Paging buttons not working on item group portal page 2021-07-14 20:48:06 +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
Marica
683d18dd95
Merge pull request #26493 from 18alantom/bp-pr-fix-item-group-portal-issues 
fix: item group portal issues (backport)
 2021-07-14 18:01:19 +05:30
Marica
30905e24e0
Merge pull request #26476 from 18alantom/fix-item-group-portal-issues 
fix: item group portal issues
 2021-07-14 17:49:27 +05:30
18alantom
9ea5072c52 fix: set item group as a persistent filter 2021-07-14 17:41:38 +05:30
18alantom
b24c0bfbf9 fix: show child item group items on portal 2021-07-14 17:41:32 +05:30
Marica
3f599b049c
Merge branch 'develop' into fix-item-group-portal-issues 2021-07-14 17:15:18 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop 
feat(India): Bootstrapped GST Setup
 2021-07-14 16:44:12 +05:30
Noah Jacob
03f4db0606
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26488) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:28:54 +05:30
Noah Jacob
c932baeb32
fix: validation check for batch for stock reconciliation type in stock entry (#26370) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:25:42 +05:30
Kenneth Sequeira
24e08301bc
fix: update integration links in help.js (#26483) 2021-07-14 16:02:49 +05:30
Saqib
72715956f1
fix: tds computation summary shows cancelled invoices (#26486) 2021-07-14 15:56:20 +05:30
18alantom
ddbf7c0020 fix: set item group as a persistent filter 2021-07-14 15:43:22 +05:30
Jannat Patel
ccb52f19bc
fix: task status loop (#26006) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-14 14:46:16 +05:30
Saqib
1c76154096
fix: tds computation summary shows cancelled invoices (#26456) 2021-07-14 14:45:39 +05:30
Saqib
d86cdb4368
Merge branch 'develop' into payment_entry_taxes_unallocated_amount 2021-07-14 13:55:09 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop 2021-07-14 13:55:00 +05:30
Saqib
c978fdf3df
fix: test fails due to improper gain loss account set (#26482) 2021-07-14 13:53:30 +05:30