rohitwaghchaure
7b781b1498
Merge pull request #26158 from marination/stock-reco-repost_qty
...
fix: Include Stock Reco logic in `update_qty_in_future_sle`
2021-07-06 11:22:26 +05:30
Deepesh Garg
96eb3be6df
fix: Debug Tests
2021-07-06 11:21:44 +05:30
Deepesh Garg
66c04ca984
fix: Debug tests
2021-07-06 10:56:42 +05:30
GangaManoj
cf7579e29f
feat: Create GL Entries for discount accounting
2021-07-06 00:36:06 +05:30
Deepesh Garg
32436eceda
fix: Debug tests
2021-07-05 23:34:09 +05:30
Deepesh Garg
c21d3d4865
fix: Debug tests
2021-07-05 22:47:59 +05:30
marination
44c1e8da06
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:59:28 +05:30
marination
e8c9ab4b01
chore: Test for backdated reco qty reposting
2021-07-05 21:59:14 +05:30
marination
8c441263f8
fix: Sider
2021-07-05 21:59:04 +05:30
marination
4038977e2e
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-05 21:58:57 +05:30
marination
8418c4bfe0
fix: Include Stock Reco logic in update_qty_in_future_sle
2021-07-05 21:58:50 +05:30
marination
57d06a86f8
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:56:57 +05:30
Deepesh Garg
8c1b764a90
fix: Debug tests
2021-07-05 21:49:10 +05:30
Afshan
668da102c9
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-05 21:35:23 +05:30
Marica
4f51b56928
Merge branch 'version-13-hotfix' into stock-reco-repost_qty
2021-07-05 20:26:01 +05:30
marination
fa9e67502c
chore: Test for backdated reco qty reposting
2021-07-05 20:23:00 +05:30
Deepesh Garg
9b6d9a41f4
fix: Test Cases
2021-07-05 17:08:27 +05:30
GangaManoj
6e0d83d925
feat(Sales Invoice): Add 'Discount Account' field in Items table
2021-07-05 15:09:05 +05:30
GangaManoj
be15e16b84
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
2021-07-05 14:58:32 +05:30
Deepesh Garg
15b336df28
fix: Test cases
2021-07-05 14:45:33 +05:30
marination
c69bc54297
fix: Validate LCV for Invoices without Update Stock
2021-07-05 14:24:38 +05:30
Rohit Waghchaure
5638fbb1aa
fix: bom stock report not working
2021-07-05 13:54:05 +05:30
Deepesh Garg
db682d9e4c
fix: Create mode of payment if doesn't exists
2021-07-05 13:46:03 +05:30
Ankush Menat
03f7bf6589
test: variant BOM from template BOM
2021-07-05 12:26:14 +05:30
Richard Case
046e83bf50
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 12:26:14 +05:30
Richard Case
75fdf79376
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 10:56:34 +05:30
Deepesh Garg
a0599e5ac2
fix: Test cases for M-pesa
2021-07-05 10:09:42 +05:30
rohitwaghchaure
22c2d4f118
Merge pull request #26312 from rohitwaghchaure/fixed-employee-issue-in-job-card
...
fix: allow to make job card without employee
2021-07-04 22:58:50 +05:30
Deepesh Garg
ddf87594a1
Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix
...
fix: Bank statement import
2021-07-04 20:34:10 +05:30
Deepesh Garg
9d295ca939
fix: Bank statement import
2021-07-04 20:33:36 +05:30
Deepesh Garg
ea5b7d38bb
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
...
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:32:22 +05:30
Deepesh Garg
5069095984
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:31:37 +05:30
Deepesh Garg
cd036e115b
Merge pull request #26231 from deepeshgarg007/party_dashboard
...
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:30:34 +05:30
Deepesh Garg
802e63a9d7
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:29:41 +05:30
Rohit Waghchaure
3105332e3c
fix: allow to make job card without employee
2021-07-03 17:25:08 +05:30
Noah Jacob
8db974b1b9
test: updated test cases
2021-07-02 22:00:33 +05:30
Deepesh Garg
63096014a7
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-07-02 20:30:18 +05:30
Afshan
d06a95b6fa
Merge branch 'develop' into fix-account-selection-gst-settings
2021-07-02 19:32:12 +05:30
marination
311e277204
fix: Sider
2021-07-02 18:11:13 +05:30
Anurag Mishra
73db919c99
fix: set query for training events ( #26303 )
...
* fix: set query
* fix: remove whitespace between function and params
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:55:42 +05:30
Anurag Mishra
0a79cfa170
fix: set query for training events ( #26302 )
...
* fix: set query
* fix: whitespace between function name and param
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:54:43 +05:30
marination
4503a38361
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-02 17:13:45 +05:30
GangaManoj
f8ee8058e7
fix(Sales Invoice): Reset disposal_date on returning the Asset
2021-07-02 15:45:52 +05:30
Afshan
b6076f772d
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-02 15:39:16 +05:30
Afshan
20f73d4c58
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-02 15:34:26 +05:30
GangaManoj
4cf3d9ac20
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-07-02 15:25:04 +05:30
Ashish Shah
c0817838d9
fix: when lead is created with mobile_no, mobile_no value gets lost ( #26298 )
...
Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value)
It is backport of https://github.com/frappe/erpnext/pull/26116
Steps to reproduce
[1]Create a Lead.
[2]Enter
Person Name(lead_name): before_fix
Under Contact section,
enter Phone(phone): 11 and
Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect, it should be 22)
[5]Under Address & Contact section ,check contact_html it shows
before_fix
Phone: 11 (Primary label is missing)
Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing)
Actual:
mobile_no value is lost. it is overwritten by phone value
following is image with error (before fix)
Expected:
mobile_no value should be retained
following is image after fix
2021-07-02 15:16:42 +05:30
Ashish Shah
4e6805b04e
fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) ( #26116 )
...
Steps to reproduce
[1]Create a Lead.
[2]Enter Person Name(lead_name): XX
under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect)
[5]Under Address & Contact section ,check contact_html it shows
ty
Phone: 22 (correct)
Phone: 11 (in correct)
Actual:
mobile_no value is lost. it is overwritten by phone value
Expected:
mobile_no value should be retained
2021-07-02 13:35:04 +05:30
Anupam Kumar
2e86d13012
fix: feating employee in payroll entry ( #26270 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 13:10:51 +05:30
Anupam Kumar
877597bc16
fix: feating employee in payroll entry ( #26271 )
2021-07-02 13:10:18 +05:30
