Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address
2019-01-16 17:51:49 +05:30
Nabin Hait
28ccaa3c88
Merge branch 'staging-fixes' into Gross-Profit-Return-Fix
2019-01-16 17:49:22 +05:30
Nabin Hait
3dd5f55412
feat(stock-reco): Fetch items in stock reco based on group warehouse
2019-01-16 16:20:05 +05:30
Nabin Hait
78ccbe24a3
fix(test): BOM raw materials rate from price list as per uom
2019-01-16 16:00:25 +05:30
Nabin Hait
158e7dcd8b
fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM
2019-01-16 16:00:25 +05:30
Nabin Hait
3dde949419
feat(mr_against_so): Merge same items from different BOMs
2019-01-16 15:59:39 +05:30
Sahil Khan
693e81db48
more bis fixes
2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50
BIS issue fixes
2019-01-16 15:59:39 +05:30
Saif Ur Rehman
fccb1e55ec
fix(Gross Profit Report): corrected fieldnames in return invoice query
2019-01-16 14:36:55 +05:00
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address
2019-01-16 11:17:55 +05:30
Nabin Hait
29552c1ec4
Merge pull request #16304 from netchampfaris/fix-item-group-pagination
...
fix(website): Pagination in child item groups
2019-01-16 10:31:48 +05:30
Nabin Hait
7686aa9ff6
Merge pull request #16400 from Zlash65/fix-deff
...
fix: for deferred settings for Item
2019-01-16 10:16:00 +05:30
Nabin Hait
7b3ee0e31c
Merge pull request #16403 from saurabh6790/patch_sequnce_fix
...
Patch sequence fix
2019-01-16 10:15:14 +05:30
Nabin Hait
7213895095
Merge pull request #16404 from Zlash65/fix-asset-category
...
fix: Asset Category field as link type and read only
2019-01-16 10:14:21 +05:30
Nabin Hait
f0571ddf4b
Merge pull request #16393 from diamorafaela/quotation-currency
...
fix: Quotation to Sales Order with different currency
2019-01-16 10:13:44 +05:30
Nabin Hait
d98315c41c
Merge pull request #16402 from sagarvora/fix-patch-testing
...
fix(tests): change patch order, optimise Travis
2019-01-16 10:13:14 +05:30
Saurabh
7d630b3e29
Merge branch 'master' into staging-fixes
2019-01-15 19:41:09 +05:30
Saurabh
529cc1ca51
bumped to version 10.1.77
2019-01-15 19:46:36 +06:00
Rohit Waghchaure
affeb3dfec
Added on account amount field in Accounts Payable/Receivable Summary
2019-01-15 17:38:31 +05:30
Rohit Waghchaure
1a4c1e11cb
Fix: total invoiced amount in Accounts Receivable Summary report showing blank
2019-01-15 17:01:34 +05:30
Zlash65
cef56b5147
fixes asset category field as link type and read only
2019-01-15 16:26:58 +05:30
Rohit Waghchaure
b2d08a498b
Added bank account field in the payment entry
2019-01-15 16:11:29 +05:30
Zlash65
a3dd798bad
clean if conditions
2019-01-15 16:05:42 +05:30
Rohit Waghchaure
bdee57ca8d
Added finance book in trial balance and fixed cost center not working issue in trial balance
2019-01-15 15:52:52 +05:30
Saif Ur Rehman
f86123ad5a
feat(Party Ledger Summary): Include columns for discount and other adjustments
2019-01-15 15:18:43 +05:00
Sagar Vora
876d868fa1
fix(tests): change patch order, optimise travis
2019-01-15 15:45:33 +05:30
Rohit Waghchaure
df7215dcb2
Added supplier name in the tds report
2019-01-15 14:48:06 +05:30
Saurabh
68ea608ca8
fix: import unicode_literals
2019-01-15 14:47:32 +05:30
Zlash65
627be1de51
minor fixes for deferred calculations
2019-01-15 14:16:50 +05:30
NahuelOperto
9080221d46
fix: added test cases
2019-01-14 12:12:56 -03:00
Nabin Hait
acd7f73d57
Merge branch 'hotfix' into group_warehouse_stock_reco
2019-01-14 20:25:53 +05:30
Nabin Hait
4ed7cfc515
tests(cost-center-company): Validate cost center's company and revent tests
2019-01-14 17:14:39 +05:30
rohitwaghchaure
ba54209c86
[Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available ( #16379 )
2019-01-12 17:58:00 +05:30
NahuelOperto
7facc34851
fix: removed filter from method validate
2019-01-11 10:46:38 -03:00
Nabin Hait
5c86cf54a2
Merge pull request #16288 from Anurag810/task-fixes
...
[fix] 'Expected End Date' in task should not be later than 'Expected End Date' of project
2019-01-11 14:21:58 +05:30
Anurag Mishra
cd8908362a
Changes Requested Done
2019-01-11 12:23:23 +05:30
Nabin Hait
7e3c80bd8a
Merge pull request #16213 from nabinhait/pplan_fix
...
fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse
2019-01-10 17:57:28 +05:30
Nabin Hait
0d208851a4
Fix(stock-reco): Fixed codacy issues
2019-01-10 17:56:11 +05:30
Sagar Vora
f99e013ebc
fix: gstin validation should work when there is no state ( #16378 )
2019-01-10 11:57:24 +05:30
Sagar Vora
07cf4e8f5b
fix: use division consistent with Python 3 & other changes
2019-01-10 11:14:58 +05:30
Nabin Hait
187bdf08a6
Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice
...
fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart
2019-01-10 10:55:41 +05:30
Nabin Hait
afbdaa525e
Merge pull request #16365 from hiousi/patch-1
...
fix: variant can not get its price
2019-01-10 10:36:27 +05:30
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix
...
fix: Sales Analytics Period Range
2019-01-10 10:35:31 +05:30
karthikeyan5
2825b929c1
fix(GSTIN Validation - india): added checksum validation for GSTIN
2019-01-09 19:15:10 +05:30
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address
2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307
Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt
2019-01-09 17:09:11 +05:30
Rohit Waghchaure
701c762a68
Show outward entries in negative for Bank Clearance Summary report
2019-01-09 14:21:03 +05:30
Saif Ur Rehman
2689dea72a
fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse
2019-01-09 13:43:06 +05:00
Jamsheer
319ca86c81
fix: Test Fee Validity
2019-01-09 13:29:20 +05:30
Jamsheer
c0ac849776
fix: Helathcare Prcatitioner custom query escaped
2019-01-09 11:48:41 +05:30
Jamsheer
45c5138eaf
fix: updated options for abdomen in Vital Signs
2019-01-09 11:19:27 +05:30
Jamsheer
f2d7e3309f
fix: Patient Appointment - Calendar - status != Cancelled
2019-01-09 11:19:27 +05:30
Jamsheer
17bb0da278
fix: remove print statement
2019-01-09 11:19:27 +05:30
Jamsheer
c3804230cd
fix: Patient - Quick Entry enabled
2019-01-09 11:19:27 +05:30
Jamsheer
52ac72e63e
fix: Validate Patient Appointment
2019-01-09 11:19:27 +05:30
Jamsheer
c0097ad729
feat: Filter active Healthcare Practitioner
2019-01-09 11:19:27 +05:30
Jamsheer
fb7b5292b3
fix: Clinical Procedure - consume stock if items present
2019-01-09 11:19:27 +05:30
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
hiousi
9671438435
Update get_item_details.py
2019-01-08 22:23:45 +01:00
hiousi
1516e29609
[fix] variant can not get its price
...
get_price_list_rate() return empty dict before trying to get the item price for a variant.
2019-01-08 18:34:08 +01:00
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
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
7d60c03ed9
Merge branch 'staging-fixes' into pplan_fix
2019-01-07 15:54:16 +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
fd78339a7c
Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison
2019-01-07 14:54:44 +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
fbadb19d93
Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice
2019-01-07 13:55:43 +05:30
Sagar Vora
d40743a570
fix: 14th digit may not be zero
2019-01-07 13:38:43 +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
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
Mangesh-Khairnar
e2ea987610
fixed edge cases for yearly, weekly and monthly views
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a
(refactor) removed unnecessary code
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6
(fix) multiple years in yearly view
2019-01-05 00:15:31 +05:30
Himanshu
75ab042632
removed lowercase regex
2019-01-04 17:13:43 +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
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
Anurag Mishra
68aedfd176
typo
2019-01-04 11:00:07 +05:30
deepeshgarg007
9de81cda77
Added Customer contact column in accounts Receivable
2019-01-04 10:54:24 +05:30
Anurag Mishra
f2b29a0488
typo
2019-01-04 10:54:05 +05:30
Himanshu
547229fef1
PAN card validation in GST
2019-01-03 23:20:38 +05:30
deepeshgarg007
32f054b901
Added customer group column in item-wise-sales-history report
2019-01-03 22:57:18 +05:30
Suraj Shetty
6fe5c5c84d
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-03 16:59:30 +05:30
Rohit Waghchaure
8bac5b6e73
[minor] Employee is reqd to preview salary slip from salary structure
2019-01-03 16:20:35 +05:30
Nabin Hait
47c9826b6f
test(reco-warehouse): Get items for group warehouse
2019-01-03 15:24:59 +05:30
Himanshu
53c040f838
Gst number validation fix
2019-01-03 12:50:18 +05:30
Rohit Waghchaure
3dc5b93db7
[Fix] Report quoted item comparison not working
2019-01-03 12:19:44 +05:30
Sagar Vora
c14c7c84e3
fix: leave application and timesheet tests
2019-01-02 21:28:11 +05:30
Rohit Waghchaure
1ff1fc4725
[Fix] Negative amount showing in the bank clearance summary
2019-01-02 17:56:08 +05:30
Anurag Mishra
4c8c50e464
test case fixed
2019-01-02 17:52:28 +05:30
Suraj Shetty
0f8eb37e1c
Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component
2019-01-02 17:47:59 +05:30
Saif Ur Rehman
016f29f09b
fix: error due to passing None in scrub
2019-01-02 16:22:22 +05:00
Saif Ur Rehman
e194a655df
fix: is_opening != 'Yes'
2019-01-02 16:09:34 +05:00
Anurag Mishra
772e2c4e20
test cases
2019-01-02 15:59:58 +05:30
rohitwaghchaure
9c69e40970
Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department
...
[Fix] Not able to delete department
2019-01-02 15:58:24 +05:30
Anurag Mishra
5865fcca3c
fix: expense head of asset items in purchase invoice
2019-01-02 14:36:07 +05:30
Deepesh Garg
74306cc5ea
Merge branch 'staging-fixes' into update_items_bug
2019-01-02 14:10:23 +05:30
deepeshgarg007
9c0c633259
fix: Added validation for stock reconciliation in stock ledger entry
2019-01-02 11:31:55 +05:30
Suraj Shetty
c349ae26b9
Add patch to rename additional salary component
...
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
2019-01-02 09:31:11 +05:30
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
deepeshgarg007
8300f5ede7
fix: Codacy issues and added test case
2019-01-01 20:28:49 +05:30
deepeshgarg007
78ad6c4cb7
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix
2019-01-01 19:46:08 +05:30
deepeshgarg007
9eb99dc61e
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon
2019-01-01 18:40:24 +05:30
deepeshgarg007
318dc422bc
Updated test Cases for update_child_rate_qty
2019-01-01 18:30:33 +05:30
deepeshgarg007
1451304526
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into update_items_bug
2019-01-01 17:13:37 +05:30
Saif Ur Rehman
fac6b59627
Exclude opening invoices in Gross Profit Report
2019-01-01 16:33:22 +05:00
Rohit Waghchaure
c186f153ff
Added test cases
2019-01-01 15:03:56 +05:30
Anurag Mishra
0885485a61
changes
2019-01-01 15:00:16 +05:30
Anurag Mishra
77d779424b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into task-fixes
2019-01-01 14:38:54 +05:30
Anurag Mishra
a3b5f5f6e4
Test case
2019-01-01 14:11:59 +05:30
Rohit Waghchaure
8f62aec2e3
[Fix] Not able to delete department
2019-01-01 14:06:40 +05:30
Nabin Hait
137a24f457
Merge pull request #16253 from chdecultot/sales_summary_correction
...
[Fix] Filter cancelled and draft payments in sales payment summary
2018-12-31 12:02:19 +05:30
Nabin Hait
cacbdec565
Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer
...
[Fix] Not able to delete customer if contact is available
2018-12-31 11:55:24 +05:30
rohitwaghchaure
f07cde6351
Merge pull request #16306 from rohitwaghchaure/removed_duplicate_fields
...
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
2018-12-28 17:49:52 +05:30
sahil28297
50f0a99330
fix: Checks for status in employee and for date range in upload attendance. ( #16279 )
...
* fix: checks for status in employee and for date range in upload attendance.
1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.
* remove "import erpnext"
* fix: replace frappe.db.sql with frappe.db.get_all
* fix: refactored using list comprehension
* fix: query refactoring
* fix: combining list comprehensions
* travis debugging
* fix: doc.save
2018-12-28 17:15:56 +05:30
Anurag Mishra
3637e14e9f
refractor
2018-12-28 17:11:52 +05:30
Anurag Mishra
0c8411d085
test cases sucess
2018-12-28 16:53:00 +05:30
Rohit Waghchaure
df4fe922c0
[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item
2018-12-28 16:46:36 +05:30