prssanna
|
7a38f41350
|
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into shopping-cart
|
2020-12-24 11:39:41 +05:30 |
|
prssanna
|
79c3d6f71d
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart
|
2020-12-24 11:36:59 +05:30 |
|
Rucha Mahabal
|
d2f91e8c11
|
fix: Do not cancel reference document on Quality Inspection cancellation (#24197)
|
2020-12-24 11:03:36 +05:30 |
|
Rushabh Mehta
|
ab1c2b7631
|
fix(minor): routing
|
2020-12-23 23:26:58 +05:30 |
|
Anurag Mishra
|
3278d02cd2
|
fix: sider
|
2020-12-23 18:07:54 +05:30 |
|
Anurag Mishra
|
1446749b63
|
fix: changes requested
|
2020-12-23 18:07:54 +05:30 |
|
Nabin Hait
|
eb065d6d40
|
fix: fixed gl entries
|
2020-12-23 18:07:54 +05:30 |
|
Nabin Hait
|
4da7a15ac0
|
fix: Fixed typo
|
2020-12-23 18:07:54 +05:30 |
|
Anurag Mishra
|
b71611dd3d
|
feat: Added Form dashboard
|
2020-12-23 18:07:54 +05:30 |
|
Anurag Mishra
|
4cc333996c
|
fix: test
|
2020-12-23 18:07:54 +05:30 |
|
Anurag Mishra
|
ba6ff6e227
|
fix: conflict
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
708065cb85
|
fix: test cases
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
af9f172be8
|
fix: requested changes and sider
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
66b697cd05
|
feat: fix test for Gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
550e60a69d
|
feat: fix test for Gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
b88af3a3f7
|
feat: Accrural Entry for Gratuity beafore Payment
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
78fdd5d9b4
|
fix: update status on salary Slip submission
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
46e1c09b45
|
style: Broken into smaller function
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
4d6c3c9449
|
Fix: Changes Requested, Sider, codacy, Transalation
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
493eea19e8
|
feat: added link from desk page and some minor fixes
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
25c356894d
|
test: gratuity
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
f63df91186
|
patch: to create standard Gratuity Rule for india and UAE
|
2020-12-23 18:07:53 +05:30 |
|
Anurag Mishra
|
e1464a7bf0
|
feat: Indian Standard Gratuity Rule
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
34a7250a2d
|
fix: Some enhancements and better validation
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
0761301c2e
|
feat: Added all 3 standard slab for UAE
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
47f3a3a5bd
|
feat: validation for if no slab found
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
6f1538026a
|
feat: added minimum year for gratuity and condition utilisation
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
30299c6f49
|
feat: validating and ordeing the rule slabr
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
dedc0015c0
|
feat(HR): Working day calulation based on attendance or Leave
|
2020-12-23 18:07:06 +05:30 |
|
Anurag Mishra
|
49b326fc08
|
feat(HR): Gratuity Payment
|
2020-12-23 18:07:05 +05:30 |
|
Anurag Mishra
|
fc2cb3a85e
|
Feat: gratuity
|
2020-12-23 18:07:05 +05:30 |
|
Deepesh Garg
|
aa7ab211be
|
Merge pull request #24171 from deepeshgarg007/breadcrum_schema
fix: Add breadcrumbs to item group page
|
2020-12-23 16:52:48 +05:30 |
|
Shivam Mishra
|
1ab4f09ee9
|
fix: use file_url to save file and not file name
|
2020-12-23 15:18:41 +05:30 |
|
Anurag Mishra
|
d884216c6f
|
fix: leave policy dashboard fix
fix: leave policy dashboard fix
|
2020-12-23 13:19:12 +05:30 |
|
Anurag Mishra
|
d556847fca
|
fix: allow addition and removal of employee in payroll Entry
|
2020-12-23 12:59:48 +05:30 |
|
Nabin Hait
|
0411a43c6e
|
fix: set finished good item rate based on qty
|
2020-12-23 12:14:41 +05:30 |
|
Saqib Ansari
|
09c6842199
|
fix: accounting entries of asset when submitting purchase receipt
|
2020-12-23 11:29:26 +05:30 |
|
Tim Gates
|
1fb412e3f6
|
docs: fix simple typo, udpate -> update
There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py.
Should read `update` rather than `udpate`.
|
2020-12-23 11:39:37 +11:00 |
|
barredterra
|
df8ea19406
|
fix: whitespace
|
2020-12-22 17:34:31 +01:00 |
|
barredterra
|
2acd8cbc02
|
fix: sider
|
2020-12-22 17:34:22 +01:00 |
|
Jannat Patel
|
b07914d185
|
Merge branch 'develop' into project-template-and-tasks
|
2020-12-22 20:47:30 +05:30 |
|
pateljannat
|
8dec1c142f
|
fix: removed unused imports
|
2020-12-22 19:55:31 +05:30 |
|
Deepesh Garg
|
e5e2ad646a
|
fix: Test Cases
|
2020-12-22 19:53:07 +05:30 |
|
pateljannat
|
6cf018c762
|
fix: holiday update in tests
|
2020-12-22 19:40:41 +05:30 |
|
pateljannat
|
4ebee5014e
|
feat: aholiday check before setting start and end date in task
|
2020-12-22 18:14:46 +05:30 |
|
barredterra
|
511be6466d
|
Revert "fix: fail silently"
This reverts commit 6900a79421.
|
2020-12-22 11:43:33 +01:00 |
|
barredterra
|
a69021018a
|
test: add test for accounts controller
|
2020-12-22 11:38:09 +01:00 |
|
barredterra
|
5adbe49ca6
|
refactor: translation syntax
|
2020-12-22 11:37:43 +01:00 |
|
barredterra
|
6900a79421
|
fix: fail silently
|
2020-12-22 11:37:13 +01:00 |
|
Deepesh Garg
|
e1320c7e47
|
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
|
2020-12-22 13:32:59 +05:30 |
|