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

28360 Commits

Author SHA1 Message Date
Nabin Hait
a0df79ee8c chore: Added change log for v13.7.0 2021-07-16 13:07:39 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
GangaManoj
6bff653cf0 fix: Sider issues 2021-07-16 02:18:45 +05:30
GangaManoj
857501cbe1 fix: Make additional GL Entries for discount applied on taxes 2021-07-15 22:03:46 +05:30
GangaManoj
40412f7e61 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-15 22:02:43 +05:30
GangaManoj
8e96e2d5a2 fix: Filter options for Additional Discount Account 2021-07-15 22:01:38 +05:30
GangaManoj
4f2bf98966 fix: Add Additional Discount Account field 2021-07-15 22:01:02 +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
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
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
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
18alantom
e244560fb9 fix: set item group as a persistent filter 2021-07-14 17:40:10 +05:30
18alantom
7558e7f115 fix: show child item group items on portal 2021-07-14 17:40:04 +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
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26487) 
* 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:40 +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
513375f264 fix: Nested/Multi-level BOM help link (#26409) 
Updated the link for multi-level boms. Current link is broken.
 2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163 fix: update integration links in help.js (#26483) 2021-07-14 16:07:31 +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
Anuja Pawar
c5d7a13513 fix: sider & translation fixes 2021-07-14 15:49:22 +05:30
18alantom
ddbf7c0020 fix: set item group as a persistent filter 2021-07-14 15:43:22 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices (#26485) 2021-07-14 15:20:14 +05:30
Anuja Pawar
b37ff0d3cf fix: sider fixes 2021-07-14 15:06:56 +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