Anurag Mishra
a82e9e42e1
fix: query for training Event
2021-07-08 17:27:21 +05:30
Jannat Patel
cf28950327
Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix
...
fix: payroll-entry minor fix
2021-07-08 13:43:55 +05:30
Anurag Mishra
8f945a9852
fix: Removed un-used flag
2021-07-08 13:06:04 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0
chore: add product listing link in settings ( #26026 )
...
* chore: add product listing link in settings
* chore: add icon in workspace card
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-07 18:21:12 +05:30
rohitwaghchaure
f130f8385e
Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working
...
fix: bom stock report not working
2021-07-07 00:22:03 +05:30
rohitwaghchaure
2bdc0e8993
Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt
...
fix: stock entry with putaway rule not working
2021-07-07 00:15:26 +05:30
Rohit Waghchaure
0bd190b885
fix: stock entry with putaway rule not working
2021-07-07 00:14:51 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
...
feat(India): Bootstrapped GST Setup
2021-07-06 21:44:30 +05:30
Deepesh Garg
67c7067778
Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13
...
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-06 20:33:41 +05:30
Saqib
422325bb74
test: fetching of previous sle ( #26352 )
2021-07-06 18:37:12 +05:30
Deepesh Garg
3636efd7e6
Merge pull request #26355 from deepeshgarg007/flaky_test
...
test: Purchase Invoice advance test case
2021-07-06 18:22:26 +05:30
Noah Jacob
5e99aa7f65
fix: stock_rbnb not defined ( #26354 )
2021-07-06 18:00:35 +05:30
Deepesh Garg
7f794cc0ea
fix: Purchase Invoice advance test case
2021-07-06 17:58:44 +05:30
Afshan
c8eca8a448
fix: remove cancelled entries in consolidated financial statements ( #26331 )
2021-07-06 14:37:57 +05:30
Anurag Mishra
f0b62f70d5
fix: payroll-entry minor fix
2021-07-06 13:40:22 +05:30
Mohammed Yusuf Shaikh
842674ce79
fix: Added a message to enable appontment booking if disabled ( #26334 )
2021-07-06 13:34:32 +05:30
Marica
dfe11aca6a
Merge pull request #26284 from marination/order-by-weightage-for-web-items
...
fix: Order Items by weightage in the web items query
2021-07-06 13:20:08 +05:30
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
marination
57d06a86f8
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:56:57 +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
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
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
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
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
Rohit Waghchaure
3105332e3c
fix: allow to make job card without employee
2021-07-03 17:25:08 +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
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
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
Afshan
b6076f772d
fix: only "Tax" type accounts should be shown for selection in GST Settings
2021-07-02 15:39:16 +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
Anupam Kumar
877597bc16
fix: feating employee in payroll entry ( #26271 )
2021-07-02 13:10:18 +05:30
Jannat Patel
18533e381a
fix: lms progress issue ( #26253 )
2021-07-02 12:57:06 +05:30
Mohammed Yusuf Shaikh
ad6f20c5c7
fix: Added permission for employee to book appointment ( #26255 )
2021-07-02 12:32:22 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements ( #26290 )
...
* fix: project portal enhancements
* fix: condition for pills
2021-07-02 11:48:46 +05:30
Deepesh Garg
d4146a91d6
Merge pull request #25323 from m1ngaa/patch-1
...
Delete accounts (an empty file)
2021-07-01 23:38:56 +05:30
Deepesh Garg
ba2c3c776f
fix: Bank statement import
2021-07-01 18:56:51 +05:30
marination
752f099e9d
fix: Order Items by weightage in the web items query
2021-07-01 17:20:24 +05:30
Anuja Pawar
d8bc514226
fix: to fetch the correct field in Tax Rule ( #25927 )
2021-07-01 14:06:01 +05:30
rohitwaghchaure
117cf4eca6
Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry
...
fix: employee selection not working in payroll entry
2021-07-01 12:31:45 +05:30
rohitwaghchaure
c14fc9530c
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom
...
fix: update cost not working in the draft BOM
2021-07-01 11:57:32 +05:30
Rohit Waghchaure
a856624ccb
fix: employee selection not working in payroll entry
2021-07-01 11:56:55 +05:30
