Marica
|
cf08f0da70
|
Merge branch 'develop' into item-price-pricing-rule-conflict
|
2020-11-03 18:29:22 +05:30 |
|
Rucha Mahabal
|
b7e84f70c9
|
Merge pull request #23799 from ruchamahabal/fix-ipme
fix: Inpatient Medication Order and Entry fixes
|
2020-11-03 15:43:06 +05:30 |
|
Rucha Mahabal
|
ce8b5fc5ca
|
Merge branch 'develop' into fix-ipme
|
2020-11-03 13:56:53 +05:30 |
|
Rucha Mahabal
|
7190e1e4bb
|
fix: Inpatient Medication Order and Entry fixes
|
2020-11-03 13:45:12 +05:30 |
|
Saqib
|
da878c43fc
|
fix: cannot save customer email & phone (#23797)
|
2020-11-03 10:51:09 +05:30 |
|
Saqib
|
c95dff7b7d
|
fix: cannot add items to cart (#23796)
* fix: _ is not defined
* fix: item image alt gets overflowed due to large text
* fix: available item qty in pos search
* fix: cash shortcuts overflow
|
2020-11-03 10:16:58 +05:30 |
|
Deepesh Garg
|
992bd69fc4
|
Merge pull request #23785 from deepeshgarg007/place_of_supply
fix: Place of Supply fix in Sales Invoices
|
2020-11-02 11:23:25 +05:30 |
|
Deepesh Garg
|
eacfd792e6
|
fix: fieldname
|
2020-10-30 22:12:24 +05:30 |
|
Deepesh Garg
|
db3fa4e6b2
|
fix: Place of Supply fix in Sales Invoices
|
2020-10-30 19:19:48 +05:30 |
|
rohitwaghchaure
|
c451c08824
|
Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop
fix: po_detail field has no value for subcontracted stock entry
|
2020-10-30 16:48:11 +05:30 |
|
rohitwaghchaure
|
ce7f9dffa9
|
Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving
fix: patch to update reason for leaving in employee
|
2020-10-30 16:47:48 +05:30 |
|
Rohit Waghchaure
|
e1781dc0bb
|
fix: patch to update reason for leaving in employee
|
2020-10-30 15:34:04 +05:30 |
|
Saqib
|
32442008dc
|
fix: asset finance book posting date fix (#23778)
|
2020-10-30 15:30:18 +05:30 |
|
Rohit Waghchaure
|
71913c36a7
|
fix: po_detail field has no value for subcontracted stock entry
|
2020-10-30 14:35:16 +05:30 |
|
rohitwaghchaure
|
2160050c82
|
Merge pull request #23728 from marination/prod-plan-status
feat: Close Production Plan
|
2020-10-30 14:23:25 +05:30 |
|
Marica
|
b05318aa51
|
Merge branch 'develop' into prod-plan-status
|
2020-10-30 12:33:27 +05:30 |
|
rohitwaghchaure
|
707788da4b
|
Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied
fix: multiple pricing rules are not working on selling side
|
2020-10-30 02:42:51 +05:30 |
|
Marica
|
9dc4941072
|
Merge branch 'develop' into prod-plan-status
|
2020-10-30 00:53:10 +05:30 |
|
François de Ryckel
|
ca5f5cb367
|
Update student_attendance.py (#23761)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2020-10-29 23:04:13 +05:30 |
|
Rucha Mahabal
|
9db26155ad
|
fix: set SLA variance in seconds for Duration fieldtype (#23765)
* fix: calculate SLA variance in seconds for Duration fieldtype
* fix: sider
|
2020-10-29 22:39:21 +05:30 |
|
rohitwaghchaure
|
445d23223b
|
Merge branch 'develop' into multiple-pricing-rules-are-not-applied
|
2020-10-29 22:25:19 +05:30 |
|
Deepesh Garg
|
9c67629e28
|
fix: Ignore cancelled entries instock balance report (#23757)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-10-29 19:51:57 +05:30 |
|
Nabin Hait
|
b7285fdcad
|
Merge branch 'develop' into prod-plan-status
|
2020-10-29 18:58:32 +05:30 |
|
Marica
|
8f6bd851d3
|
chore: Show Toast alert feedback on Scanning Barcode (#23760)
|
2020-10-29 18:55:52 +05:30 |
|
Marica
|
bf54ea9976
|
chore: (Production Plan) Simplify and fix translation in message popup (#23753)
|
2020-10-29 18:54:36 +05:30 |
|
rohitwaghchaure
|
d0c2700c85
|
fix: subscription test case (#23763)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
|
2020-10-29 18:52:16 +05:30 |
|
Saqib
|
b193731158
|
fix: pos profile has no attr 'show_only_available_items' (#23758)
|
2020-10-29 13:23:50 +05:30 |
|
Marica
|
1b8a1cfed2
|
Merge branch 'develop' into prod-plan-status
|
2020-10-29 13:02:19 +05:30 |
|
Kenneth Sequeira
|
10f2468076
|
fix: make asset dashboard charts public (#23751)
|
2020-10-29 12:02:48 +05:30 |
|
Syed Mujeer Hashmi
|
c17cdd7c2e
|
fix: Fix for LMS Sign Up link (#23743)
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2020-10-29 11:10:06 +05:30 |
|
Deepesh Garg
|
ae6a51b83a
|
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix
fix: Do not allow Company as accounting dimension
|
2020-10-28 22:05:11 +05:30 |
|
Rohit Waghchaure
|
0fa741b267
|
added test cases
|
2020-10-28 17:43:36 +05:30 |
|
Deepesh Garg
|
94a630c255
|
fix: Do not allow Company as accounting dimension
|
2020-10-28 17:15:14 +05:30 |
|
Saqib
|
a51d9e3259
|
fix: pos register shows cancelled documents (#23747)
|
2020-10-28 17:08:47 +05:30 |
|
Saqib
|
7d9dd3c628
|
fix: item wise tax calculation (#23744)
|
2020-10-28 17:07:10 +05:30 |
|
Rohit Waghchaure
|
a248dfb9a5
|
fix: multiple pricing rules are not working on selling side
|
2020-10-28 16:22:49 +05:30 |
|
Rushabh Mehta
|
1dd54e457d
|
Merge pull request #23734 from rmehta/quality-form-cleanup
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
|
2020-10-28 11:36:00 +05:30 |
|
Rushabh Mehta
|
12a2e51e20
|
fix(minor): translation string encoding in quality_procedure.py
|
2020-10-27 18:38:44 +05:30 |
|
Rushabh Mehta
|
cf1428904a
|
fix(refactor): refactor tests, client side code
|
2020-10-27 17:36:30 +05:30 |
|
Deepesh Garg
|
0db4d91c30
|
Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix
chore: validate is_group of child parent account
|
2020-10-27 13:54:17 +05:30 |
|
Afshan
|
bd987e56bc
|
fix: showing error for wrong filters. (#23726)
* fix: showing error for wrong filters.
* style: formatting translation
|
2020-10-26 19:37:33 +05:30 |
|
Saqib
|
fa5fe18b70
|
fix error message
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
|
2020-10-26 19:27:02 +05:30 |
|
Deepesh Garg
|
64a4437b48
|
Merge branch 'develop' into add-acc-to-a-group-fix
|
2020-10-26 18:41:32 +05:30 |
|
marination
|
689b77d1ed
|
fix: Don't show buttons if status is Completed
|
2020-10-26 16:28:39 +05:30 |
|
Rushabh Mehta
|
ea49e30bfd
|
fix(cleanup): cleaned up forms
|
2020-10-26 15:30:52 +05:30 |
|
marination
|
097b32fe67
|
feat: Close Production Plan
|
2020-10-26 15:27:37 +05:30 |
|
rohitwaghchaure
|
8c961938ac
|
Merge pull request #23662 from rohitwaghchaure/backport-subcontracting-issues
fix: multiple subcontracting issues
|
2020-10-26 14:10:50 +05:30 |
|
Rohit Waghchaure
|
103ecec9d4
|
fixed translation syntax
|
2020-10-26 12:20:11 +05:30 |
|
Rohit Waghchaure
|
9caac6976c
|
fix: incorrect supplied qty error
|
2020-10-26 12:19:00 +05:30 |
|
Rohit Waghchaure
|
538d62b43d
|
fix: incorrect consumed qty if raw material with batch
|
2020-10-26 12:19:00 +05:30 |
|