rohitwaghchaure
|
4e9361f74b
|
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin
fix: multiple pricing rule with margin type as Percentage is not working
|
2020-12-25 09:33:39 +05:30 |
|
rohitwaghchaure
|
a4d71d5c7f
|
Merge pull request #24205 from rohitwaghchaure/pricing-rule-not-working-margin-v13-beta
fix: multiple pricing rule with margin type as Percentage is not working
|
2020-12-25 09:33:22 +05:30 |
|
Rohit Waghchaure
|
ba5b603a0b
|
fix: multiple pricing rule with margin type not working
|
2020-12-24 22:49:38 +05:30 |
|
Rohit Waghchaure
|
aea62da544
|
fix: multiple pricing rule with margin type not working
|
2020-12-24 22:44:31 +05:30 |
|
Shivam Mishra
|
c54aca3f44
|
chore: cleanup comments
|
2020-12-24 18:02:50 +05:30 |
|
Shivam Mishra
|
a90b6a73dd
|
fix: syntax error
|
2020-12-24 18:02:07 +05:30 |
|
Shivam Mishra
|
419c889a9a
|
feat: add docstrings
|
2020-12-24 17:58:18 +05:30 |
|
Shivam Mishra
|
293f483cb4
|
feat: add ProductQuery engine
|
2020-12-24 17:54:07 +05:30 |
|
rohitwaghchaure
|
b9352b729a
|
Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop
fix: don't cancel job card if manufacturing entry has made
|
2020-12-24 17:46:45 +05:30 |
|
rohitwaghchaure
|
630258f493
|
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop
fix: do not manufacture same serial no multiple times
|
2020-12-24 17:46:26 +05:30 |
|
Rucha Mahabal
|
d013d94e8d
|
Merge branch 'develop' into fix-therapy-type-filter
|
2020-12-24 17:44:25 +05:30 |
|
Rohit Waghchaure
|
304100db3b
|
fix: don't cancel job card if manufacturing entry has made
|
2020-12-24 16:36:37 +05:30 |
|
Rohit Waghchaure
|
ed20819432
|
fix: travis
|
2020-12-24 16:24:10 +05:30 |
|
Shivam Mishra
|
d0437cfb59
|
feat: clear document cache on validate
|
2020-12-24 14:15:09 +05:30 |
|
Shivam Mishra
|
bba2726333
|
fix: minor styling fixes
|
2020-12-24 14:14:17 +05:30 |
|
Anurag Mishra
|
527a156512
|
feat: validated employees whose salary has been already precessed
|
2020-12-24 13:59:12 +05:30 |
|
Jannat Patel
|
29dd7e5fc4
|
Merge branch 'develop' into partially-submit-drop-ship-items-issue
|
2020-12-24 13:44:42 +05:30 |
|
prssanna
|
eb0e596d43
|
feat: store home page and product page
|
2020-12-24 11:40:33 +05:30 |
|
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
|
9fe7f235d0
|
fix: Do not cancel reference document on Quality Inspection cancellation (#24198)
|
2020-12-24 11:03:48 +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 |
|