Mangesh-Khairnar
|
5cbe6160ca
|
feat: consider carry forwarded leaves on creation of encashment
|
2019-08-08 17:06:15 +05:30 |
|
Deepesh Garg
|
f2bf76a2ef
|
fix: Show Cr or Dr symbol in chart of accounts based on balance (#18653)
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
|
2019-08-08 15:52:39 +05:30 |
|
Deepesh Garg
|
f729eed035
|
fix: Show Cr or Dr symbol in chart of accounts based on balance (#18654)
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
|
2019-08-08 15:52:25 +05:30 |
|
Deepesh Garg
|
065e8f3650
|
fix: Changes in print format due to attribute name changes in frappe (#18639)
|
2019-08-08 15:51:56 +05:30 |
|
Deepesh Garg
|
04b42600b0
|
fix: Changes in print format due to attribute name changes in frappe (#18641)
|
2019-08-08 15:51:50 +05:30 |
|
Faris Ansari
|
df7644a96d
|
fix: Show created serial nos as links in message (#18635)
Fixes #18623
|
2019-08-08 15:50:24 +05:30 |
|
Faris Ansari
|
afae8a0c46
|
fix: Show created serial nos as links in message (#18636)
Fixes #18623
|
2019-08-08 15:50:17 +05:30 |
|
Aditya Hase
|
472050bb8a
|
fix(quickbooks): Do not build global search for QuickBooks Migrator (#18628)
|
2019-08-08 15:48:35 +05:30 |
|
Aditya Hase
|
f19b7b9122
|
fix(quickbooks): Do not build global search for QuickBooks Migrator (#18627)
|
2019-08-08 15:48:09 +05:30 |
|
Mangesh-Khairnar
|
e5c733bdb3
|
fix: Accounting period (#18630)
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
|
2019-08-08 15:44:11 +05:30 |
|
Suraj Shetty
|
c7716f0bbc
|
Merge branch 'develop' into refactor-call-popup
|
2019-08-08 12:50:20 +05:30 |
|
Himanshu Warekar
|
b9f2a6048b
|
test: fix test cases
|
2019-08-07 18:21:38 +05:30 |
|
Faris Ansari
|
3623452839
|
fix(Item Template): Fallback description string
Fixes #18572
|
2019-08-07 17:21:51 +05:30 |
|
Faris Ansari
|
2260838933
|
fix(Item Template): Fallback description string
Fixes #18572
|
2019-08-07 17:21:22 +05:30 |
|
Himanshu
|
1b48448b7b
|
Merge branch 'version-12-hotfix' into qms-fixes
|
2019-08-07 11:32:06 +00:00 |
|
Rushabh Mehta
|
6276f1adc5
|
fix(minor): don't update modified timestamp for overdue tasks
|
2019-08-07 16:32:44 +05:30 |
|
Sahil Khan
|
9335cdd536
|
Merge branch 'version-12-hotfix' into version-12
|
2019-08-07 16:21:14 +05:30 |
|
Sahil Khan
|
c5ae3cc120
|
bumped to version 12.0.5
|
2019-08-07 16:41:13 +05:50 |
|
Suraj Shetty
|
9f4b270116
|
fix: prev_doc
|
2019-08-06 09:03:23 +05:30 |
|
Suraj Shetty
|
4ca82f9308
|
fix: Show contact and lead name in list view
|
2019-08-06 05:49:01 +05:30 |
|
Suraj Shetty
|
207f218db3
|
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
|
2019-08-06 05:44:28 +05:30 |
|
Suraj Shetty
|
89d8a0b6fd
|
fix: reset_employee_emails_cache method
|
2019-08-06 05:44:13 +05:30 |
|
Himanshu
|
76c6a050af
|
Merge branch 'version-12-hotfix' into qms-fixes
|
2019-08-05 17:12:44 +00:00 |
|
Deepesh Garg
|
235166ec41
|
Merge pull request #18592 from deepeshgarg007/utils_fix_v12
fix: Ambigious column in query
|
2019-08-05 22:38:45 +05:30 |
|
Suraj Shetty
|
f6f849226e
|
Merge branch 'develop' into refactor-call-popup
|
2019-08-05 21:25:12 +05:30 |
|
Suraj Shetty
|
7d3f1fef1c
|
fix: Employee selection for call popup
- Check if employee with matched number is also
scheduled to receive popup
|
2019-08-05 21:21:45 +05:30 |
|
Mangesh-Khairnar
|
314647572c
|
fix: check for old unexpired allocation
|
2019-08-05 15:35:19 +05:30 |
|
Mangesh-Khairnar
|
6bed870dfa
|
feat: pro-rata leave allocation
|
2019-08-05 14:47:53 +05:30 |
|
Mangesh-Khairnar
|
f281f00d43
|
feat: auto leave encashment
|
2019-08-05 14:47:53 +05:30 |
|
Deepesh Garg
|
e4abaa7cdd
|
Merge pull request #18591 from deepeshgarg007/utils_fix_develop
fix: Ambigious column in query
|
2019-08-05 14:45:30 +05:30 |
|
Himanshu Warekar
|
e8f95a2adf
|
fix: TreeView fixes
|
2019-08-05 14:21:09 +05:30 |
|
Rucha Mahabal
|
d9fa83b196
|
fix: added Company by default in session defaults (#18471)
|
2019-08-05 14:15:16 +05:30 |
|
deepeshgarg007
|
23f30cdb8b
|
fix: Aambigious column in query
|
2019-08-05 12:42:35 +05:30 |
|
deepeshgarg007
|
043f70e9a6
|
fix: Aambigious column in query
|
2019-08-05 12:40:50 +05:30 |
|
Faris Ansari
|
9983d90e24
|
chore: Remove package-lock.json (#18565)
Yarn uses yarn.lock
|
2019-08-05 12:32:41 +05:30 |
|
Deepesh Garg
|
7638301d01
|
Merge pull request #18527 from netchampfaris/bom-comparison-tool
feat: BOM Comparison Tool
|
2019-08-05 11:58:46 +05:30 |
|
Suraj Shetty
|
0957480305
|
fix: Show popup to employees with same phone number
|
2019-08-05 11:32:51 +05:30 |
|
rohitwaghchaure
|
9601b6c601
|
feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533)
|
2019-08-05 10:40:23 +05:30 |
|
Frappe PR Bot
|
833afea3e3
|
feat: Updated translation (#18542)
|
2019-08-05 10:38:37 +05:30 |
|
Anurag Mishra
|
08df6bda41
|
fix: query (#18468)
|
2019-08-05 10:27:25 +05:30 |
|
Mangesh-Khairnar
|
31c5c1e562
|
fix(payroll-entry): show make bank entry button (#18497)
* fix(payroll-entry): show make bank entry button when manually submitting salary slip
* Update payroll_entry.py
|
2019-08-05 10:21:19 +05:30 |
|
Anurag Mishra
|
7e1987ed48
|
feat: validate cwip accounts for journal Entry (#18518)
|
2019-08-05 10:18:57 +05:30 |
|
Anurag Mishra
|
f9fb92ebb0
|
feat: validate cwip accoutns in journal entry (#18519)
|
2019-08-05 10:18:37 +05:30 |
|
Mangesh-Khairnar
|
a3d5200194
|
fix(sales-order): update items (#18535)
* fix(sales-order): update items
* fix: minor changes
* Update: accounts controller
|
2019-08-05 10:16:40 +05:30 |
|
Mangesh-Khairnar
|
9accae3ddc
|
fix(sales-order): update items (#18536)
* fix(sales-order): update items
* fix: minor changes
|
2019-08-05 10:16:25 +05:30 |
|
Deepesh Garg
|
8b0302bab9
|
fix: Make conversion rate optional for non itemized items (#18540)
|
2019-08-05 10:14:19 +05:30 |
|
Deepesh Garg
|
cfb899451f
|
fix: Make conversion rate optional for non itemized items (#18541)
|
2019-08-05 10:14:05 +05:30 |
|
Deepesh Garg
|
fb5aa43e77
|
fix: Type error handling while getting material request items (#18549)
* fix: Type error handling while getting material request items
* fix: Remove flt
|
2019-08-05 10:12:42 +05:30 |
|
Deepesh Garg
|
713d4bb1ba
|
fix: Type error handling while getting material request items (#18550)
* fix: Type error handling while getting material request items
* fix: Remove flt
|
2019-08-05 10:12:17 +05:30 |
|
Deepesh Garg
|
a7eaa4de14
|
fix: Customer price list not honored in shopping cart (#18556)
|
2019-08-05 10:10:53 +05:30 |
|