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

37129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
787cd77f03
Merge pull request #26323 from deepeshgarg007/multi-company-deferred-revenue_develop 
fix: Auto process deferred accounting for multi-company setup
 2021-07-06 16:55:55 +05:30
Rucha Mahabal
e7fceb556d
Merge branch 'develop' into fix-flaky-sla-test 2021-07-06 16:38:46 +05:30
Deepesh Garg
2f3f87dc66
Merge branch 'develop' into multi-company-deferred-revenue_develop 2021-07-06 16:14:25 +05:30
Deepesh Garg
26dc02aa38
Merge branch 'develop' into bank_statement_import_fix_develop 2021-07-06 16:14:13 +05:30
Deepesh Garg
381c05eb87
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop 
fix: Do not consider cancelled entries in party dashboard
 2021-07-06 16:13:49 +05:30
Noah Jacob
0734901a89
fix: stock_rbnb not defined (#26345) 2021-07-06 15:56:10 +05:30
Deepesh Garg
8985231a96 fix: Rewrite tests 2021-07-06 15:34:47 +05:30
Afshan
a63796e6f0
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 14:38:26 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +05:30
Anurag Mishra
1f5e2ba8e7 fix: payroll-entry minor fix 2021-07-06 13:36:23 +05:30
Rucha Mahabal
f67c95d32f fix: flaky SLA test 2021-07-06 13:27:48 +05:30
Afshan
d10c016a0b
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 11:56:39 +05:30
rohitwaghchaure
2fbe41de36
Merge pull request #26342 from marination/stock-reco-repost-qty-develop 
fix: Include Stock Reco logic in `update_qty_in_future_sle`
 2021-07-06 11:22:41 +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
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
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
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
Deepesh Garg
9d295ca939 fix: Bank statement import 2021-07-04 20:33:36 +05:30
Deepesh Garg
5069095984 fix: Auto process deferred accounting for multi-company setup 2021-07-04 20:31:37 +05:30
Deepesh Garg
802e63a9d7 fix: Do not consider cancelled entries in party dashboard 2021-07-04 20:29:41 +05:30
Afshan
d06a95b6fa
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-02 19:32:12 +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
Afshan
20f73d4c58 fix: only "Tax" type accounts should be shown for selection in GST Settings 2021-07-02 15:34:26 +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
Jannat Patel
0a15a03522
fix: lms progress issue (#26250) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 13:06:56 +05:30
Mohammed Yusuf Shaikh
6c2f66b0a4
fix: Added permission for employee to book appointment (#26266) 2021-07-02 12:21:44 +05:30
Mohammed Yusuf Shaikh
86f41839fe
fix: Added a message to enable appointment booking if disabled (#26233) 
* fix: Added a message to enable appointment booking if disabled

* refactor: added translation for the message

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

* fix: added missing import

* fix: minor identation and space fix

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 12:19:24 +05:30
Saqib
f9c58934d8
Merge branch 'develop' into asset-repair-refactor 2021-07-02 11:19:47 +05:30
Ankush
8ebf32e18f
fix: undo changes to issue.py (#26291) 
The fix ported from v13 to develop is not valid because of the new generic SLA feature.
Hard resetting the file to the previous version.
ec25d5938b
 2021-07-02 11:09:19 +05:30
Ankush Menat
a68344fe8a refactor: extend commands from frappe 2021-07-01 21:26:18 +05:30
Ankush Menat
4d9c08d92a chore: add project id for cypress 2021-07-01 21:26:18 +05:30
Ankush Menat
3f14b92e2c ci: UI tests workflow 2021-07-01 21:26:18 +05:30
Nabin Hait
74b8c99bc2 feat: Introduced cypress tests in erpnext 2021-07-01 21:26:18 +05:30
Subin Tom
d2c86bb9d7 fix: Fixed Budget Variance Graph color from all black to default 2021-07-01 19:59:08 +05:30
Afshan
81522ec521
fix: validate Product Bundle for existing transactions before deletion (#25977) 2021-07-01 19:34:58 +05:30
Saqib
49ef26075a
Merge branch 'develop' into asset-repair-refactor 2021-07-01 19:27:20 +05:30
Deepesh Garg
f5961b30db
Merge pull request #26112 from rtdany10/patch-4 
fix: ignore permission to update call log
 2021-07-01 18:12:01 +05:30
Deepesh Garg
8a5c7ea9b4
Merge branch 'develop' into patch-4 2021-07-01 18:08:22 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements (#26090) 
* fix: project portal enhancements

* fix: timesheet table and task nesting

* fix: semgrep and link issue

* fix: sider

* fix: project details view title

* fix: project progress pills

* fix: website route rule for project

* fix: multi level nesting

* fix: added subject and indentation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-01 17:17:34 +05:30
Nabin Hait
07a74abcc3 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2021-07-01 12:55:13 +05:30