Commit Graph

24724 Commits

Author SHA1 Message Date
Jamsheer
3e01891e22 fix: Traverse note from procedure prescription to appointment 2019-01-09 11:19:27 +05:30
Jamsheer
f3c4f5a901 fix: Clinical Procedure - copy fields from appointment 2019-01-09 11:19:26 +05:30
Jamsheer
f4d0fcb836 fix: patient - user welcome email configuration 2019-01-09 11:19:26 +05:30
Jamsheer
b2c9268ece fix: Patient Appointment - Calendar - set color from appointment type 2019-01-09 11:19:26 +05:30
Nabin Hait
bf0b6fd8a9
Merge pull request #16342 from finbyz/staging-fixes
fix: rounded total if available while caclulating advance paid
2019-01-08 20:29:32 +05:30
Nabin Hait
c13b0562ba
Merge pull request #16337 from Anurag810/Employee
fix: Employee Onboarding/Seperation task Assignment
2019-01-08 20:27:43 +05:30
Nabin Hait
142d8aa973
Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt
fix: negative amount showing in the bank clearance summary report
2019-01-08 20:25:26 +05:30
Nabin Hait
e6ec6cccfa
Merge pull request #16316 from Anurag810/purchase-invoice-fixes
fix: expense head of asset items in purchase invoice
2019-01-08 20:23:14 +05:30
Nabin Hait
0f3ccba741
Update test_asset.py 2019-01-08 20:23:01 +05:30
Nabin Hait
2da5937864
Merge pull request #16314 from surajshetty3416/patch-to-rename-additional-salary-component
fix: patch to rename additional salary component
2019-01-08 20:21:16 +05:30
Saurabh
1836285c01 bumped to version 11.0.3-beta.34 2019-01-08 16:52:38 +06:00
rohitwaghchaure
ffdadbf97f fix: fallback to stock uom if uom is not defined (#16329)
* [minor] Code cleanup

* fix: remove 'or' condition, won't execute
2019-01-08 16:21:25 +05:30
Nabin Hait
c190192d5f
Merge pull request #16277 from deepeshgarg007/loyalty-program-fix
fix: Loyalty program issue fix in customer dashboard
2019-01-08 12:15:57 +05:30
Nabin Hait
4c08aaef3d
Merge pull request #16290 from deepeshgarg007/stock-recon
fix: Unorderable type error while making stock reconciliation entry
2019-01-08 11:55:49 +05:30
Nabin Hait
4216d86dd9
Merge pull request #16296 from deepeshgarg007/update_items_bug
fix: Validation while updating items in sales order
2019-01-08 11:54:52 +05:30
Nabin Hait
9ed6deb452
Merge pull request #16333 from deepeshgarg007/report-fix
fix: added customer group column in Item-wise Sales History report
2019-01-08 11:53:14 +05:30
Nabin Hait
49ca9dceb2
Merge branch 'staging-fixes' into report-fix 2019-01-08 11:53:06 +05:30
Nabin Hait
4e3e784691
Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix
perf: Customer contact column in accounts receivable report
2019-01-08 11:52:20 +05:30
Deepesh Garg
7c45f45ebc fix: Divide by zero exception fix in item wise purchase register (#16247)
* Do not prepare row if stock quantity is not available

* Update item_wise_purchase_register.py
2019-01-08 08:34:28 +05:30
Saif
e5091cbc0f chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356)
* chore: Updated DocType json files to clean up git diff of other PRs

* fix: remove auto-generated file
2019-01-07 18:19:30 +05:30
Sagar Vora
cad20abe83
Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-07 15:32:40 +05:30
Sagar Vora
a4af874a43
Merge branch 'staging-fixes' into update_items_bug 2019-01-07 15:21:02 +05:30
Sagar Vora
278d7a44f9
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-07 15:12:44 +05:30
Sagar Vora
92cab55c72
Merge branch 'staging-fixes' into purchase-invoice-fixes 2019-01-07 15:03:37 +05:30
Sagar Vora
f14c56488f
Merge pull request #16325 from rohitwaghchaure/not_able_to_access_report_quoted_item_comparison
fix: report quoted item comparison not working
2019-01-07 14:55:14 +05:30
Sagar Vora
fd78339a7c
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison 2019-01-07 14:54:44 +05:30
Sagar Vora
db40ea4f76
Merge pull request #16328 from rohitwaghchaure/fixed_salary_structure_employee_reqd
fix: employee is reqd to preview salary slip from salary structure
2019-01-07 14:30:57 +05:30
Sagar Vora
26e5c9480b
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd 2019-01-07 14:30:23 +05:30
Sagar Vora
1310c238a9
Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger
fix: replaced str to cstr in genral ledger report
2019-01-07 14:28:27 +05:30
Sagar Vora
f733a39089
fix: remove trailing whitespace 2019-01-07 14:24:01 +05:30
Sagar Vora
3c74266763
fix: PEP8 recommended whitspace 2019-01-07 13:13:16 +05:30
Sagar Vora
23a1b98957
fix: remove unnecessary code 2019-01-07 13:10:18 +05:30
Rohit Waghchaure
ed6725172d Replaced str to cstr in genral ledger report 2019-01-06 20:07:18 +05:30
Deepesh Garg
0eca1646e6
Merge branch 'staging-fixes' into loyalty-program-fix 2019-01-06 12:16:54 +05:30
Deepesh Garg
4772ae2755
Merge branch 'staging-fixes' into stock-recon 2019-01-06 12:16:45 +05:30
Deepesh Garg
16745c2553
Merge branch 'staging-fixes' into update_items_bug 2019-01-06 12:16:37 +05:30
Deepesh Garg
b12c7358b1
Merge branch 'staging-fixes' into report-fix 2019-01-06 12:16:11 +05:30
Deepesh Garg
f840c92c10
Merge branch 'staging-fixes' into accounts-receivable-fix 2019-01-06 10:35:12 +05:30
Frappe Bot
094d539cd9 Merge branch 'staging-fixes' into staging 2019-01-05 09:11:14 +00:00
Frappe Bot
0d54271d15 bumped to version 11.0.3-beta.33 2019-01-05 09:11:14 +00:00
finbyz
5efc7973ea Minor Fix for Rounded Total 2019-01-05 11:12:11 +05:30
Deepesh Garg
1bb9287b2d
Merge branch 'staging-fixes' into update_items_bug 2019-01-04 14:15:40 +05:30
Suraj Shetty
aea25b147f
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component 2019-01-04 13:45:56 +05:30
Sagar Vora
53cac1b616
Merge pull request #16338 from sahil28297/remove_print_from_test_case
fix: Remove print statement from test case
2019-01-04 13:31:00 +05:30
Sahil Khan
3ac57c756b fix: remove print statement from test case 2019-01-04 12:57:34 +05:30
deepeshgarg007
eabf260706 fix :Test cases for accounts receivable report 2019-01-04 12:34:28 +05:30
Anurag Mishra
bb6a7eb9d3 refractor 2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3 Fix: Employee Onboarding/Seperation task Assignment 2019-01-04 11:36:30 +05:30
deepeshgarg007
9de81cda77 Added Customer contact column in accounts Receivable 2019-01-04 10:54:24 +05:30
deepeshgarg007
32f054b901 Added customer group column in item-wise-sales-history report 2019-01-03 22:57:18 +05:30