Faris Ansari
|
69eb6d476e
|
Merge remote-tracking branch 'upstream/develop' into esbuild
|
2021-05-07 15:21:33 +05:30 |
|
Faris Ansari
|
a0ac5e3b13
|
chore: Add git blame ignore revs file
Ignore the commit which replaces use of Class.extend with native class in git blames
|
2021-05-07 14:57:32 +05:30 |
|
Faris Ansari
|
0c8294c963
|
fix: gitignore dist directory
|
2021-05-07 14:53:55 +05:30 |
|
Faris Ansari
|
464d838447
|
fix: Update bundle paths
|
2021-05-07 14:53:42 +05:30 |
|
Faris Ansari
|
ff3b71d2e7
|
fix: Make css bundles
|
2021-05-07 14:52:13 +05:30 |
|
Faris Ansari
|
f751738267
|
fix: Make js bundles
|
2021-05-07 14:51:05 +05:30 |
|
Syed Mujeer Hashmi
|
bcf3f3dd29
|
fix: Monthly Attendance Sheet Summarized view (#24976)
* fix: Monthly Attendance Sheet Summarized view
This fixes the count of different leave types in the monthly
attendance sheet summarized view.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Avoid using raw sql query
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
|
2021-05-07 13:34:21 +05:30 |
|
HENRY Florian
|
3ecd7ac4c7
|
fix: Add french chart accounts with account number (#25009)
* fix: Add french chart accounts with account number
* fix actual franch plan
|
2021-05-07 13:33:12 +05:30 |
|
Shariq Ansari
|
ad3edc83ec
|
fix: Render timesheet template on timer field (#25565)
* fix: Render timesheet template on timer field
* fix: sider fix
|
2021-05-07 12:25:40 +05:30 |
|
Nikhil Ponnuru
|
ef9f126cb2
|
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599)
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-05-07 10:06:29 +05:30 |
|
Nabin Hait
|
7481f54e0c
|
Merge branch 'version-13' into develop
|
2021-05-06 19:18:18 +05:30 |
|
Nabin Hait
|
ec2ba6bc1f
|
Merge branch 'version-13-pre-release' into version-13
|
2021-05-06 19:18:17 +05:30 |
|
Nabin Hait
|
ae18efaa0a
|
bumped to version 13.2.1
|
2021-05-06 19:38:17 +05:50 |
|
Nabin Hait
|
0e41295c0e
|
perf: Performance enhancement on setup wizard (#25606)
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
|
2021-05-06 19:14:06 +05:30 |
|
Anurag Mishra
|
80c5c866db
|
Revert "fix: default value for Templates (#25591)" (#25608)
This reverts commit 60f3e9ee29.
|
2021-05-06 17:45:58 +05:30 |
|
Saqib
|
92cefd5655
|
feat(pos): ability to retry on pos closing failure (#25604)
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
|
2021-05-06 17:03:16 +05:30 |
|
Deepesh Garg
|
daf6c124a9
|
fix: Check if payment schedule exists
|
2021-05-06 16:47:02 +05:30 |
|
Deepesh Garg
|
be66ee9723
|
fix: Check if payment schedule exits before updating label
|
2021-05-06 16:46:55 +05:30 |
|
Deepesh Garg
|
a0ed517c85
|
fix: function call to update payment schedule labels
|
2021-05-06 16:46:47 +05:30 |
|
Anurag Mishra
|
60f3e9ee29
|
fix: default value for Templates (#25591)
|
2021-05-05 13:23:42 +05:30 |
|
Anurag Mishra
|
1a923e2361
|
Merge pull request #25576 from Anurag810/Employee-Referrals-ui-fix
fix: created new section for Referral details
|
2021-05-05 12:57:35 +05:30 |
|
Anurag Mishra
|
ca9599da51
|
Merge branch 'develop' into Employee-Referrals-ui-fix
|
2021-05-05 12:57:17 +05:30 |
|
rohitwaghchaure
|
1a0d303e72
|
Merge pull request #25586 from rohitwaghchaure/increased-timeout-of-stoc-reconciliation
fix: stock reconciliation getting time out error during submission
|
2021-05-05 10:17:46 +05:30 |
|
Rohit Waghchaure
|
c432766a70
|
fix: stock reconciliation getting time out error during submission
|
2021-05-05 10:16:21 +05:30 |
|
Deepesh Garg
|
71c9c4f48f
|
Merge pull request #25580 from ceefour/ceefour/period-closing-voucher-25572
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
|
2021-05-04 22:19:45 +05:30 |
|
Hendy Irawan
|
05f9df6c10
|
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
Fixed #25572 Period Closing Voucher incorrect journal entry amount for
Income/Expenses Accounts containing canceled transactions.
|
2021-05-04 13:32:16 +00:00 |
|
Anurag Mishra
|
16da87a307
|
fix: created new section for deatils
|
2021-05-04 17:05:42 +05:30 |
|
Suraj Shetty
|
ca37380d2e
|
Merge branch 'develop' of github.com:frappe/erpnext into develop
|
2021-05-03 19:44:22 +05:30 |
|
Rucha Mahabal
|
f1bdfac7a8
|
fix: Employee Separation (#25503)
* fix: Employee Separation
- add ignore_mandatory flag for project creation
- form clean-up
* fix: Employee Separation test
|
2021-05-03 18:37:00 +05:30 |
|
rohitwaghchaure
|
1f4df80565
|
Merge pull request #25531 from noahjacob/fix_mr_filter
fix: updated item filters for material request
|
2021-05-03 18:36:25 +05:30 |
|
rohitwaghchaure
|
88734eea14
|
Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco
fix: stock reconciliation getting time out error during submission
|
2021-05-03 18:25:33 +05:30 |
|
Rohit Waghchaure
|
8f34ca4ac6
|
fix: stock reconciliation getting time out error during submission
|
2021-05-03 15:32:13 +05:30 |
|
Saqib
|
cdc99cdd49
|
fix(pos): incorrect expense account set in pos invoice (#25543)
|
2021-05-03 11:54:55 +05:30 |
|
Deepesh Garg
|
84ec295b43
|
Merge pull request #25546 from deepeshgarg007/loan_schedule_fixes
fix: Minor fixes in loan
|
2021-05-02 22:35:34 +05:30 |
|
rohitwaghchaure
|
5f177aaeaa
|
Merge pull request #25545 from rohitwaghchaure/fixed-depost-withdrwal-values-has-not-updated
fix: rename field has not updated value of deposit and withdrawal fields
|
2021-05-02 17:54:22 +05:30 |
|
Deepesh Garg
|
c571141c1f
|
fix: Test cases
|
2021-05-02 15:31:04 +05:30 |
|
Deepesh Garg
|
824f089569
|
fix: Auto write off on loan closure
|
2021-05-01 22:07:13 +05:30 |
|
Deepesh Garg
|
1efafb3ce8
|
fix: Do not roundoff balance amount
|
2021-05-01 21:52:43 +05:30 |
|
Rohit Waghchaure
|
2fb573781d
|
fix: rename field has not updated value of deposit and withdrawal fields
|
2021-05-01 17:56:40 +05:30 |
|
Nabin Hait
|
0c7448fc41
|
fix: Fixed merge conflict
|
2021-05-01 14:54:22 +05:30 |
|
Nabin Hait
|
a2fcca85a5
|
fix: Fixed merge conflict
|
2021-05-01 14:53:13 +05:30 |
|
Nabin Hait
|
d8cd5a95cb
|
bumped to version 13.2.0
|
2021-05-01 15:12:44 +05:50 |
|
Nabin Hait
|
3c788f0325
|
chore: Add release note for v13.2.0
|
2021-05-01 14:42:30 +05:30 |
|
rohitwaghchaure
|
2e38f1514f
|
fix: stock ledger entry created against draft stock entry (#25539)
|
2021-05-01 13:53:46 +05:30 |
|
rohitwaghchaure
|
00ea336b52
|
fix: stock ledger entry created against draft stock entry (#25540)
|
2021-05-01 13:53:39 +05:30 |
|
Afshan
|
1fd1e2bb60
|
fix: fieldname when updating docfield property (#25517)
|
2021-04-30 18:41:26 +05:30 |
|
Afshan
|
e91b0021ac
|
fix: fieldname when updating docfield property (#25516)
|
2021-04-30 18:41:19 +05:30 |
|
Afshan
|
5a4615fd4e
|
fix: allow to cancel loan with cancelled replayment entry (#25508)
|
2021-04-30 18:40:43 +05:30 |
|
Nabin Hait
|
a19c6a9278
|
fix: Fetch total stock at company in PO (#25533)
|
2021-04-30 18:38:49 +05:30 |
|
Nabin Hait
|
da0ba15cbf
|
fix: Fetch total stock at company in PO (#25532)
|
2021-04-30 18:38:41 +05:30 |
|