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
Saif Ur Rehman
eb7277d2d4
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Saif Ur Rehman
091cfba5fc
test: Added test for get_item_tax_template and get_item_tax_map
2019-01-09 11:24:30 +05:00
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
scmmishra
e2762df90b
Fix: Naming series not reflecting in leave application
2019-01-08 17:38:28 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +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
Saif Ur Rehman
380b4b0926
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
# erpnext/accounts/doctype/sales_invoice/sales_invoice.json
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
# erpnext/setup/doctype/item_group/item_group.json
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
# erpnext/stock/doctype/item/item.json
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
2019-01-08 13:41:46 +05:00
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
Aditya Hase
85c6a0f002
fix(test): Do not rely on order by name
2019-01-08 00:09:37 +05:30
Aditya Hase
0c16424d7d
fix(naming): Use creation instead of name to order SLEs
2019-01-08 00:09:36 +05:30
Aditya Hase
972f659fd5
fix(naming): Use creation instead of name to order GL Entries
2019-01-08 00:09:30 +05:30
Aditya Hase
7bc692d48d
feat(naming): Deferred naming for Stock Ledger Entry and GL Entry
...
For fast lockless insertions use hash as autonaming method for
temporarily naming Stock Ledger Entry and GL Entry
In an hourly run scheduled job rename these entries using autoname options
2019-01-08 00:07:54 +05:30
Aditya Hase
41d189a34c
fix(demo): Look for "Total" instead of "'Total'" in report results
2019-01-07 23:01:40 +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
f5a00dc0c1
Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied
2019-01-07 15:45:33 +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
Saif Ur Rehman
848bbac05e
Added patch for Item Tax Template
2019-01-07 05:32:38 +05:00
Saif Ur Rehman
f484f0d6e8
Added test for Tax Rule based on Tax Category
2019-01-07 00:37:01 +05:00
Rohit Waghchaure
ed6725172d
Replaced str to cstr in genral ledger report
2019-01-06 20:07:18 +05:30
Saif Ur Rehman
13a6c0aeff
Fix tests
2019-01-06 18:14:18 +05:00
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
627b566445
Merge branch 'develop' into opportunity-lost-reason
2019-01-06 12:16:26 +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
Saif Ur Rehman
7ea6554f1f
Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template
...
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
# erpnext/stock/doctype/item/item.json
2019-01-06 04:43:13 +05:00
Saif Ur Rehman
b1288b75ba
fix: Test Records
2019-01-06 04:41:13 +05:00
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +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
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
Saif Ur Rehman
648bd15b2a
Force item_tax_rate on setting item details server-side
2019-01-03 04:03:54 +05:00
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
8c4bd951a8
fix(Codacy): Deleted unused imports and files
2019-01-02 13:24:12 +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
deepeshgarg007
de1e6fc1c4
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason
2019-01-01 08:57:18 +05:30
deepeshgarg007
c5a0b2edb6
Lost opportunity report
2018-12-31 16:34:16 +05:30
deepeshgarg007
5e9c7e2203
fix:Test cases for opportinity
2018-12-31 16:24:46 +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
c466825a8a
Merge pull request #16272 from frappe-pr-bot/translations-2018-12-24
...
[Translation] Updated Translations
2018-12-31 11:59:13 +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
deepeshgarg007
dc218ebeeb
test :test case for setting opportunity as lost
2018-12-29 22:11:19 +05:30
deepeshgarg007
d9a768a88f
feat: Set lost reasons in opportunity and quotation using table multiselect
2018-12-29 19:33:44 +05:30
Saif Ur Rehman
f6a83daae6
fix: update item_tax_template account_type server-side validation
2018-12-29 02:27:03 +05:00
Saif Ur Rehman
eeead1d777
fix: Only load transaction's company's tax accounts in item tax map
2018-12-29 02:25:00 +05:00
Saif Ur Rehman
fd531a6b5e
feat: Tax Category based on Address
2018-12-29 01:49:11 +05:00
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
Nabin Hait
fcbe410c2f
feat(stock-reco): Fetch items based on group warehouse
2018-12-28 16:31:05 +05:30
Faris Ansari
af75d9a384
fix(website): Pagination in child item groups
...
Item groups pages which had child item groups were not paged at all
despite having next, prev buttons
2018-12-28 14:47:51 +05:30
Saif Ur Rehman
e414a92d55
fix: Run get_item_tax_info and set_taxes serially
2018-12-28 04:59:42 +05:00
Saif Ur Rehman
aca374e478
feat: add_taxes_from_item_tax_template
2018-12-28 04:53:25 +05:00
Saif Ur Rehman
1ea98cbbe1
fix: missing line due to conflict resolution
2018-12-28 00:29:43 +05:00
Saif Ur Rehman
07acc2bf5a
Allow brand in quick entry
2018-12-27 23:10:20 +05:00
Saif Ur Rehman
7d9ee83d5a
-Fix for updated get_default_cost_center
...
-Back to not updating item's defaults child table
2018-12-27 23:10:19 +05:00
Saif Ur Rehman
127b3f552b
At least add a row for old logic to work properly
2018-12-27 23:03:17 +05:00
Saif Ur Rehman
c819ea38a0
-Added Item Default child table for Brand
...
-Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand
-Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults
2018-12-27 23:01:54 +05:00
Charles-Henri Decultot
e87eb07e16
Correction for Travis
2018-12-27 17:38:57 +00:00
Charles-Henri Decultot
8d71015bf8
Cleanup journal entries
2018-12-27 16:43:26 +00:00
Charles-Henri Decultot
b7339d7dcb
Test travis
2018-12-27 15:30:56 +00:00
Charles-Henri Decultot
43c7bd57e4
Cancel existing payment entries for data integrity in test
2018-12-27 14:43:30 +00:00
Charles-Henri Decultot
641d3e0073
Add own records
2018-12-27 13:43:56 +00:00
deepeshgarg007
77cde832d6
Added validation for update items in purchase order as well
2018-12-27 15:56:51 +05:30
Charles-Henri Decultot
0f9c47c242
Remove pricing rule from items
2018-12-27 10:10:18 +00:00
Charles-Henri Decultot
02aa9fb240
Understand Travis
2018-12-27 08:46:29 +00:00
deepeshgarg007
ffb411d9e2
Validation while updating items in sales order
2018-12-27 14:12:05 +05:30
Suraj Shetty
3de12db2b1
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-27 09:05:25 +05:30
Saif Ur Rehman
677866824a
More work on Tax Category and Item Tax Template
2018-12-27 02:11:07 +05:00
Charles-Henri Decultot
d7777696d7
Corrections for Travis
2018-12-26 14:08:00 +00:00
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Frappe Bot
23beec2bd1
bumped to version 11.0.3-beta.32
2018-12-26 12:04:55 +00:00
deepeshgarg007
22e05b24f3
Fix for NoneType comparison with int error
2018-12-26 17:16:34 +05:30
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
Frappe Bot
9a9c9c2ba3
bumped to version 10.1.76
2018-12-26 11:09:34 +00:00
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields
...
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:25:44 +05:30
Charles-Henri Decultot
9c1db688d1
Ignore pricing rule for Travis
2018-12-26 10:33:42 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
Charles-Henri Decultot
899b9b1ea7
Codacy correction
2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25
Remove ununsed variable
2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9
Test cases
2018-12-26 08:36:32 +00:00
deepeshgarg007
a1d015cc2f
Initialized loyalty_point_details
2018-12-26 11:01:02 +05:30
Rohit Waghchaure
52a692ee08
[Fix] Not able to delete customer if contact is available
2018-12-26 02:34:13 +05:30
Himanshu
0209ef0fc5
Quality Management System ( #15893 )
...
* Added QMS to ERPNext
* changes
* fixed
* code refracted
* refracted
* some bugs fixed
* changes
* changes
* test case
* bug fix unit test
* bug fix
* refracted code
* test warning fix
* test case bug fix
* removed whitespace
* indentation bug fix
* unit test bug fix
* fixed Tree
* bug fix
* bug fix
* code refactor
* fixed procedure tree
* removed unnecessary fields
* hide fields
* removed depricated unit test method
* sql injection bug fix
* code refactor and added mandatory fields
* Removed Add Child from TreeView
* Unit Test crashes Fix
* code refactor
* Fixed Status of Action
* removed add button from Chart of Procedure
* Fixed Unit Test for Quality Action
* Chamged Measurement Unit to UOM
* Changed Measurement Unit to UOM
* Quality Action Unit Test Fix
* Renamed Chart of Procedures to Tree of Procedures
* Changes Objective input type to Text
* Code Refactor
* Quality Action Status option changed to "Close" for consistency
* fixed action status indicator
* Removed vscode folder
* unit tests optimization
* unit test fixes
* code refactor
* gitignore
* bug fixes and code refactor
* code refactor
* unit test changes
* changed quality action unit test
* code refactor
* code refactor
* code refactor
* indentation
* code refactor
* corrected typo
* Removed jQuery hide()
* code refracted
* remove grid elements
* Removed unnecessary conditions
* onload fixed in feedback
* code refracted
* Removed add row button from Review and Customer Feedback
* made autofill feild read only
* automated scheduling of review
2018-12-25 17:42:31 +05:30
deepeshgarg007
64238ee91f
(Codacy Fix) Fixed indenttion
2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
Suraj Shetty
19f8e6bcf8
Fix typo
2018-12-25 15:30:09 +05:30
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue
...
[Fix] Tax Withholding, TDS is applying on the tax
2018-12-25 14:49:05 +05:30
Suraj Shetty
488aa86f70
Skip some codacy warnings
2018-12-25 14:46:44 +05:30
Suraj Shetty
8775204d63
Merge branch 'develop' into general-ui-fixes
2018-12-25 14:36:43 +05:30
Suraj Shetty
9180c48262
Fix patch entry
2018-12-25 14:34:38 +05:30
rohitwaghchaure
deb96dab3e
[Fix] Salary structure not saving ( #16275 )
2018-12-25 13:58:20 +05:30
Suraj Shetty
8d9960bdad
Fix patch entry
2018-12-25 12:33:37 +05:30
Suraj Shetty
bcd8f31e43
Add an entry of a patch in patches.txt
2018-12-25 11:16:49 +05:30
Rushabh Mehta
fafbb0278f
fix: reload parent after setting children
2018-12-24 22:09:15 +05:30
Rushabh Mehta
c9b1a35ac3
fix: set explicit idx for new item in update_child_qty_rate
2018-12-24 20:55:35 +05:30
Suraj Shetty
b763893f22
Fix quotes issue in item.js
2018-12-24 19:43:31 +05:30
Suraj Shetty
a3f28d40b0
Remove _label
2018-12-24 19:39:45 +05:30
Suraj Shetty
9c3dcfea76
Add a patch to rename accounts desktop icon to accounting
2018-12-24 17:00:40 +05:30
Suraj Shetty
67b311e95e
Make -> Create
2018-12-24 16:16:13 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Rushabh Mehta
5d11abb0a2
fix(escaping): accounts_receivable.py
2018-12-24 16:03:24 +05:30
Suraj Shetty
242b16fdfd
Rename Accounts -> Accounting
2018-12-24 15:47:23 +05:30
frappe-pr-bot
67121f6c91
[Translation] Updated Translations
2018-12-24 11:57:19 +02:00
Rohit Waghchaure
94500a9d62
[Fix] TDS is applying on the tax
2018-12-24 15:13:52 +05:30
rohitwaghchaure
7ec5e80b70
[Fix] While making sales invoice from delivery note, system not remove the returned qty ( #16141 )
2018-12-24 14:55:31 +05:30
Nabin Hait
5a9579bae4
feat(quality): Check quality status before receipt/delivery ( #16169 )
2018-12-24 14:54:42 +05:30
Valmik
78bc405eeb
fix: set fieldname for frappe prompt ( #16198 )
2018-12-24 14:54:06 +05:30
Navdeep Ghai
c4d38c0afc
Fix the disappears of image bug after uploading and saving the employee ( #16217 )
...
* Fix image disappears of image after uploading and saving the employee
* Fix the codacy issue
2018-12-24 14:53:19 +05:30
KanchanChauhan
1790a6faaa
Set ignore_user_permission 1 for Company field in Item Default ( #16167 )
2018-12-24 14:48:09 +05:30
Rohan
349040db6d
fix(work_order): Set operations for Work Order when created from MREQ ( #16154 )
2018-12-24 14:42:34 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +05:30
rohitwaghchaure
4265c5a772
Rename BOM and Work order fields ( #16209 )
...
* Rename BOM and Work order fields
* Rearranged BOM fields
2018-12-24 14:38:49 +05:30
Mangesh-Khairnar
70c5aa5f5d
[Enhancement] Pending SO Items for Purchase Request Report ( #16188 )
...
* deleted old purchase request query report
* [Enhancement] pending so items for purchase request report refactor
* comments and format fix
* test and minor fixes
* test fixes
2018-12-24 14:25:47 +05:30
Shreya Shah
91ddadeefa
fix: add currency to options ( #16199 )
2018-12-24 14:25:12 +05:30
Frappe PR Bot
25fc5b879b
[Translation] Updated Translations ( #16227 )
2018-12-24 14:22:35 +05:30
Charles-Henri Decultot
083f1c5370
Safe decode project name for languages with special characters ( #16254 )
2018-12-24 14:21:33 +05:30
Shreya Shah
d2b9093ecc
fix: Check if items exist ( #16248 )
2018-12-24 14:21:07 +05:30
Charles-Henri Decultot
9100740ba9
[Fix] FEC: Correction of the export function ( #16252 )
...
* Correction of the export function
* Improve JS code
* Codacy corrections
* Codacy corrections
2018-12-24 14:20:35 +05:30
Raffael Meyer
ed3561279d
Update README.md ( #16224 )
2018-12-24 14:19:51 +05:30
rohitwaghchaure
1c1798c7f2
[Fix] Warehouse wise item balance age and value report not working ( #16258 )
2018-12-24 14:19:27 +05:30
Deepesh Garg
3ae2517867
Removed subscriber option form module page ( #16270 )
2018-12-24 14:16:57 +05:30
Suraj Shetty
83e3c4c0fa
Fix quote error
2018-12-24 11:11:04 +05:30
Suraj Shetty
772e8780b4
Merge branch 'staging-fixes' into permission-fixes
2018-12-24 10:35:12 +05:30
Suraj Shetty
b58c317abb
Fix daily_work_summary_settings migration patch
2018-12-24 10:26:39 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Saif Ur Rehman
8ac261750b
Add and Modified DocTypes for Item Tax Template
2018-12-22 02:51:59 +05:00
Suraj Shetty
27c37e1b77
Minor fix
2018-12-21 12:43:46 +05:30
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
Frappe Bot
7067727c0c
bumped to version 11.0.3-beta.31
2018-12-21 05:46:22 +00:00
Suraj Shetty
89625b6eef
Rename learn to help
2018-12-21 11:04:32 +05:30
Suraj Shetty
b0a84f014e
Replace desktop icon for project list with desktop icon for projects module
...
- Add a patch to fix already install instances
2018-12-20 20:12:37 +05:30
Charles-Henri Decultot
813485023b
Filter cancelled and draft payments
2018-12-20 14:04:00 +00:00
Nabin Hait
0866b2b75a
Update accounts_receivable.py
2018-12-20 14:11:20 +05:30
shreyashah115@gmail.com
ba8c041206
fix: Check if items exist
2018-12-20 13:23:51 +05:30
Suraj Shetty
7ed37ae6c3
Commonify code
...
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
deepeshgarg007
b645c2c75e
Rebase using staging-fixes and resolved conflicts
2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc
Added temp variables for outstanding, credit_note_amt instead of function calling
2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af
breaked up code into multiple functions
2018-12-19 18:43:06 +05:30
deepeshgarg007
4ac8fcf4af
Added test case for Accounts receivable report based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a944f88b94
Removed column for pdc date
2018-12-19 18:43:06 +05:30
deepeshgarg007
17544d7ad6
Refactored accounts receivable report for payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
e7a91b9526
Credit note fix
2018-12-19 18:43:06 +05:30
deepeshgarg007
f98adf2be5
Changed columns and added currency conditions
2018-12-19 18:43:06 +05:30
deepeshgarg007
b6c083706a
Allocation of credit note amount and pdc in payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
24f8d3ed0c
Add columns based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a8ab9b5c3d
Accounts Receivable report based on payment terms
2018-12-19 18:43:06 +05:30
Nabin Hait
a78947f2de
Merge pull request #16218 from deepeshgarg007/analytics-graph
...
[Bug-fix] Analytics report graph skipping quarter values bug fix
2018-12-19 18:08:25 +05:30
Rohit Waghchaure
f6f503a1f6
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
2018-12-19 15:15:35 +05:30
Suraj Shetty
5555bf82f8
Capitalize marketplace factory class to support recent router changes ( #16238 )
2018-12-19 10:15:59 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
Suraj Shetty
a8d9bfdcfd
Fix: currency symbol issue in delivery note list ( #16233 )
2018-12-18 14:53:17 +05:30
Rohan
159897d88d
fix(customer): Fix Total Unpaid amount in Customer dashboard ( #16234 )
2018-12-18 14:52:23 +05:30
rohitwaghchaure
c4921d235a
Merge pull request #16225 from rohitwaghchaure/not_able_to_make_po_from_mr
...
[Fix] Get items from material request not working for PO
2018-12-17 18:52:46 +05:30
rohitwaghchaure
c5c2124bba
Merge pull request #16226 from shreyashah115/fix-list
...
Fix employee separation list
2018-12-17 18:52:05 +05:30
shreyashah115@gmail.com
a5dc08ee8e
fix: remove paid_amount and modify query
2018-12-17 16:47:17 +05:30
shreyashah115@gmail.com
0543f03b58
fix: Remove date_of_joining from field list
2018-12-17 15:02:30 +05:30
rohitwaghchaure
37d7d25018
Merge pull request #16207 from Zlash65/fix-qi
...
[Minor] Make Quality Inspection in query configurable
2018-12-17 13:55:26 +05:30
rohitwaghchaure
d6ca23b277
Merge pull request #16219 from Zlash65/fix-holiday-leave
...
[Minor] Fix Leave Application as half day on Holiday validation
2018-12-17 13:54:16 +05:30
rohitwaghchaure
c963ac20a6
Merge pull request #16211 from Zlash65/fix-pp
...
[Minor] Get items for Material Requests fix
2018-12-17 13:52:25 +05:30
Rohit Waghchaure
4ac9ea0e85
[Fix] Get items from material request not working for PO
2018-12-17 11:18:46 +05:30
Zlash65
c8337c6d83
fix check for leave on holiday for half day
2018-12-15 21:15:45 +05:30
deepeshgarg007
1ee19e4167
Analytics report graph fix
2018-12-15 15:36:09 +05:30
Faris Ansari
871f4e5df5
Merge pull request #16201 from netchampfaris/fix-product-search
...
fix(product-search): Include variants in product search
2018-12-14 16:36:42 +05:30
Nabin Hait
22a1e281a9
fix(variant): Show attribute values on single variant creation ( #16204 )
2018-12-14 14:22:45 +05:30
Faris Ansari
4994d84565
fix(pos-profile): Cleanup Form for POS Profile ( #16208 )
...
- Remove pos_profile_name field and use `name` as Prompt
- Reorganize form and label sections
- Remove `apply_discount` which was not used
2018-12-14 14:19:14 +05:30
Nabin Hait
d8f497ce98
Merge branch 'staging-fixes' into pplan_fix
2018-12-13 16:59:15 +01:00
Nabin Hait
614559f234
fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse
2018-12-13 16:36:35 +01:00
Zlash65
82e01bc923
fix fetch material request items logic
2018-12-13 18:31:05 +05:30
Zlash65
9fde660aaf
make quality inspection in query configurable
2018-12-13 13:28:01 +05:30
Saurabh
e165fc0e1b
Merge branch 'staging' into develop
2018-12-13 10:45:32 +05:30
Saurabh
58a4f0e157
bumped to version 11.0.3-beta.30
2018-12-13 11:15:31 +06:00
Prateeksha Singh
4ba9594b04
[setup] domain not in array
2018-12-12 22:09:00 +05:30
Prateeksha Singh
9c5676292c
[setup] add defaults stage
2018-12-12 21:29:55 +05:30
Prateeksha Singh
58db3c1c7c
[setup] fix install_defaults
2018-12-12 21:29:55 +05:30
Prateeksha Singh
0e728972e9
[setup][minor] remove unused import
2018-12-12 21:29:55 +05:30
Prateeksha Singh
d59b61cbd9
[fixtures] re-add market_segments and sales_stages utils
2018-12-12 21:29:55 +05:30
Prateeksha Singh
4da8dced94
[setup] remove unused imports
2018-12-12 21:29:55 +05:30
Prateeksha Singh
b274f8cb2a
[fix] setup chart of accounts
2018-12-12 21:29:55 +05:30
Prateeksha Singh
47118ab72a
[setup] remove redundant code
...
- [fix] domain setup from dictionary
2018-12-12 21:29:55 +05:30
Prateeksha Singh
9282e08099
[fix] >.< call setup_taxes
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c3a49b9cad
[fix] set default_bank_account in company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c0f90beb7c
Rename 'Chat' to 'Gitter Chat'
2018-12-12 21:29:55 +05:30
Prateeksha Singh
1aee75aadc
[setup] separate out setup_company
2018-12-12 21:29:55 +05:30
Prateeksha Singh
8469b27c3a
[setup] add get_country_and_charts()
2018-12-12 21:29:55 +05:30
Prateeksha Singh
aeb8abf1ed
[setup] add market segments and sales stages
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6f7233229e
[setup][fix] company fixtures
2018-12-12 21:29:55 +05:30
Prateeksha Singh
6bf22fa7d7
[setup][fix] get newly created root Territory for children
2018-12-12 21:29:55 +05:30
Prateeksha Singh
c1c057611e
[setup] bundle up fixtures and setup docs
2018-12-12 21:29:54 +05:30
Prateeksha Singh
dabf349599
[setup] don't premake company fixtures
2018-12-12 21:29:54 +05:30
Prateeksha Singh
b422458224
[setup] set the default fiscal year that was made
2018-12-12 21:29:54 +05:30
Prateeksha Singh
179d82702e
[setup] fetch setup config
2018-12-12 21:29:54 +05:30
Prateeksha Singh
39b8765961
[setup][init] setup as document records
2018-12-12 21:29:54 +05:30
Faris Ansari
907e9080c4
fix(product-search): Include variants in product search
2018-12-12 19:26:52 +05:30
Saif Ur Rehman
b53231595d
Using same filter for Sales Person from Accounts Receivable
...
Added Customer/Supplier Ledger Summary in Accounts Module page
2018-12-12 15:46:50 +05:00
Saif Ur Rehman
b07d108bee
feat: Supplier Ledger Summary
2018-12-12 05:45:49 +05:00
Saif Ur Rehman
41236ed0e5
feat: Customer Ledger Summary report
2018-12-12 05:12:20 +05:00
Rushabh Mehta
eeab3ee5d3
fix(test): use frappe.db.rollback to revert deletion of fixture data ( #16192 )
...
* debug(test): test_payroll_entry
* debug(test): test_payroll_entry
* debug(test): use frappe.db.rollback to undelete fixture data
2018-12-11 22:37:29 +05:30
Frappe Bot
fb2fdc4f4e
Merge branch 'staging' into develop
2018-12-11 09:55:01 +00:00
Frappe Bot
caed845f3e
bumped to version 11.0.3-beta.29
2018-12-11 09:55:01 +00:00
Pawan Mehta
377511165e
Simple Trial Balance ( #16060 )
2018-12-10 21:55:01 +05:30
Frappe Bot
8e1326f22f
Merge branch 'staging' into develop
2018-12-10 16:05:45 +00:00
Frappe Bot
ee97a46fde
bumped to version 11.0.3-beta.28
2018-12-10 16:05:45 +00:00
Rohan
c1eb94d37f
Revert "fix(delivery): update package total on validate ( #16131 )"
...
This reverts commit f43433b43d
2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Frappe Bot
5b50b2848d
Merge branch 'staging' into develop
2018-12-10 13:08:33 +00:00
Frappe Bot
0509d82701
bumped to version 11.0.3-beta.27
2018-12-10 13:08:33 +00:00
Tyler Matteson
afc55ca821
De-clutter, Regionalize and Domainify Accounts Module Configuration (on staging-fixes) ( #16117 )
2018-12-10 18:03:19 +05:30
Saif
b52bd9c093
AR/AP Report Enhancement ( #16175 )
...
* Modified AR/AP print format
* Filter Sales Person based on either Customer or Voucher's assigned Sales Person
* -Added Sales Person column to Accounts Receivable Summary
-Added all filters in AR/AP Summary Report as in AR/AP Report
-Reordered filters for better grouping
-Fixed a bug that customer_name was not unset after removing Customer from filter
2018-12-10 17:56:42 +05:30
Rohan
f43433b43d
fix(delivery): update package total on validate ( #16131 )
2018-12-10 17:47:31 +05:30
rohitwaghchaure
5472fff027
Added disabled field in the address ( #16114 )
2018-12-10 17:45:39 +05:30
Frappe Bot
65a9991d84
bumped to version 10.1.75
2018-12-10 12:14:33 +00:00
RicardoJohann
bc0ef0beca
Add Serial Number button in Delivery Note and Sales Invoice's Packing List ( #16080 )
2018-12-10 17:43:03 +05:30
rohitwaghchaure
398e47ecad
Merge pull request #16189 from rohitwaghchaure/transferred_qty_issue
...
[Fix] Transferred qty cannot be null
2018-12-10 17:37:02 +05:30
Rohit Waghchaure
57633b75ed
[Fix] Transferred qty cannot be null
2018-12-10 17:36:01 +05:30
Stavros Anastasiadis
3d82b74ea4
Update Items in Submit state can add new row ( #15644 )
...
* Update Items in Sumbit state can add new row
In Sales Order and Purchase Order when docstatus is submitted user can
use Update Item btn to add new child Items
* Remove unused code line
* Remove blocking db save thread line
* Remove Company as not standard Field in Purchase Order Item
* Minor indentation fix
* Add Unit Test, add new row in update_child_qty_rate
* Codacy fix
2018-12-10 17:30:55 +05:30
Sagar Vora
4c5bd253a2
fix(party dashboard): empty array is truthy, check for length ( #16184 )
2018-12-10 17:19:10 +05:30
Rohan
39b31ece31
fix(pos): Return empty dict if no results found ( #16124 )
2018-12-10 17:16:39 +05:30
Deepesh Garg
0c3c148316
Linking company address to pos profile ( #16142 )
...
* Linking company address to pos profile
* Translation fix
2018-12-10 16:22:38 +05:30
Nabin Hait
3248e0bb3e
Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr
...
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-07 15:20:23 +05:30
Nabin Hait
da9c96e9f5
Merge pull request #16150 from rohitwaghchaure/what_is_the_use_of_this_code
...
Removed unnecessary code
2018-12-07 15:18:11 +05:30
Nabin Hait
1b529d997c
Merge pull request #16146 from rohitwaghchaure/remove_tax_amt_from_the_billed_amt_in_project
...
[Fix] In project, tax amount is added in the total billed amount(sales) field
2018-12-07 15:17:35 +05:30
Nabin Hait
2bd6ab9fba
Merge pull request #16140 from KanchanChauhan/staging-fixes
...
[Minor]Method path fix in Material Request js
2018-12-07 15:08:44 +05:30
Deepesh Garg
6967b44ac8
Merge branch 'hotfix' into list_view
2018-12-07 08:30:20 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
Frappe Bot
4f1c659050
bumped to version 11.0.3-beta.26
2018-12-06 09:50:24 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Frappe Bot
be0a349a52
bumped to version 10.1.74
2018-12-06 09:14:35 +00:00
Nabin Hait
32c95c3292
Merge pull request #16113 from nabinhait/travis-fix
...
fix(test): Fixed tests for discount with margin and period closing voucher
2018-12-06 11:58:56 +05:30
Faris Ansari
40c15348da
fix(setup-wizard): Validate abbr length before switching to next slide
2018-12-06 07:37:32 +05:30
rohitwaghchaure
f85856d9f8
Merge pull request #16155 from rohitwaghchaure/changed_parent_for_item_attribute_value
...
[Fix] Permissions issue
2018-12-04 18:45:07 +05:30
Rohit Waghchaure
675567419b
[Fix] Permissions issue
2018-12-04 18:43:52 +05:30
Rohit Waghchaure
e61430b471
Removed unnecessary code
2018-12-03 18:54:26 +05:30
Rohit Waghchaure
636d186d08
[Fix] In project, tax amount is added in the total billed amount(sales) field
2018-12-03 16:04:08 +05:30
deepeshgarg007
114cc810a0
List view currency bug fix
2018-12-03 15:13:06 +05:30
Kanchan Chauhan
9dc85153e0
[Minor]Method path fix in Material Request js
2018-12-03 14:39:43 +05:30
Nabin Hait
3ecb995485
Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull
...
fix/feat: Allow extension of barcode types (without validation)
2018-12-03 14:39:14 +05:30
Nabin Hait
94eafb6674
Merge pull request #16005 from ESS-LLP/pr_staging_fixes
...
[Feature][Fix] Healthcare - Patient Appointment
2018-12-03 14:38:32 +05:30
Nabin Hait
046a99acf8
Merge branch 'staging-fixes' into supplier-customer-dashboard-fix
2018-12-03 14:36:38 +05:30
Nabin Hait
02aad03e74
Merge pull request #16022 from ESS-LLP/fix-patch
...
fix: healthcare patch
2018-12-03 14:36:02 +05:30
Nabin Hait
6b93f2fe0a
Merge pull request #16139 from Zlash65/fix-assess
...
[Minor] Assessment Result fix
2018-12-03 14:33:01 +05:30
Nabin Hait
0b4ea25f83
Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item
...
[Fix] Permissions issue while making item variants
2018-12-03 14:32:40 +05:30
Nabin Hait
dd7b020b01
fix(test): Fixed tests for period closing voucher
2018-12-03 14:24:41 +05:30
Nabin Hait
dce68422a7
Merge pull request #16133 from rohitwaghchaure/fixed_stock_value_diifference_calculation_for_stock_reco
...
[Fix] Stock value difference calculation for stock reconciliation
2018-12-03 14:20:40 +05:30
Zlash65
db43c3af68
display message if details to fetch grade isnt filled up
2018-12-03 12:15:10 +05:30
Rohit Waghchaure
a8003c1af7
[Fix] Permissions issue while making item variants
2018-12-03 11:49:52 +05:30
deepeshgarg007
4c79274054
Fixed patch and deprecated grid reports
2018-11-30 18:01:22 +05:30
deepeshgarg007
ec5bbe351c
Row check fix for purchase analytics
2018-11-30 16:25:16 +05:30
Rohit Waghchaure
16b8ecbe05
[Fix] Stock value difference calculation for stock reconciliation
2018-11-30 16:20:52 +05:30
deepeshgarg007
94a3539015
Row check fix in stock analytics
2018-11-30 16:20:48 +05:30
deepeshgarg007
37b6a2ca0b
row check bug fix
2018-11-30 16:15:43 +05:30
Nabin Hait
eda0a6eb33
fix(test): Fixed tests for period closing voucher
2018-11-30 15:15:17 +05:30
rohitwaghchaure
ca332bdcdb
Revert "[Fix] Accounts receivable summary print is not working"
2018-11-29 18:15:29 +05:30
deepeshgarg007
ee05e358d1
Rewrote query using orm
2018-11-29 16:24:28 +05:30
deepeshgarg007
c981fb389b
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-29 14:57:50 +05:30
deepeshgarg007
3c7c4a61be
Test case fix
2018-11-29 14:28:01 +05:30
deepeshgarg007
3eef6411dd
Removed print statement
2018-11-29 13:10:02 +05:30
deepeshgarg007
9ed13f4a90
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix
2018-11-29 12:52:44 +05:30
deepeshgarg007
1a1c013b2a
Analytics report bug fixes and code cleaning
2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
Ameya Shenoy
5780e865b7
bumped to version 11.0.3-beta.25
2018-11-28 08:28:36 +00:00
Ameya Shenoy
2806d83362
Merge branch 'master' into staging-fixes
2018-11-28 08:12:48 +00:00
Ameya Shenoy
e3136c38e1
bumped to version 10.1.73
2018-11-28 07:57:27 +00:00
deepeshgarg007
ebe1e12a82
Codacy issue fixes
2018-11-28 08:21:54 +05:30
Nabin Hait
305c8b1fba
Merge pull request #16110 from shreyashah115/fix-timer
...
[Timesheet] Element selector in Timer
2018-11-27 17:57:46 +05:30
Nabin Hait
f642f86982
Merge branch 'hotfix' into accounts_receivable_summary_print_issue
2018-11-27 17:56:49 +05:30
Nabin Hait
96598936ad
fix(test): Fixed tests for discount with margin and period closing voucher
2018-11-27 17:48:13 +05:30
deepeshgarg007
c1a3c72b49
final dashboard design
2018-11-27 17:09:12 +05:30
Rohit Waghchaure
10bcd5113c
[Fix] Accounts receivable summary print is not working
2018-11-27 16:25:35 +05:30
deepeshgarg007
f31caffa74
Changes in get_dashboard_info
2018-11-27 15:04:12 +05:30
Nabin Hait
3b16dd7377
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-27 14:19:49 +05:30
Nabin Hait
dfd79b0349
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
2018-11-27 14:19:20 +05:30
Nabin Hait
676a2fbc8a
Merge branch 'staging-fixes' into hotfix-child-task-error
2018-11-27 14:17:23 +05:30
deepeshgarg007
6372fbba54
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix
2018-11-27 14:06:58 +05:30
Nabin Hait
3854940e42
Merge branch 'staging-fixes' into fix-patch
2018-11-27 13:26:05 +05:30
Nabin Hait
e4cc062cf1
Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total
...
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 13:22:50 +05:30
Nabin Hait
b98d08a2cb
Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation
...
[Fix] Incorrect stock value difference because of negative stock
2018-11-27 13:21:43 +05:30
Nabin Hait
0090b1aa16
Merge pull request #16058 from KanchanChauhan/reflinks-in-related-docs
...
Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate
2018-11-27 13:20:39 +05:30
Nabin Hait
ccb03fb255
Merge pull request #16073 from deepeshgarg007/receivable-summary
...
Accounts receivable summary print fix
2018-11-27 13:11:37 +05:30
shreyashah115@gmail.com
5281fe8e50
fix: Element selector
2018-11-27 13:11:30 +05:30
Nabin Hait
72fc1b57be
Merge pull request #16083 from Anurag810/new-fix-branch
...
[fix] delivery note with quantity equal 0 #14211
2018-11-27 13:10:31 +05:30
Nabin Hait
3c31e4ad4b
Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items
...
If is pos is enabled and no pos profile then use the item's default warehouse for packing materials
2018-11-27 13:10:14 +05:30
Nabin Hait
6743219dc2
Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice
...
[Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice
2018-11-27 13:09:16 +05:30
Nabin Hait
5f7b37ee11
Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue
...
[Fix] No permission for Manufacturing Settings
2018-11-27 13:07:44 +05:30
Rohit Waghchaure
6cc2f52fa4
[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice
2018-11-27 12:07:03 +05:30
Nabin Hait
dde952d591
Merge pull request #16092 from deepeshgarg007/salary_slip
...
Salary slip earnings and deductions table bug fix
2018-11-27 11:39:10 +05:30
Nabin Hait
9a06543453
Merge branch 'staging-fixes' into indicators-in-leave-applications
2018-11-27 11:38:29 +05:30
Nabin Hait
f48cf001ed
Merge branch 'staging-fixes' into test-fix
2018-11-27 11:37:22 +05:30
Nabin Hait
be65af5dfe
Merge pull request #16101 from SaiFi0102/patch-1
...
Company rename abbr to consider more DocTypes
2018-11-27 11:36:46 +05:30
Nabin Hait
57fa8759ee
Merge pull request #16102 from deepeshgarg007/fees
...
Paid Amount not showing for fees in web portal fix
2018-11-27 11:36:27 +05:30
Nabin Hait
f806cfecaa
Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit
2018-11-27 11:18:54 +05:30
Kanchan Chauhan
2d0b788105
[Minor] Indicators in Leave Application
2018-11-27 10:37:23 +05:30
deepeshgarg007
bc513a8828
Removed paid amount form Fees doctype
2018-11-26 20:43:39 +05:30
deepeshgarg007
a9525de0da
paid amount fix in fees
2018-11-26 20:34:32 +05:30
Saif
6a9d9d76ef
Company rename abbr to consider more DocTypes
2018-11-26 19:56:13 +05:00
Nabin Hait
78d9fac0ce
Merge branch 'staging-fixes' into pr_staging_fixes
2018-11-26 20:25:34 +05:30
Nabin Hait
15951e6e93
Merge branch 'staging-fixes' into gbm001-item-barcodes-pull
2018-11-26 20:25:29 +05:30
Nabin Hait
93595fa60a
Merge branch 'staging-fixes' into hotfix-child-task-error
2018-11-26 20:24:47 +05:30
Nabin Hait
91c811f170
Merge branch 'staging-fixes' into new-fix-branch
2018-11-26 20:23:37 +05:30
Nabin Hait
c5064069c7
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue
2018-11-26 20:23:11 +05:30
Nabin Hait
218fa51dba
Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice
2018-11-26 20:23:00 +05:30
Nabin Hait
73e3138a5b
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number
2018-11-26 20:20:22 +05:30
deepeshgarg007
05c2989698
removed total from graph
2018-11-26 20:19:57 +05:30
Nabin Hait
7f02659425
Merge branch 'hotfix' into address_not_set_from_api
2018-11-26 20:16:54 +05:30
Nabin Hait
b32abde2ac
Merge branch 'staging-fixes' into bug-fixes
2018-11-26 20:05:09 +05:30
Saif Ur Rehman
5fdbc68ca3
Set Gross Profit on server-side validation of Sales Order
2018-11-26 19:32:16 +05:00
Rohit Waghchaure
b4a5993ece
On uncheck is return field clear the reference field
2018-11-26 20:02:01 +05:30
Nabin Hait
21983b8432
Merge pull request #16001 from jsukrut/staging-fixes
...
[FIX][#15018 ][PATIENT Relation should be unique]
2018-11-26 20:01:19 +05:30
Nabin Hait
56dc5c1be3
Merge branch 'staging-fixes' into pos-profile-fix
2018-11-26 19:59:07 +05:30
Nabin Hait
212a29ae2c
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
...
[Fix] Not able to view general ledger for purchase invoice
2018-11-26 19:57:24 +05:30
Nabin Hait
25e60f3934
Merge pull request #16044 from ESS-LLP/fix-trial-balance
...
fix: Trial Balance print
2018-11-26 19:56:27 +05:30
Nabin Hait
4191d7eb52
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
...
Fixed get_buying_amount in Gross Profit report:
2018-11-26 19:55:06 +05:30
Nabin Hait
d0af0887be
Merge pull request #16051 from SaiFi0102/patch-1
...
Remove "Test" Letter Head
2018-11-26 19:47:07 +05:30
Nabin Hait
36f266355d
Merge branch 'staging-fixes' into fixed_holiday_list_not_working
2018-11-26 19:44:11 +05:30
Nabin Hait
736ce9a176
Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation
...
Fixed error due to incorrect use of 'this' while calculating rate
2018-11-26 19:31:25 +05:30
Saif Ur Rehman
147fa73d3f
Fixed incorrect use of 'this' causing errors calculating rate
2018-11-26 18:14:06 +05:00
Rohit Waghchaure
d1a85a3637
[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice
2018-11-26 18:42:29 +05:30
Rohit Waghchaure
15ed7a6351
[Fix] No permission for Manufacturing Settings
2018-11-26 17:31:18 +05:30
Anurag Mishra
5b6dd58b3e
fixed ZeroDivisionError in sales_order.py
2018-11-26 17:22:50 +05:30
deepeshgarg007
bd87903b56
Added condition for default amount
2018-11-26 17:13:59 +05:30
Anurag Mishra
e657fe84b8
making validation generic for sales order,sales invoice,purchase order etc.
2018-11-26 17:13:10 +05:30
Anurag mishra
6ddb15b3df
fix(validate): Qty is mandatory in delivery note
2018-11-26 17:13:10 +05:30
Anurag mishra
7b2c445707
Delivery Note fixes
2018-11-26 17:13:10 +05:30
Nabin Hait
73ca3cfca6
fix(test): removed test print
2018-11-26 16:16:42 +05:30
deepeshgarg007
533066eb87
Salary slip bug fix
2018-11-26 15:04:21 +05:30
Rohit Waghchaure
3893ba302c
If is pos and no pos profile use the item's default warehouse for packing materials
2018-11-26 14:13:24 +05:30
Nabin Hait
2665c37f38
temp(travis): Print statement to fix travis
2018-11-26 11:05:28 +05:30
Nabin Hait
48e0e19b03
fix(test): Fixed salary slip and sales analytics test cases
2018-11-26 11:05:28 +05:30
Nabin Hait
2508d11097
fix(test): Test cases fixed
2018-11-26 11:05:28 +05:30
Nabin Hait
f77cd54a6c
fix(tds): Create tds payable under correct parent
2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2
Test case fix and other minor bug fix
2018-11-26 11:05:28 +05:30
deepeshgarg007
5dbb9f5312
Accounts receivable summary print fix
2018-11-23 19:54:08 +05:30
deepeshgarg007
a1cffc3490
minor changes in dashboard
2018-11-23 16:51:35 +05:30
deepeshgarg007
0e8c36473a
Added colspan to indicators
2018-11-23 11:22:24 +05:30
deepeshgarg007
920dc1400f
Customer/Supplier dashboard fix for multi company setup
2018-11-23 10:17:28 +05:30
Kanchan Chauhan
962397e6f4
Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate
2018-11-22 15:15:06 +05:30
Rohit Waghchaure
037a151ef5
[Fix] New holiday list form is not working
2018-11-22 12:57:34 +05:30
Saif
2a2f2742eb
Remove "Test" Letter Head
2018-11-21 23:29:09 +05:00
Rohit Waghchaure
6424f47f3b
[Fix] Incorrect stock value difference because of negative stock
2018-11-21 23:18:41 +05:30
Ranjith
1879e91148
fix: Trial Balance
2018-11-21 16:04:05 +05:30
Saif Ur Rehman
23eef11cf5
Fixed get_buying_amount in Gross Profit report:
...
To handle the case where there may be multiple invoices for a single delivery
2018-11-21 15:32:37 +05:00
Suraj Shetty
1eb098caf9
Add additional condition condition to get_pos_profile
...
- If we have any POS Profile related to the user,
that profile should be used
2018-11-21 14:36:58 +05:30
Rohan Bansal
f838597b5f
fix(task): Fix error when trying to convert a task into a group even if no child tasks exist
2018-11-20 13:18:05 +05:30
Rohit Waghchaure
770a13ebc3
[Fix] Not able to view general ledger for purchase invoice
2018-11-20 13:01:52 +05:30
Ranjith
5d2e52c4ef
fix: healthcare patch
2018-11-19 20:03:25 +05:30
frappe-pr-bot
2ed4d84cd3
[Translation] Updated Translations
2018-11-19 11:57:50 +02:00
Jamsheer
64e42e1e88
fix: Patient Appointment - update list view
2018-11-19 13:00:49 +05:30
Jamsheer
ee6b317ab5
fix: Patient Appointment - Code standards
2018-11-19 13:00:49 +05:30
Jamsheer
45695c9bcb
fix: Realign Patient Appointment fields
2018-11-19 13:00:49 +05:30
Jamsheer
dc3ae114cd
feat: Reschedule - Patient Appointment
2018-11-19 13:00:49 +05:30
Andrew McLeod
f99a68a695
feat: Added unit testing for Item Barcodes in item.py
...
Adds three different barcodes and barcodes types to a test item and
checks that they are added correctly.
Adds a barcode that already exists, and checks a DuplicateEntryError
is raised.
Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of
ValidationError) is raised.
2018-11-16 13:55:55 +00:00
Andrew McLeod
5607762c0f
fix/feat: Allow extension of barcode types (without validation)
...
Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py:
- There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces.
- All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated.
This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.
2018-11-16 11:08:39 +00:00
Jsukrut
b9a95e29b7
[FIX][ #15018 ][PATIENT Relation should be unique]
2018-11-16 11:30:12 +05:30
Ameya Shenoy
27a0c37963
css: build files in v10
2018-11-15 19:21:30 +00:00
Rohit Waghchaure
f4dc71661d
[Fix] Address not set from the API
2018-11-15 17:04:02 +05:30
deepeshgarg007
795686d1cc
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes
2018-11-15 16:30:48 +05:30
Frappe Bot
8c7373dfd0
Merge branch 'staging' into develop
2018-11-15 09:45:05 +00:00
Frappe Bot
d9dccaefba
bumped to version 11.0.3-beta.24
2018-11-15 09:42:35 +00:00
Frappe Bot
ef745b0197
bumped to version 11.0.3-beta.23
2018-11-15 09:37:17 +00:00
Frappe Bot
eb4969d24f
Merge branch 'staging' into develop
2018-11-15 09:26:03 +00:00
Nabin Hait
0aca5aad14
Merge pull request #15976 from deepeshgarg007/summary
...
[Fix] Accounts receivable summary print format showing zero values
2018-11-15 14:52:16 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch
...
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Frappe Bot
a4fe912382
bumped to version 11.0.3-beta.23
2018-11-15 09:19:18 +00:00
Frappe Bot
98b4a1bc81
Merge branch 'master' into staging-fixes
2018-11-15 09:12:04 +00:00
Frappe Bot
2426d00dd6
bumped to version 10.1.72
2018-11-15 09:04:14 +00:00
Rohit Waghchaure
704796b1cb
Code optimization for consolidated financial statement report
2018-11-15 13:46:18 +05:30
rohitwaghchaure
02a7f8f0b2
Merge pull request #15991 from rohitwaghchaure/fixed_consolidated_conversion_issue
...
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:56:11 +05:30
Rohit Waghchaure
9d0f90975b
[Fix] Consolidated financial statement report currency conversion issue
2018-11-15 12:55:20 +05:30
Rohit Waghchaure
43920530a1
[Minor] Patch fixes
2018-11-15 12:20:27 +05:30
deepeshgarg007
4c366eed23
Minor issue fixes
2018-11-15 12:02:07 +05:30
Deepesh Garg
3b8c84fa75
Merge pull request #15975 from nabinhait/staging-fixes
...
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-15 12:01:09 +05:30
rohitwaghchaure
e907c0d15c
Merge pull request #15986 from rohitwaghchaure/added_currency_filter_in_consolidated_report
...
Added currency filter in consolidated financial statement report
2018-11-15 10:53:02 +05:30
Rohit Waghchaure
a95697f506
Added currency filter in consolidated financial statement report
2018-11-14 19:55:44 +05:30
Aditya Hase
d168a71cfb
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
...
update_total_qty_field patch was using UPDATE statement with CASE
Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
Frappe Bot
98a2348779
Merge branch 'staging' into develop
2018-11-14 11:33:08 +00:00
Frappe Bot
fac49983a0
bumped to version 11.0.3-beta.22
2018-11-14 11:32:34 +00:00
rohitwaghchaure
ba97b9b2d8
Merge pull request #15980 from rohitwaghchaure/on_save_allow_transfer_for_manufatured_changed
...
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 15:12:45 +05:30
rohitwaghchaure
5395b164cd
Merge pull request #15983 from rohitwaghchaure/fixed_claimed_amount_issue
...
Claimed amount is not reset on cancel of employee advance
2018-11-14 13:21:11 +05:30
Rohit Waghchaure
047a7123eb
Claimed amount is not reset on cancel
2018-11-14 13:20:00 +05:30
Rohit Waghchaure
917dda1b76
[Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually
2018-11-14 01:18:41 +05:30
Nabin Hait
367a076fa4
fix(discount): Fixed item discount amount calculation
2018-11-13 18:41:58 +05:30
Nabin Hait
d34bfa8c2c
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-13 18:21:22 +05:30
Frappe Bot
fe62024824
bumped to version 11.0.3-beta.21
2018-11-13 11:41:27 +00:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Nabin Hait
3409e55d24
Merge pull request #15974 from Alsum/assign-sa
...
assign-sa-to-group-of-employees
2018-11-13 16:55:17 +05:30
deepeshgarg007
7bc6f3843a
Fix for accounts Receivable Summary Showing zero values
2018-11-13 16:54:54 +05:30
Frappe Bot
a29237beeb
bumped to version 11.0.3-beta.21
2018-11-13 11:23:06 +00:00
Nabin Hait
7fe4124bb8
fix(field property): Made barcode field non-mandatory in item
2018-11-13 16:48:59 +05:30
Frappe Bot
88c88d6e7c
Merge branch 'master' into staging-fixes
2018-11-13 10:59:05 +00:00
Frappe Bot
6b78e520d2
bumped to version 10.1.71
2018-11-13 10:55:31 +00:00
Nabin Hait
688758a56f
fix(test): Fixed item discount amount calculation and test cases related to pricing rule
2018-11-13 16:13:16 +05:30
alsum
e04a753d53
assign-sa-to-group-of-employees
2018-11-13 11:43:58 +02:00
Nabin Hait
ee887f4db7
Merge pull request #15796 from Alsum/set_current_asset_value
...
trigger set_current_asset_value when make asset_value_adjustment from asset form
2018-11-13 12:42:28 +05:30
Nabin Hait
ee190e34c2
Update asset_value_adjustment.js
2018-11-13 12:41:36 +05:30
Saif
60ec88bcc8
Added Default Warehouse field that sets all item's warehouse ( #15462 )
...
* -Added field def_warehouse that sets warehouse of all items
-Grouped warehouse fields together and put raw materies supplied before items table, it will only show if there are any items supplied
* Set def_warehouse in test_sales_order.py
* Changed from def_warehouse to set_warehouse
* Rest of def_warehouse to set_warehouse
2018-11-13 12:37:53 +05:30
Alchez
ce3340903d
Update Delivery Trip status based on visited stops ( #15723 )
...
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops
* feat(delivery_trip_status): Fix tests
* feat(delivery_trip_status): Fix allow on submit for status
* feat(delivery_trip_status): Change status mapping
* feat(delivery_trip_status): Fix patch
* Update update_delivery_trip_status.py
2018-11-13 12:22:17 +05:30
Alchez
9f87c441b0
feat(delivery_trip): Create a Delivery Trip by selecting multiple Delivery Notes in list view ( #15706 )
2018-11-13 12:20:05 +05:30
khushalti
fad08e1bcb
[fix] - GL entry not creating on PR if rejected qty mentoned ( #15815 )
2018-11-13 12:09:32 +05:30
Doridel Cahanap
2b14d6a058
Contract Manufacturing : Customer Provided Items ( #15828 )
...
* Material Request from Production Plan for Customer provided parts
* Test cases
* Customer web portal for their material requests
2018-11-13 12:07:16 +05:30
Alchez
6f1fd193eb
fix(production_plan): Allow work orders to be cancelled ( #15955 )
2018-11-13 11:47:23 +05:30
rohitwaghchaure
849169e82b
Merge pull request #15969 from rohitwaghchaure/fix_company_dashbord_sales_count
...
[Fix] Company dashboard sales count condition
2018-11-13 11:37:26 +05:30
Britlog
7d9689cc92
[Fix] Website Conversion factor query ( #15866 )
...
* [Fix] Conversion factor query
* Update product.py
2018-11-13 11:36:41 +05:30
Rohit Waghchaure
14ffe8b935
[Fix] Company dashboard sales count condition
2018-11-13 11:35:38 +05:30
Britlog
9e9e37d39b
[Fix] Conversion factor in offline POS ( #15867 )
2018-11-13 11:34:27 +05:30
Deepesh Garg
b65bb5df2e
Function renaming, code cleaning and minor fixes ( #15938 )
2018-11-13 11:28:58 +05:30
Stavros Anastasiadis
a695dad525
Upgrade BOM Stock Report base with Qty to Produce ( #15939 )
2018-11-13 11:17:41 +05:30
Shreya Shah
89974b221d
[Feature] Create Raw Material Request from Sales Order ( #15452 )
...
* Add new button to Sales Order form - Request for Raw Materials
* Modify get_work_order_items function
* Commonify functions in Production Plan to make it compatible with new feature
* Create and submit Material Request from Sales Order
* Link Sales Order with Material Request
* Minor
* Rename label
* Fix Codacy
* Modify as per review suggestions
- Move dialog to a new function
- Move checkboxes below other fields
* Minor changes
* Check for permissions
* Add common checkboxes for all items
* Fix codacy
* fix: Travis
* fix: Use variable to store query result
* fix: Add comment before fetching exploded items
* refactor: Break into multiple functions
* test: Add test case
2018-11-13 11:15:03 +05:30
Himanshu Mishra
35b2627112
Item qty based tax (CESS) calculation support ( #15456 )
...
* fix conflicts
* added test case for qty cess
* use company specified in document to get region
2018-11-13 11:13:04 +05:30
Zarrar
6922415d1b
[New Feature]Scan Item Barcode label to quick create/update records in items child table ( #15731 )
...
* Update transaction.js
* setup barcode scan
stock entry controller not inherited from transaction.js, need to call setup barcode scan from transaction.js
* fix bug of item_code change always reset qty to 0
when calling frappe.model.set_value(dt,dn,'item_code',xxx), even qty is set, system always reset qty to 0.
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* Update transaction.js
* clean up barcode logic for transactions
* call scan_barcode method for stock entry
* separate out logic for searching serial, batch or barcode number
* added scan barcode field in transactions doctype
* search barcode-serial-batch sequence, code rectify
* hide all barcode related field if disabled from settings
* remove print statement
* Update stock_entry.py
2018-11-13 11:11:32 +05:30
Ameya Shenoy
42928f978b
fix: work order item sorting ( #15967 )
2018-11-13 11:04:17 +05:30
Ameya Shenoy
e8d3aa9cc9
Merge pull request #15966 from codingCoffee/frankfurter
...
fix: changed currency exchange API to frankfurter
2018-11-12 18:35:36 +05:30
Deepesh Garg
84483ff776
Stock analytics script report ( #15630 )
...
* Stock analytics script report
* Codacy Issue Fixes
* Codacy Issue Fixes
* Removed Trailing Whitespaces
* Code cleaning and optimization
* Minor Changes
* Code cleaning and spacing
* Added link for stock analytics in stock.py
* Refactoring and code cleaning
* Codacy issue fixes
2018-11-12 17:05:31 +05:30
Deepesh Garg
a057f4c2a0
Script report for purchase analytics ( #15612 )
...
* Purchase Analytics Query Report
* Minor Changes
* Codacy Issue Fixes
* Codacy Issues Fixed
* Code cleaning and optimization
* Indentation Issue Fix
* Code cleaning and better function naming
* Added link for purchase analytics in buying.py
* Added link for production analytics in manufacturing.py
* Commonified purchase-analytics using Analytics class
* Codacy issue fix
2018-11-12 17:01:02 +05:30
rohitwaghchaure
ab76ff0836
Added new option group by voucher(consolidated) in the general ledger report ( #15957 )
2018-11-12 16:58:24 +05:30
Nabin Hait
5e85ab3b67
Update setup.py
2018-11-12 16:46:12 +05:30
JodeQ
1b8e9cd3bb
Permission error for new Sales invoice ( #15952 )
...
In version
```
Installed Apps
ERPNext: v11.0.3-beta.20 () (staging)
Frappe Framework: v11.0.3-beta.25 () (staging)
```
When creating a new Sales invoice without healthcare active we have this error
```
Not permitted
Insufficient Permission for Patient
```
Console log
```
Traceback (most recent call last):
File "/home/frappe/auroraone-v11/apps/frappe/frappe/app.py", line 61, in application
response = frappe.handler.handle()
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 21, in handle
data = execute_cmd(cmd)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/handler.py", line 56, in execute_cmd
return frappe.call(method, **frappe.form_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1007, in call
return fn(*args, **newargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 53, in search_link
search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, ignore_user_permissions=ignore_user_permissions)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/desk/search.py", line 149, in search_widget
as_list=not as_dict)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/__init__.py", line 1235, in get_list
return frappe.model.db_query.DatabaseQuery(doctype).execute(None, *args, **kwargs)
File "/home/frappe/auroraone-v11/apps/frappe/frappe/model/db_query.py", line 40, in execute
raise frappe.PermissionError(self.doctype)
PermissionError: Patient
```
2018-11-12 16:42:05 +05:30
Pawan Mehta
aa0bed16f6
[fix] #14038-Std hours at company level to calculate timesheet hours ( #15819 )
...
* [fix] #14038
* codacy fixes
* add end time calc method
* test case and rename function
* Update timesheet.py
2018-11-12 16:40:07 +05:30
Deepesh Garg
6714214951
Server side script report for sales analytics ( #15589 )
...
* Sales Analytics Report
* Codacy issue fixes and name column addition
* Minor Fixes
* Minor Changes
* Codacy Issue Fixes
* Codacy Issue Fixes
* Bug Fixes
* Code cleaning and optimization
* Deleted Duplicate code
* Indentation Issue Fixes
* Added Supplier Condition
* Cleaned code and better function naming
* Added report link for sales analytics in selling.py
* fix(patch): Patch to delete old analytics reports
* feat(refactor): Created class and refactored code using object oriented paradigm
* Column condition fix
* Minor condition fix
* Minor fix
* parent child map for purchase analytics
* Minor Fixes in get_periodic_data
* Used dots for filters instead of brackets
* Minor Bug fix in get_period_date_ranges
* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
Ameya Shenoy
47a1dbab96
fix: changed currency exchange API to frankfurter ( #15958 )
...
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:57:24 +05:30
Frappe PR Bot
3922a184af
[Translation] Updated Translations ( #15959 )
2018-11-12 15:51:37 +05:30
Ameya Shenoy
438490fd29
fix: changed currency exchange API to frankfurter
...
- Switched to Frankfurter's public API (frankfurter.app) from
self hosted API (frankfurter.erpnext.org)
2018-11-12 15:15:06 +05:30
Frappe Bot
1ff9c691b7
Merge branch 'staging' into develop
2018-11-09 10:21:07 +00:00
Frappe Bot
9159ee83ca
bumped to version 11.0.3-beta.20
2018-11-09 10:19:21 +00:00
Frappe Bot
4df671585b
Merge branch 'master' into staging-fixes
2018-11-09 10:11:27 +00:00
Frappe Bot
f8a5cfe8d8
bumped to version 10.1.70
2018-11-09 10:09:04 +00:00
alsum
852bd76a58
add set_current_asset_value to onload func
2018-11-08 11:12:33 +02:00
TaiLouis
c856794519
fix(hr): Delete salary slip when cancel payroll entry ( #15757 )
2018-11-08 13:06:24 +05:30
rohitwaghchaure
a88eaa6e20
[Fix] User able to change discount if pricing rule has discount value as zero ( #15921 )
2018-11-08 13:05:08 +05:30
Alchez
bf20be53ef
fix(bom): Display item name in new BOM form ( #15783 )
2018-11-08 12:54:20 +05:30
Shreya Shah
9e484fbc12
fix(payment-entry): Take default value None for paid_from ( #15777 )
2018-11-08 12:52:14 +05:30
patilsangram
667f0fbd6d
[fix] Invoice/Delivery note customer po_no overwritten by Sales order null po_no ( #15785 )
2018-11-08 12:51:41 +05:30
Ameya Shenoy
49647bfecc
fix: develop version should be 12 ( #15928 )
2018-11-08 12:48:35 +05:30
Nabin Hait
6ff2f395f5
fix(gle): Post gl entry for booking COGS from Sales Invoice even if grand_total is zero ( #15825 )
2018-11-08 12:30:44 +05:30
Dominik Ottenbreit
63ec78aa5d
Fix Purchase Order Issue in Update Items ( #15811 )
...
* Fix Purchase Order Issue in Update Items
* fix(zero-division)
2018-11-08 12:28:57 +05:30
Bassam Ramadan
bf86953b4c
adding returns field to cashier closing ( #15752 )
...
* adding returns field to cashier closing
* Update cashier_closing.json
2018-11-08 12:26:24 +05:30
Zarrar
5be6d19f4d
[Minor] Display Discount Amount when Tax table is empty ( #15812 )
...
* show discount amount even when tax table is empty
* negate the value for discount while printing
2018-11-08 12:16:26 +05:30
Alchez
068ba191e7
[Feature] Route optimization for Delivery Trip stops ( #15566 )
...
* Minor improvements
* [Feature] Route optimization for Delivery Trip stops
* Process and optimize the entire route, with or without locks
* Form sets of routes for optimization based on applied lock positions
* Re-arrange stops based on the optimized routes and lock positions
* Set delay times between stops - offset estimation times by delays cumulatively
* Fix codacy errors
* Fix travis
* feat(route_optimization): Set estimated route distance from Google Maps
* feat(route_optimization): Add tests for route lists
* feat(route_optimization): Fix tests
2018-11-08 11:57:05 +05:30
Shreya Shah
3f6eb6b393
fix: If party type is Shareholder, set appropriate name field ( #15916 )
2018-11-08 11:51:13 +05:30
Frappe Bot
823e754565
Merge branch 'master' into staging-fixes
2018-11-07 11:26:11 +00:00
Frappe Bot
7f37d26f05
bumped to version 10.1.69
2018-11-07 11:26:10 +00:00
Shreya Shah
c704630d5f
fix: Return default if company not found ( #15915 )
2018-11-06 17:24:45 +05:30
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop
2018-11-06 11:17:24 +00:00
Ameya Shenoy
675636cd03
bumped to version 11.0.3-beta.19
2018-11-06 11:13:36 +00:00
Ameya Shenoy
0c42f99b6f
Merge pull request #15920 from rohitwaghchaure/fix_patch_ascii_code_error
...
[Fix] Patch, ascii codec error
2018-11-06 16:35:21 +05:30
Rohit Waghchaure
56bf39bfea
[Fix] Patch
2018-11-06 16:32:29 +05:30
Ameya Shenoy
65797bca64
Merge branch 'master' into staging-fixes
2018-11-06 11:02:08 +00:00
Ameya Shenoy
a97a520aa8
bumped to version 10.1.68
2018-11-06 11:02:04 +00:00
rohitwaghchaure
9eafe8c23e
Update financial_statements.py
2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3
fix(encoding): Fixed encoding issue in financial statements
2018-11-06 11:48:51 +05:30
Faris Ansari
bbc1cb274e
Merge pull request #15911 from netchampfaris/marketplace-fixes-3
...
Hub fixes
2018-11-05 19:19:44 +05:30
Faris Ansari
0fb943181e
Merge pull request #15910 from netchampfaris/marketplace-fixes-3
...
Hub fixes
2018-11-05 19:19:23 +05:30
Faris Ansari
d6b664f7ee
fix(hub): Prevent registered actions
2018-11-05 19:18:48 +05:30
rohitwaghchaure
1b2ceadc93
[Fix] Asset date validation ( #15887 )
...
* [Fix] Asset date validation
* Update asset.py
2018-11-05 16:04:04 +05:30
lasalesi
32ab3970e1
allow creating sales order on the last valid day of a quotation ( #15875 )
2018-11-05 16:02:18 +05:30
Frappe PR Bot
3c3b3d830d
[Translation] Updated Translations ( #15909 )
2018-11-05 16:01:47 +05:30
Faris Ansari
0d08da50c6
fix: Refresh PageContainer component based on current route
2018-11-05 15:47:26 +05:30
Nabin Hait
3e6663d47e
fix(serial no): Set supplier info based on pur invoice if serial no is created from Purchase Invoice ( #15820 )
2018-11-05 14:01:59 +05:30
Faris Ansari
a22e16dbe3
Merge pull request #15892 from netchampfaris/marketplace-fixes-1
...
fix: Use frappe.utils.make_event_emitter
2018-11-05 13:48:16 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop
2018-11-05 06:53:27 +00:00
Ameya Shenoy
5ed0257ce2
bumped to version 11.0.3-beta.18
2018-11-05 06:50:33 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes
2018-11-05 06:45:04 +00:00
Ameya Shenoy
59f16bc942
bumped to version 10.1.67
2018-11-05 06:40:25 +00:00
Tyler Matteson
d14e46ef02
Doctypes in domains that are in beta are now restricted to that domain
...
non-profit, agriculture, healthcare, hospitality, education
Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
Rohit Waghchaure
598d34445f
[Fix] Column ‘claimed_amount’ cannot be null
2018-11-02 16:02:33 +05:30
Faris Ansari
68dbf7f99c
fix: Use frappe.utils.make_event_emitter
2018-11-02 13:30:51 +05:30
rohitwaghchaure
c1d255e7bc
Merge pull request #15882 from Zlash65/fixtds
...
[Minor] TDS not calculated properly fix
2018-11-02 13:18:09 +05:30
Zarrar
16d45c8e2e
safe encode non ascii characters ( #15755 )
2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9
fixed divided by zero error ( #15885 )
2018-11-02 12:19:05 +05:30
rohitwaghchaure
dcb71a61ad
[Fix] Payment entry not able to submit ( #15859 )
2018-11-02 12:12:42 +05:30
Charles-Henri Decultot
a89bce0b6e
Encoding correction ( #15877 )
2018-11-01 13:18:49 +05:30
Zlash65
ab9852d31a
tds not calculated appropriately
2018-11-01 11:40:15 +05:30
Shreya Shah
9f931780a2
Merge pull request #15868 from ESS-LLP/fix-membership
...
fix: Membership - allow system users to create membership
2018-11-01 10:54:32 +05:30
Zarrar
92a4ff4e81
Merge pull request #15874 from shreyashah115/portal-fixes
...
Add overdue status for sales order
2018-11-01 10:46:08 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop
2018-10-31 13:51:52 +00:00
Ameya Shenoy
9f20f777b2
bumped to version 11.0.3-beta.17
2018-10-31 13:51:24 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes
2018-10-31 13:43:12 +00:00
Ameya Shenoy
b4bff7e298
bumped to version 10.1.66
2018-10-31 13:35:58 +00:00
Shreya Shah
e140845399
Revert "Add overdue status for sales order"
2018-10-31 18:20:28 +05:30
Shreya Shah
b95d7ae41b
Merge pull request #15870 from shreyashah115/portal-fixes
...
Add overdue status for sales order
2018-10-31 18:20:18 +05:30
deepeshgarg007
78b273af43
[Bug-Fix] Cannot Save Bank Statement Transaction Entry ( #15793 )
...
* Create bank settings only if bank name is available
* Minor bug-fix in validate_overlap
2018-10-31 18:12:03 +05:30
Shreya Shah
41c5fda196
fix(sms-center): Fix db query ( #15774 )
2018-10-31 18:04:30 +05:30
Shreya Shah
305c82bd8d
fix(medical-record): Remove z-index property ( #15790 )
2018-10-31 18:02:55 +05:30
rohitwaghchaure
cd11bdfdbb
[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock ( #15869 )
2018-10-31 18:02:00 +05:30
Shreya Shah
0c0e49a421
fix: Fix fieldnames in template ( #15860 )
2018-10-31 18:00:09 +05:30
rohitwaghchaure
3f398d24f3
[Fix] Precision issue, not able to submit the stock entry ( #15863 )
2018-10-31 17:58:26 +05:30
Shreya
e3a7c68d4f
fix(portal): Add overdue status for sales order
2018-10-31 16:00:27 +05:30
Ranjith
f01bf9048d
fix: Membership - allow system users to create membership for existing Members
2018-10-31 14:33:28 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop
2018-10-30 12:54:16 +00:00
Ameya Shenoy
d45fef5423
bumped to version 11.0.3-beta.16
2018-10-30 12:53:35 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes
2018-10-30 12:48:45 +00:00
Ameya Shenoy
1f7a5dcd07
bumped to version 10.1.65
2018-10-30 12:48:42 +00:00
Frappe PR Bot
467ff4f0f2
[Translation] Updated Translations ( #15852 )
2018-10-30 11:26:11 +05:30
Shreya Shah
452619c668
fix(report): Return if not list ( #15849 )
2018-10-30 11:26:01 +05:30
rohitwaghchaure
dca4b294bd
Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile
...
[Fix] Delete button not working in POS for mobile
2018-10-29 16:52:34 +05:30
Rohit Waghchaure
152a0c86b0
[Fix] Delete button not working in POS for Ipad
2018-10-29 16:50:18 +05:30
Shreya Shah
69bbe1995c
Update production_analytics.py
2018-10-29 15:38:21 +05:30
deepeshgarg007
7b91f9fa0c
Bug Fixes
2018-10-29 15:16:25 +05:30
Faris Ansari
3df1327b94
fix: Delete button in POS mobile
...
Delete button was covered by page-actions container
2018-10-29 15:15:10 +05:30
Saurabh
6a916943aa
fix(P&L): sql query
2018-10-26 13:46:52 +00:00
alsum
27e7c15c16
trigger set_current_asset_value when make asset_value_adjustment from asset form
2018-10-24 13:23:34 +02:00
ashish-greycube
4d47c63db1
Update employee_advance.py
...
https://github.com/frappe/erpnext/issues/13694
Cancel of already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null")
Sol: claimed_amount should be flt
2018-10-24 16:35:31 +05:30
Ameya Shenoy
c17a64758d
Merge branch 'staging' into develop
2018-10-23 12:58:06 +00:00
Ameya Shenoy
6adcfa6032
bumped to version 11.0.3-beta.15
2018-10-23 12:56:51 +00:00
Ameya Shenoy
3643e7b1b4
Merge branch 'master' into staging-fixes
2018-10-23 12:52:48 +00:00
Ameya Shenoy
2a98e59bd4
bumped to version 10.1.64
2018-10-23 12:52:46 +00:00
Ameya Shenoy
03348364e9
Merge pull request #15739 from kennethsequeira/hotfix
...
Fix for "Improve this page" incorrect link generated in v10 sites
2018-10-23 18:05:25 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
4293d17602
bumped to version 11.0.3-beta.14
2018-10-23 08:05:33 +00:00
Ameya Shenoy
ca66c7ba14
Merge branch 'master' into staging-fixes
2018-10-23 08:01:13 +00:00
Ameya Shenoy
ac64b39562
bumped to version 10.1.63
2018-10-23 07:58:11 +00:00
Ameya Shenoy
c73c576536
Merge pull request #15759 from codingCoffee/salesperson
...
fix(): fetch correct warehouse for item in report
2018-10-23 13:25:42 +05:30
Shreya Shah
669c5d0298
Merge pull request #15724 from shreyashah115/fix-leave
...
Do not consider current leave application while submitting leave
2018-10-23 12:31:02 +05:30
Faris Ansari
d3e3c1ba72
Merge pull request #15768 from rohitwaghchaure/market_place_settings_error
...
[Fix] Marketplace settings permission error
2018-10-23 12:07:21 +05:30
Rohit Waghchaure
55416e08f1
[Fix] Marketplace setting permission error
2018-10-23 11:52:06 +05:30
Shreya
1b105e2575
Add test case
2018-10-23 11:45:57 +05:30
Shreya
60d8a0da1e
fix(leave-status): Do not consider current leave application while submitting
2018-10-23 11:45:57 +05:30
Zlash65
635d4dbebe
subscriber deprecated test case fixes
2018-10-23 11:00:19 +05:30
rohitwaghchaure
cf076f4692
Merge pull request #15753 from Zlash65/fix-mod
...
[Minor] Field name fix to fetch Supplier
2018-10-23 09:45:39 +05:30
rohitwaghchaure
034429b34d
Merge pull request #15756 from rohitwaghchaure/fixed_allow_edit_rate
...
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-23 09:43:57 +05:30
Ameya Shenoy
a0e533ede5
Merge branch 'master' into staging-fixes
2018-10-22 10:37:14 +00:00
Ameya Shenoy
c365ce8f21
bumped to version 10.1.62
2018-10-22 10:34:35 +00:00
Ameya Shenoy
3a11f34355
fix(): fetch correct warehouse for item in report
...
Fix 'Sales Person-wise Transaction Summary' Report by fetching the
correct Warehouse for the Item fron the respective, Sales Order/Sales
Invoice/ Delivery Note
2018-10-22 10:15:07 +00:00
Nabin Hait
91eac5a7cf
fix(report): Optimization for financial statements
2018-10-22 15:05:40 +05:30
Rohit Waghchaure
aef7a6ec44
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-22 13:51:32 +05:30
Ranjith Kurungadam
ac6e3a69f9
fix: Serial No- allow editing SO, track changes ( #15741 )
2018-10-22 12:06:54 +05:30
Zlash65
473437931c
field name fix
2018-10-22 11:22:12 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
Ameya Shenoy
7e97230c92
bumped to version 11.0.3-beta.13
2018-10-19 12:56:48 +00:00
Ameya Shenoy
bbfdc13ab7
Merge branch 'master' into staging-fixes
2018-10-19 12:48:18 +00:00
Ameya Shenoy
24fe7286fc
bumped to version 10.1.61
2018-10-19 12:48:16 +00:00
Nabin Hait
5d1171678e
fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled ( #15743 )
...
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
2018-10-19 18:03:13 +05:30
Kenneth Sequeira
991c121b57
added source link for ERPNext docs
2018-10-19 14:31:21 +05:30
Kenneth Sequeira
23ec18e3e4
added docs_app variable to point docs to foundation app
2018-10-19 03:28:12 +05:30
Saif
b4cf72c770
Adding "Include UOM" in Reports with Qty and Rates ( #15541 )
...
* Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty
* Add columns in result list-of-lists instead of converting reports to list-of-dicts
* For requested changes
-Merged conversion factor query with item detail queries
-Ensuring snail_case
-Made columns consistently list-of-dicts
2018-10-18 17:59:47 +05:30
Saif
3c9155e406
[Minor Fix] Force toggle display Net Total field when default taxes are fetched ( #15532 )
...
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched
* Prevent net_rate from becoming NaN
* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
deepeshgarg007
25edac451d
Production Analytics Query Report ( #15673 )
...
* Production Analytics Query Report
* Changes in production analytics report
* Updated json file and other changes
2018-10-18 17:43:41 +05:30
Raffael Meyer
25e9db5e81
Do not display gender for companies ( #15728 )
2018-10-18 16:49:49 +05:30
Nabin Hait
500ddc94c7
fix(gle): GL Entry for invoices before introduction of rounding_adjustment ( #15732 )
2018-10-18 16:48:28 +05:30
Charles-Henri Decultot
7a7615ed66
Safe encode payer name ( #15726 )
2018-10-18 12:28:06 +05:30
Aditya Hase
007fbfbfb7
[Feature] ERPNext Quickbooks Migrator ( #15718 )
...
* Create QuickBooks Connector Single DocType
* Create interface for user authorization and obtaining authorization code
* Obtain Access token using authorization code
* Fetch a random customer
* Schedule fetching as a background job
* Save fetched customer
* Fetch all customers, take care of pagination
* Save fetched customers
* Create a custom field for storing Quickbooks ID
* Don't save already saved customers
* Commit every successful insert
* No need of allow_guest=True
* Fetch Items as well
* Store Customer Addresses as well.
* Remove redundant custom field creation code
* Stupid refactoring
* Some more refactoring
* Fetch and Save Suppliers as well
* Save accounts. Really a hack as of now.
* Fetch and save invoices, Take care of child items as well
* Fetch Taxes as well
* Set currency on Sales Invoice
* Correctly Link Items, Handle markups
* Don't enqueue, Need to wait forever for testing sometimes
* Set margin rate correctly
* Correct fieldname is tax_amount not amount
* Fetch with maximum possible batch size
* Don't print unnecessary info
* Fetch Journal Entries
* Fetch Purchase Invoices (Bill)
* Don't perform reauthentication if you already have an access_token
* Don't need those print statements anymore
* Refresh access_token if request fails
* Fetch Payment Entry(Payment)
* Map QB items to ERPNext rather than other way around
* Don't need a huge comment block as of now
* Fetch Payment Entries against Purchase Invoices (BillPayment)
* Rename Quickbooks Connector to Migrator
* Make oauth settings configurable
* Make company configurable
* Make default accounts configurable
* Fetch accounts and other masters separately
* Show realtime progress
* Check if entries exist before attempting insert
* Suppress other annoying messages
* Tracebacks are good for health
* Don't want rounded total
* Don't call fetch after authorization (Need to somehow separate these)
* Make credit_to account payable
* When generating payment entry mention bank_account as well
* Cleanup
* Add custom buttons and reflect current state in form ui
* Show necessary fields on form depending on the current state
* Cleanup
* Minor fixes
* Set income and expense account on items.
* Set currency for Account.
* Stupid VSCode
* Remove redundant code
* Check for existing Payment and BillPayment correctly
* Cache API response for faster development
* Don't maintain stock for now, Seems to solve the issue with 'Stock Received but not billed'
* Cleanup
* Add methods to remove inserted data completely (Development)
* Don't commit in every iteration
* Set account head based on TaxRate in Sales Invoice
* Fetch and cache TaxCode
* Add methods to fetch TaxCode and TaxRate from cache
* Set item wise tax breakup, Don't use Actual Tax
* Use both TaxRateLists
* Set Itemwise tax on Purchase Invoice as well
* Set bank_amount, while creating payment entries
* Remove print statements
* Add Shipping in taxes child table of Sales Invoice
* Set posting date on Payment Entries against Invoices
* Fetch and save expenses as Journal Entries
* Fetch and save Deposits as Journal Entries
* Fetch and Save Credit and Debit Notes
* Fetch and save SalesReceipt
* Record Shipping as Item instead of Tax
* Minor Fixes
* Fetch Advance Payments
* Set account_type during Account creation
* Choose receivable account in Invoice based on currency
* Remove receivable_account field
* Account type is already set during account creation
* Set receivable account based on currency in Sales Receipt and Credit Memo
* Set receivable account on Customer
* Save Company Preferences
* Set shipping_account based on company preferences
* Set cost center in Sales Invoice Items and Taxes
* Make Account name unique in case of duplicate account name
* Fetch and Save TaxPayment as Journal Entry
* Record UndepositedFunds Account in cache if found
* Credit UndepositedFunds account when mentioned in Deposit
* Debit Cashback account as well if mentioned in Deposit
* Set currency conversion rate
* Set is_group field correctly for accounts
* Preserve account hierarchy
* Use quickbooks_id and company together for filtering
* Make new custom field 'company' on Supplier Customer and Item
* Use comapny field for filtering Customer, Item, Supplier
* Shipping Account is only available if shipping is enabled for comapny
* Invoice might not have TxnTaxDetail.TaxLine
* Lookup TaxRate account correctly
* TaxCode might not have SalesTaxRateList PurchaseTaxRateList or Both
* TaxCode might not have SalesTaxRateList and PurchaseTaxRateList
* Remove unnecessary UI elements
* Allow multiple companies to have customers with same name
* Refactor account_type
* Create a leaf an account for every group account
* Item and Tax list creation needs more information
* Supports discount in Invoice
* Save Invoice as Journal Entry when itemwise details are unavailable
* Credit=True represents a refund rather than charge
* Mode of Payment not synced, setting as Cash for now
* Tax code may also be set for an entire invoice
* Fetch General Ledger Report correctly
* Refactor fetching entries from General Ledger Report
* Tax Payment is the same as Sales Tax Payment and Purchase Tax Payment
* append_number_if_name_exists is stupid, Reimplementing
* Don't guess credit/debit for Tax Payment and Advanced Payment
* Bill Payment shouldn't assume full payment
* Save Payment as Journal Entry
* Make Client ID and Client Secret Default
* Remove unused python imports
* removed are_accounts_synced()
* Don't store translated values in database
* Endpoints as a field
* Major refactor - functions to methods
* Major Refactor Functions to Methods
* Major Refactor Fix Stuff
* Minor Changes
* Save Refund As well
* Minor Refactor (SI varations to SI, PI variations to PI)
* Record Inventory Qty Adjust Entries
* QBM Final Touches
* Make changes suggested in review
2018-10-17 17:50:00 +05:30
rohitwaghchaure
e2afbb7abe
Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix
...
[For staging-fixes] Fixed PDC data in AR/AP report
2018-10-17 15:57:28 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
Ameya Shenoy
a7a32d7400
bumped to version 11.0.3-beta.12
2018-10-17 09:44:11 +00:00
Ameya Shenoy
77b60928bf
Merge branch 'master' into staging-fixes
2018-10-17 09:39:31 +00:00
Ameya Shenoy
bb1b6b42e2
bumped to version 10.1.60
2018-10-17 09:04:11 +00:00
Ameya Shenoy
4fdbff7456
Merge pull request #15547 from Zlash65/demo-refactor
...
Demo data refactor
2018-10-16 17:34:09 +05:30
deepeshgarg007
0cbb9b54fa
Deprecating subscriber doctype ( #15695 )
...
* Depricating subscriber doctype
* Removed naming series
2018-10-16 14:39:16 +05:30
Shreya Shah
8e71074e1c
fix(report): Add column for Item Name ( #15702 )
2018-10-16 14:36:49 +05:30
Shreya Shah
e45868a3c6
fix(discount-amount): Print hide discount_amount if print without amount ( #15705 )
2018-10-16 14:34:56 +05:30
Shreya Shah
ff0deedca9
fix(discount-amount): Print hide discount_amount if print without amount ( #15704 )
2018-10-16 14:34:30 +05:30
Shreya Shah
22731e39ba
Merge pull request #15376 from jodeq/show_project-attachments-in-portal
...
[Proposal] Show project attachments in portal view
2018-10-16 14:29:51 +05:30
Shreya Shah
bfb88f7839
Merge pull request #15701 from shreyashah115/item-stock
...
Add column for Item Name in Item Price Stock report
2018-10-16 14:22:46 +05:30
Shreya
82660913a5
fix(report): Add column for Item Name
2018-10-16 12:15:56 +05:30
Shreya
8aca56836b
fix(margin): Make user avatar display in line
2018-10-16 12:00:46 +05:30
rohitwaghchaure
b7debc8573
Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix
...
Fixed PDC data in AR/AP report
2018-10-16 11:27:53 +05:30
rohitwaghchaure
a5a926967b
Update accounts_receivable.py
2018-10-16 11:27:23 +05:30
Joe Paul
666e6e665b
feat: Add provision for prebilled subscription invoices
...
(cherry picked from commit db33e6304d3167d0a2c0c9cee4a9405f5833120e)
2018-10-16 10:17:40 +05:30
deepeshgarg007
4bb90add1d
Currency symbol bug fix ( #15698 )
2018-10-15 19:07:49 +05:30
Nabin Hait
44ec05f79b
fix(bom): deadlock issue via bom replace tool ( #15694 )
2018-10-15 18:56:16 +05:30
Charles-Henri Decultot
615571dd21
Add safe decode for payer name ( #15692 )
2018-10-15 18:26:02 +05:30
Bibin
7844b79274
[Bug-Fix] accounts_receivable.html ( #15688 )
...
* Update accounts_receivable.html
In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue
* Update accounts_receivable.html
2018-10-15 18:25:26 +05:30
deepeshgarg007
7c443264a4
Currency symbol bug fix ( #15690 )
2018-10-15 18:22:28 +05:30
JodeQ
10dfd4a48f
Show project attachments in portal view
2018-10-15 14:28:27 +02:00
Ameya Shenoy
606c504f28
Merge branch 'staging' into develop
2018-10-15 12:25:03 +00:00
Ameya Shenoy
8d0195246d
bumped to version 11.0.3-beta.11
2018-10-15 12:24:12 +00:00
Ameya Shenoy
4fa58359c8
Merge pull request #15689 from codingCoffee/pat
...
fix(patch): reload patient
2018-10-15 17:49:42 +05:30
Ameya Shenoy
102eb998ac
fix(patch): reload healthacre doctypes
...
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-15 17:40:02 +05:30
Nabin Hait
3c29967d27
Fixed merge conflict
2018-10-15 15:43:21 +05:30
Nabin Hait
d2c643eb0b
bumped to version 10.1.59
2018-10-15 16:11:25 +06:00
rohitwaghchaure
94fcb0e9f9
[Enhance] Add user image in the employee from the user ( #15680 )
2018-10-15 14:57:46 +05:30
Frappe PR Bot
be923a8995
[Translation] Updated Translations ( #15685 )
2018-10-15 14:55:04 +05:30
Jamsheer
2a966f26af
fix: patch - change healthcare desktop icons ( #15683 )
2018-10-15 14:54:29 +05:30
Ranjith Kurungadam
741bd29b74
fix: Patient Appointment Calendar ( #15684 )
2018-10-15 14:52:38 +05:30
rohitwaghchaure
0d2a4c6a59
[Fix] TDS Payable Monthly report is not working ( #15666 )
2018-10-15 11:09:17 +05:30
deepeshgarg007
42510a411f
[Bug-Fix]V11 Accounts Receivable print showing zero values ( #15667 )
...
* Bug Fix
* Print report bug fixes
2018-10-15 11:08:04 +05:30
rohitwaghchaure
3362d6b948
[Fix] Precision issue in the expense claim ( #15678 )
2018-10-15 11:07:13 +05:30
Chinmay Pai
905c0ff978
File api ( #15637 )
...
* file-api: major refactor
migrate from file_manager.py to file.py
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
* file-api: migrate to file-api
remove file_manager stuff and migrate to file-api
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-10-15 10:38:53 +05:30
Mangesh-Khairnar
8c62ab4af0
[Enhancement] Email birthday reminder ( #15559 )
...
* Update hooks.py
* modified date for reload_doc (#15027 )
* Single email for multiple birthdays and test
2018-10-11 17:06:10 +05:30
Shreya Shah
314c97cbf1
Fix for supplier quotation ( #15659 )
2018-10-11 16:59:40 +05:30
Alchez
a16f0f4423
fix(item_defaults): handle multiple item defaults for a company ( #15634 )
2018-10-11 16:56:46 +05:30
Charles-Henri Decultot
64b6421fce
Add event in transaction base correction ( #15631 )
2018-10-11 16:54:26 +05:30
Charles-Henri Decultot
6c743bebf2
Check for prefix before return EcritureNum ( #15629 )
2018-10-11 16:51:29 +05:30
Charles-Henri Decultot
50447b195d
Compatibility with Py2 ( #15653 )
2018-10-11 16:48:38 +05:30
Shreya Shah
e9890a3ec8
fix(patch): Check if meta object has naming_series field ( #15651 )
2018-10-11 16:28:59 +05:30
Faris Ansari
4833b4c274
fix: Default Series in naming series patch ( #15656 )
2018-10-11 16:27:05 +05:30
Stavros Anastasiadis
a398d6bf4f
Allow Same Item Multiple Items ( #15657 )
2018-10-11 16:25:37 +05:30
Stavros Anastasiadis
66922b9c8e
Allow Same Item Multiple Items ( #15657 )
2018-10-11 16:20:30 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Ameya Shenoy
d791af8331
bumped to version 11.0.3-beta.10
2018-10-11 06:58:13 +00:00
rohitwaghchaure
b1241caf48
Merge pull request #15650 from rohitwaghchaure/fix_gst_state_issue
...
[Fix] Nontype object has no attribute gst_state
2018-10-11 10:53:46 +05:30
Rohit Waghchaure
b6a735e021
[Fix] Nontype object has no attribute gst_state
2018-10-11 10:40:34 +05:30
Shreya Shah
785f1aa96d
fix(print): Update idx if grouping same items ( #15647 )
2018-10-11 10:14:25 +05:30
Shreya Shah
2291323c65
fix(shipping-address-display): Fetch shipping address display as per the shipping address ( #15643 )
2018-10-11 10:13:27 +05:30
deepeshgarg007
1cb1074f6b
Bug Fix ( #15640 )
2018-10-10 16:15:30 +05:30
Sagar Vora
d92f3ac480
Fix 'transporter info' section in Delivery Note ( #15565 )
...
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
2018-10-10 14:51:26 +05:30
Shreya Shah
dd87e0f1e2
fix(leave-type): Drop column max_days_allowed ( #15642 )
2018-10-10 14:48:49 +05:30
rohitwaghchaure
4cfff7829b
Added validation to check duplicate student leave application ( #15636 )
2018-10-10 14:47:48 +05:30
Shreya Shah
3855156b7d
fix(project): If Project has no Tasks, let the status be set as Completed ( #15639 )
2018-10-10 14:45:40 +05:30
Jamsheer
14c6ab0ee9
[fix] Healthcare field and desktop icon ( #15638 )
...
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
* Healthcare - Patch rename_healthcare_doctype_and_fields - Updated
* Healthcare - Desktop Icons - Updated
* Healthcare - Patch change in healthcare desktop icons
* Healthcare Util - fix - appointments valid in fee validity
* Healthcare Settings - field label change
* Patient allow rename
* fix: remove unused variable
2018-10-10 14:44:36 +05:30
Frappe PR Bot
3f320676f6
[Translation] Updated Translations ( #15620 )
2018-10-10 14:44:12 +05:30
Zlash65
6a8957b430
item data updated with retail data
2018-10-10 14:28:17 +05:30
Zlash65
62592d3c44
setup data for retail added
2018-10-10 14:28:17 +05:30
Zlash65
fd9c451909
company name picked up dynamically, domainification
2018-10-10 14:28:17 +05:30
Zlash65
d1fbaf8f32
custom field added for item - domainification, password changed
2018-10-10 14:28:17 +05:30
Zlash65
275ef826a4
codacy fixes
2018-10-10 14:28:17 +05:30
Zlash65
8b1133cb24
item data fix for default supplier, exception handling for purchase order
2018-10-10 14:28:17 +05:30
Zlash65
d080a17961
minor random trigger changes and exception handling
2018-10-10 14:28:16 +05:30
Zlash65
e64dcfc2f9
timesheet logic changed to job card
2018-10-10 14:28:16 +05:30
Zlash65
e895845ae1
import fix
2018-10-10 14:28:16 +05:30
Zlash65
523f77e82b
make_rm_stock_entry fix
2018-10-10 14:28:16 +05:30
Zlash65
dcf7401104
random time fix and other minor fixes
2018-10-10 14:28:16 +05:30
Zlash65
143d4da901
Production Plan fix
2018-10-10 14:28:16 +05:30
Zlash65
c24d2fdf6c
setup leave & expense approver for each department
...
- assign approver in expense claim
2018-10-10 14:28:16 +05:30
Zlash65
a259466643
add relevant department to employees
2018-10-10 14:28:16 +05:30
Zlash65
0309bbee30
function call requires company as parameter
2018-10-10 14:28:16 +05:30
Zlash65
796bffbee1
fix payroll and stock related data
2018-10-10 14:28:16 +05:30
Zlash65
4c07970545
remove user permission from HR Manager user
2018-10-10 14:28:16 +05:30
Zlash65
fa7c8a9f8b
update employee and user records
2018-10-10 14:28:16 +05:30
Saurabh
99c064305f
Merge branch 'master' into staging-fixes
2018-10-09 17:55:33 +05:30
Saurabh
2dc8972794
bumped to version 10.1.58
2018-10-09 18:25:32 +06:00
Zlash65
a1036ad50b
setup wizard failing fix
2018-10-09 17:38:28 +05:30
Shreya Shah
8a4bcefec4
fix(accounts-receivable): Column values in Print and PDF ( #15621 )
2018-10-08 18:34:01 +05:30
Shreya Shah
5b34d00bc0
fix(accounts-receivable): Column values in Print and PDF ( #15622 )
2018-10-08 18:20:51 +05:30
Nabin Hait
d2c5b50842
fix(warehouse-account): get warehouse account map fallback handling ( #15625 )
...
* fix(warehouse-account): get warehouse account map fallback handling
* fix: import issue
2018-10-08 18:19:53 +05:30
Ameya Shenoy
f5d3ce8846
Merge branch 'staging' into develop
2018-10-08 09:44:34 +00:00
Ameya Shenoy
563b1d153b
bumped to version 11.0.3-beta.9
2018-10-08 09:43:48 +00:00
Ameya Shenoy
ecba14e6cf
Merge branch 'master' into staging-fixes
2018-10-08 09:39:49 +00:00
Ameya Shenoy
b509b06edf
bumped to version 10.1.57
2018-10-08 09:37:37 +00:00
Zarrar
87441bf62e
columns without fieldname's data not shown ( #15618 )
2018-10-08 14:34:34 +05:30
Zarrar
5fcccda883
[Minor] Supplier Quotation ( #15578 )
...
* throw meaningful error if RFQ does not have selected supplier
* Update supplier_quotation.py
* codacy fix
2018-10-08 14:30:53 +05:30
Shreya Shah
4fb9230d16
Add missing method link_to_mrs to buying.js ( #15613 )
2018-10-08 14:18:03 +05:30
Shreya Shah
95d93913ce
fix(link_to_mr): Add missing method to buying.js ( #15616 )
2018-10-08 14:17:37 +05:30
Shreya Shah
37d3686372
fix(setup_taxes): Pop if frappe.message_log ( #15615 )
2018-10-08 14:17:16 +05:30
Ameya Shenoy
de5206ff43
Merge branch 'staging' into develop
2018-10-08 07:28:24 +00:00
Ameya Shenoy
0bd254b02b
bumped to version 11.0.3-beta.8
2018-10-08 07:27:35 +00:00
rohitwaghchaure
5e466bace4
Removed update_job_card_reference method ( #15614 )
2018-10-08 12:36:45 +05:30
Shreya Shah
c2857fd2cc
fix(setup_taxes): Pop if frappe.message_log ( #15611 )
2018-10-08 12:35:18 +05:30
Jamsheer
063cf9c582
Jam staging fixes ( #15608 )
...
* Test Inpatient Record - Fix
* Test Inpatient Record - Fix
2018-10-08 10:48:42 +05:30
Ameya Shenoy
8bef1d8506
Merge branch 'staging' into develop
2018-10-07 08:00:07 +00:00
Ameya Shenoy
cfdd629fd7
bumped to version 11.0.3-beta.7
2018-10-07 07:59:34 +00:00
Ameya Shenoy
272956980d
Merge pull request #15606 from codingCoffee/abc
...
fix: make location from warehouse patch
2018-10-07 13:25:05 +05:30
Ameya Shenoy
f7b5b7beb4
fix: make location from warehouse patch
...
- optimization by preventing patch execution if Asset doesn't exist
2018-10-07 13:08:00 +05:30
Ameya Shenoy
f174c95d80
Merge branch 'staging' into develop
2018-10-07 06:24:12 +00:00
Ameya Shenoy
cd9be8f0a6
bumped to version 11.0.3-beta.6
2018-10-07 06:23:22 +00:00
Shreya Shah
5615cb4735
Set default only if customer_address not found ( #15605 )
...
* Set default only if customer_address not found
* Similar fix for Purchase Invoice and shipping_address
2018-10-07 11:42:07 +05:30
Shreya Shah
e7e269d4a4
[Error] Display appropriate msg if company is different for TDS ( #15601 )
...
* fix(tds): Display appropriate msg if company is different
* Update tax_withholding_category.py
2018-10-06 17:56:21 +05:30
Zlash65
58a080a1b1
add voucher detail no while creating gl entry
2018-10-06 16:34:58 +05:30
Zarrar
bc7a2c5cb3
Merge pull request #15602 from Zlash65/fix-mod
...
[Minor] Deferred Expense
2018-10-06 16:21:06 +05:30
Zlash65
b4aeee776a
add voucher detail no while creating gl entry
2018-10-06 16:17:12 +05:30
Ameya Shenoy
1d5dc73dfd
Merge branch 'staging' into develop
2018-10-05 09:10:30 +00:00
Ameya Shenoy
538678afc4
bumped to version 11.0.3-beta.5
2018-10-05 09:09:53 +00:00
Ameya Shenoy
ad908779be
Merge branch 'master' into staging-fixes
2018-10-05 08:54:58 +00:00
Ameya Shenoy
97dbb4d125
bumped to version 10.1.56
2018-10-05 08:54:46 +00:00
Shreya Shah
5cff01634e
Merge pull request #15593 from Zlash65/fix-mod
...
[Minor] Item master - get_query for deferred accounts
2018-10-05 14:14:46 +05:30
Shreya Shah
32206029ac
Fix Codacy
2018-10-05 14:14:33 +05:30
Shreya Shah
deb9f0e03c
Merge pull request #15594 from shreyashah115/tds-report
...
Handle IndexError if no data found
2018-10-05 14:11:43 +05:30
Shreya Shah
db5ffce742
Merge pull request #15592 from shreyashah115/jv
...
Allow Reverse JV for all submitted docs
2018-10-05 13:33:11 +05:30
Shreya
0d7bd43367
Handle IndexError if no data found
2018-10-05 13:22:09 +05:30
Zlash65
2123b97d31
add get_query for revenue and expense account
2018-10-05 12:26:32 +05:30
Shreya
4f5214a136
Allow reverse jv for all submitted docs
2018-10-05 12:19:09 +05:30
Saif
00a16a9337
set_item_default was referencing a variable company of "company" ( #15576 )
2018-10-05 11:54:03 +05:30
Shreya Shah
17ac38ff29
Enable save before saving to update form after save ( #15579 )
2018-10-05 11:51:13 +05:30
Jamsheer
be6e426fe0
Healthcare Service Unit - added company abbr as suffix ( #15590 )
2018-10-05 11:38:15 +05:30
Ranjith Kurungadam
dc2bab2b72
fix healthcare patch ( #15584 )
2018-10-05 11:36:58 +05:30
Valmik
4c61861163
Add Delivery Trip to Delivery Note dashboard ( #15587 )
2018-10-05 11:36:31 +05:30
Saif
4faea037bb
Remove Test Letter Head from GSTR-1 ( #15591 )
2018-10-05 11:35:01 +05:30
Ameya Shenoy
06bd6ee1b8
Merge branch 'staging' into develop
2018-10-04 13:16:31 +00:00
Ameya Shenoy
2291558c5f
bumped to version 11.0.3-beta.4
2018-10-04 13:14:29 +00:00
Ameya Shenoy
6005a1eb89
fix(linting): indentation fix
...
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-04 17:40:39 +05:30
rohitwaghchaure
d69dc954c7
Merge pull request #15580 from sagarvora/fix-TabError
...
fix TabError in install_fixtures.py
2018-10-04 17:22:44 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
Ameya Shenoy
5ae344593e
bumped to version 11.0.3-beta.3
2018-10-04 11:42:56 +00:00
Rohit Waghchaure
18678696db
Fix issue after merging hotfix into staging-fixes
2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes
2018-10-04 09:25:07 +00:00
Ameya Shenoy
79dc8ac9cc
bumped to version 10.1.55
2018-10-04 09:11:50 +00:00
Rohit Waghchaure
9f2859701e
[Fix] WorkOrderItem object has no attribute operation
2018-10-04 13:25:49 +05:30
Sagar Vora
b13b9b4ed3
fix TabError in install_fixtures.py
2018-10-04 11:39:20 +05:30
Zlash65
6e3b1a58a1
service_stop_date should be editable after submit
2018-10-04 09:30:27 +05:30
rohitwaghchaure
f9930ff2a4
Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving
...
[Fix] Cost center issue
2018-10-03 18:47:28 +05:30
Shreya Shah
3204c94fdd
Merge pull request #15570 from shreyashah115/fix-filter-error
...
[Bug] Item wise sales register filters
2018-10-03 17:38:41 +05:30
Shreya
cbb112f2db
Fix filter error
2018-10-03 17:37:40 +05:30
Zlash65
9d159ab95e
remove db.escape as back tick already used
2018-10-03 17:26:28 +05:30
Rohit Waghchaure
8bf9f377dd
[Fix] Cost center issue
2018-10-03 16:59:43 +05:30
Rohit Waghchaure
d1b87ba41c
Book cost of goods sold instead of stock adjustment
2018-10-03 16:29:43 +05:30
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
Sharath C
1c44d93b93
Is frozen and Disabled Columns added to Customer Credit Report ( #15560 )
2018-10-03 10:41:11 +05:30
Sharath C
c0b684dc30
Attendance - Unique check based on Employee and Date excluding cancelled docs ( #15556 )
2018-10-03 10:40:22 +05:30
rohitwaghchaure
a5576f5b21
[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment ( #15374 )
2018-10-03 10:39:50 +05:30
Faris Ansari
e0a148474d
fix: Translation string ( #15561 )
2018-10-03 10:37:41 +05:30
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Shreya Shah
7d115183e4
Improvise and fix indicators in Portal list ( #15552 )
2018-10-02 12:46:26 +05:30
Charles-Henri Decultot
3b11debcd2
Gocardless correction ( #15554 )
2018-10-02 12:46:15 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
Frappe PR Bot
04e4af8d59
[Translation] Updated Translations ( #15550 )
2018-10-02 11:24:12 +05:30
Shreya Shah
5a2aced586
Merge pull request #15551 from Zlash65/minor-fix
...
[Minor] Delivery trip test fix
2018-10-02 11:12:51 +05:30
Rushabh Mehta
11e2119670
style(icon): revert to old icon
2018-10-02 11:06:55 +05:30
Zlash65
6a5e6ed2ff
delivery trip notification to customer fix
2018-10-01 17:28:42 +05:30
Zlash65
9e67b8ec4d
fix driver name selection
2018-10-01 17:27:12 +05:30
Zlash65
622bd10946
add date data [mandatory]
2018-10-01 15:37:31 +05:30
rohitwaghchaure
8976ad5ca1
Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue
...
[Fix] Attendance tool
2018-10-01 15:07:49 +05:30
Rohit Waghchaure
c7f8b82fff
[Fix] Attendance tool
2018-10-01 12:30:58 +05:30
Rohit Waghchaure
8fbf856618
[Fix] Salary slip
2018-10-01 12:00:45 +05:30
RicardoJohann
f52ee27d8e
fix order labels and add purchase order items overdue ( #15436 )
2018-10-01 11:27:08 +05:30
Rushabh Mehta
77588ededb
version: move to 12.x.x-develop
2018-09-30 23:02:05 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Alchez
6ecb2556b7
Add Delivery Settings + improve 'Notify Customers' functionality ( #15322 )
...
* Add Delivery Settings + improve 'Notify Customers' functionality
* Minor improvements
* Add patch to create a default dispatch notification template
* Fix travis errors
2018-09-30 21:38:47 +05:30
Neil Trini Lasrado
55a53e0bec
Added ability to have a default return warehouse for Sales Returns ( #15491 )
2018-09-30 21:22:50 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Zarrar
e4c9ac3961
[Minor] Cash Flow report - custom ( #15522 )
...
* python 2-3 fix for filter
* pass filters while fetching data to financial statement report
2018-09-30 21:19:01 +05:30
rohitwaghchaure
90f9f9d3d8
Code optimization for deferred revenue ( #15527 )
2018-09-30 21:12:50 +05:30
Saif
83c89346c3
set_item_default was referencing a variable company of "company" ( #15534 )
2018-09-30 21:12:25 +05:30
Faris Ansari
6575e52942
fix: Refactor Review Area according to new Text Editor ( #15536 )
...
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
rohitwaghchaure
1cf71d96b1
Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11
...
[Fix] Consolidated Financial Statement report
2018-09-28 17:06:57 +05:30
Rohit Waghchaure
ea0ef95539
[Fix] Consolidated Financial Statement report
2018-09-28 17:05:55 +05:30
Saif
c2dd9ab778
Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered ( #15514 )
2018-09-27 15:48:04 +05:30
Frappe PR Bot
c1bc8d6066
[Translation] Updated Translations ( #15518 )
2018-09-27 15:47:52 +05:30
Suraj Shetty
4b404c4f1e
Avoid multiple escapes ( #15509 )
2018-09-27 15:39:34 +05:30
Shreya Shah
0fc4917d81
Merge pull request #15516 from shreyashah115/product-page
...
Fetch Item Group's name and image on website
2018-09-27 15:12:42 +05:30
Shreya
5c335550e3
Fetch item_group's name and image on website if children
2018-09-27 13:55:59 +05:30
Nabin Hait
7d6d678e8d
purchase receipt return entry in dashboard
2018-09-26 19:04:11 +05:30
Nabin Hait
c22ba2ec26
fix(sales return): validation message fix
2018-09-26 18:56:45 +05:30
Nabin Hait
183972f58f
fix(stock_entry): allow creating stock entry against work order even if item rate is zero
2018-09-26 18:34:07 +05:30
Suraj Shetty
6ea3de9521
Fix quote issues ( #15497 )
...
* Fix quotes issues
* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more ( #15475 )
...
* fix(payroll): multiple minor fixes related to salary structure
* Added GSTR-1 and GSTR-2 report in Accounts module page
* delete asset movement records on cancellation of Purchase Receipt
* Update consolidated_financial_statement.py
* minor fix
* minor fix
* add filters on item prices report (#15495 )
2018-09-26 18:01:00 +05:30
RicardoJohann
171c7d4128
add filters on item prices report ( #15495 )
2018-09-26 15:58:06 +05:30
deepeshgarg007
c3772f1ac4
minor fix ( #15503 )
2018-09-26 15:55:43 +05:30
Shreya Shah
352e6494f3
Contact and email fields in Payment Entry ( #15490 )
...
* Add contact_person and contact_email fields to Payment Entry
* Minor fix
* Map contact details while making Payment Entry
* Update payment_entry.py
2018-09-26 15:38:34 +05:30
rohitwaghchaure
0cf0ebf08b
[Refactored] Asset Depreciation Ledger report based on GL entries ( #15415 )
...
* [Refactored] Asset Depreciation Ledger report is based on GL entries
* Provision to make manual JV from the asset if Calculate Depreciation is disabled
2018-09-26 15:24:49 +05:30
Ameya Shenoy
b635a71247
Merge branch 'staging' into develop
2018-09-26 08:53:03 +00:00
Ameya Shenoy
90197dd341
bumped to version 11.0.3-beta.2
2018-09-26 08:52:54 +00:00
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
...
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop
2018-09-26 07:32:45 +00:00
Ameya Shenoy
b8a5fb7392
bumped to version 11.0.3
2018-09-26 07:32:44 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes
2018-09-26 07:28:53 +00:00
Ameya Shenoy
e04431ea5c
bumped to version 10.1.54
2018-09-26 07:26:49 +00:00
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
rohitwaghchaure
fafc277666
[Fix] BOM update tool, too many writes in one request. Please send smaller requests ( #15432 )
2018-09-25 18:59:20 +05:30
Mohamed_Alsum
b9228fa443
show only submitted salary_structure and leave_policy in Employee Grade app ( #15434 )
...
* update staff plan when add or delete job-opening
* Update job_opening.py
* filter default_salary_structure and default_leave_policy
* merge
2018-09-25 18:56:17 +05:30
rohitwaghchaure
fe1e4a41e6
Validate negative stock serial number ( #15492 )
2018-09-25 18:36:32 +05:30
Faris Ansari
7a8c5b0c2c
fix(setup wizard): Validate FY dates ( #15473 )
2018-09-25 18:34:33 +05:30
Aditya Hase
a38b77cbfd
feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion ( #15457 )
...
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion
* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Zarrar
b113349f31
minor fix for auto-opt-in for customer ( #15483 )
2018-09-24 14:30:07 +05:30
Rohit Waghchaure
c699b2a98a
[Fix] Key error while saving sales invoice
2018-09-24 11:57:48 +05:30
Ameya Shenoy
63ebeb432c
Merge branch 'staging' into develop
2018-09-21 11:04:20 +00:00
Ameya Shenoy
cdedb27cf0
bumped to version 11.0.2
2018-09-21 11:04:20 +00:00
Suraj Shetty
dabaec0dc5
Revert bench-init changes ( #15463 )
...
* Revert bench-init changes
* Fix test
* Remove debug flag
2018-09-21 15:46:44 +05:30
Zarrar
e83ff38c10
[Enhance] Deferred Expense ( #15437 )
...
* added section for deferred expense in item master
* added default expense account field in Company master
* added deferred expense section in purchase invoice item
* validation and getter code added
* scheduler event to book expense every month
* codacy, import fix and other minor fixes
* rectify debit credit logic for expense
* commonify js code for deferred expense and revenue
* remove deferred calculation and validation
* common file to calculate deferred revenue and expense
* codacy fixes
* expense account root_type - Asset, specific method naming
2018-09-21 15:45:40 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Saurabh
3ef12bb7f2
bumped to version 11.0.1
2018-09-20 14:00:46 +06:00
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
Saurabh
3b281a0a1b
bumped to version 10.1.53
2018-09-20 13:52:36 +06:00
Saif
772dc6e82c
Various permission fixes ( #15448 )
...
* Removed test letter head from Consolidated Financial Statement
* Removed incorrect role permissions
2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75
[Fix] Salary slip is not saving ( #15449 )
2018-09-20 13:18:49 +05:30
Nabin Hait
8fb04ff1b2
Merge branch 'develop' into staging-fixes
2018-09-20 12:51:26 +05:30
rohitwaghchaure
550fc695f1
[Fix] Precision issue in the accounts receivable report ( #15440 )
2018-09-19 19:03:40 +05:30
Ameya Shenoy
a2f0b34147
fix(item, item default): changed the modified date ( #15442 )
...
The patch move_item_defaults_to_child_table_for_multicompany used to
fail since the doctypes Item and Item Defaults weren't reloaded properly
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-19 19:02:52 +05:30
Ameya Shenoy
28fd02e4a8
fix(desktop_icon): remove land unit icon if exists ( #15430 )
...
* fix(desktop_icon): remove land unit icon if exists
Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
* Update remove_land_unit_icon.py
2018-09-19 13:15:52 +05:30
Faris Ansari
2ab6e0e39b
fix(translations): Replace translations by keyword with indexed version ( #15426 )
...
* fix(translations): Replace translations by keyword with indexed version
Keywords in the translation also gets translated which
results in an error because python cannot find the key
* Update buying_controller.py
2018-09-19 13:13:59 +05:30
Mangesh-Khairnar
0374cc54ba
[bug fix]:stopped orders in progress report ( #15428 )
2018-09-19 13:10:53 +05:30
Nabin Hait
63a58a6752
Merge branch 'staging' into develop
2018-09-18 11:44:42 +05:30
Shreya Shah
13761dde38
[Report] Lead Conversion Time ( #15237 )
...
* New Report Lead Conversion Time
* Add column for support tickets and a row for Average
2018-09-18 10:55:35 +05:30
Jamsheer
c07e8e5b0d
[Fix] Healthcare minor fixes and field rename ( #15413 )
...
* Healthcare practitoiner in Clinical Procedure
* Insert and Update Patient Medical Record from Healthcare DocTypes
* vital signs remove extra columns
* Rename Healthcare Field test_name
* Healthcare Util - get_drugs_to_invoice - fix
* Rename Healthcare Field test_code
* Rename Healthcare Field test_comment
* Rename Healthcare Field test_created
* Rename Healthcare Field test_template
* Rename Healthcare Field test_rate
* Rename Healthcare Field test_description
* Rename Healthcare Field test_groups
* Rename Healthcare Field test_group
* Rename Healthcare Field test_template_type
* Rename Healthcare Field test_uom
* Rename Healthcare Field test_normal_range
* Rename Healthcare Field test_event
* Rename Healthcare Field test_prescription
* Rename Healthcare Field test_particulars
* Patch - Rename healthcare fields
* Sales Invoice - Filter updated for get drugs to invoice
* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f
added description field and changed to one filter datepicker ( #15425 )
2018-09-18 10:48:20 +05:30
JC
31f2c1c3d3
fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ ( #15423 )
2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816
[FIX] Remove deprecated gen_object.next() function ( #15418 )
...
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
2018-09-18 10:42:21 +05:30
Faris Ansari
aa856c474a
fix(setup wizard): Validate FY dates ( #15419 )
...
- start date should be less than end date
2018-09-18 10:42:04 +05:30
Frappe PR Bot
db8c1f254e
[Translation] Updated Translations ( #15414 )
2018-09-17 16:54:30 +05:30
Charles-Henri Decultot
d6bce7429e
Bank statement import corrections ( #15405 )
...
* Bank statement import corrections
* Bank statement corrections
* Missing semi-columns
2018-09-17 12:34:11 +05:30
Zarrar
013493de7a
lable for discount_amount should be configurable ( #15408 )
2018-09-17 11:06:49 +05:30
theopen-institute
ba1c0c900d
Fix potential crash in payment_entry.py ( #15411 )
...
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
2018-09-17 10:59:39 +05:30
Zarrar
e79e4cb9b1
python 2-3 fix, *.keys() return dict_keys object in py3 ( #15409 )
2018-09-17 10:56:42 +05:30
Zarrar
ada13213c0
reload Patient Appointment doctype with added fields ( #15397 )
2018-09-14 15:32:04 +05:30
Faris Ansari
31e5431fe0
fix(urljoin): 2 and 3 compatible ( #15401 )
2018-09-14 15:31:35 +05:30
Zlash65
2619596917
pass filters as parameter
2018-09-13 12:56:04 +05:30
Nabin Hait
5be3968544
fix(add_file): added missing init file
2018-09-12 18:56:15 +05:30
Ameya Shenoy
ecac822613
Merge pull request #15393 from codingCoffee/hub
...
fix(patch): delete hub documents
2018-09-12 17:50:02 +05:30
Ameya Shenoy
18310c240f
fix(patch): delete hub documents
...
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
2018-09-12 17:46:58 +05:30
Doridel Cahanap
6d0ae5b23b
Allow Rename for Custom Tariff ( #15389 )
2018-09-12 17:13:12 +05:30
Prateeksha Singh
5ba14fe685
[patch][fix] remove hub node module removing code
2018-09-12 16:59:17 +05:30
Prateeksha Singh
238ed98653
Re-add Hub Node module
2018-09-12 16:36:10 +05:30
Nabin Hait
9fde97cdd2
Fixed merge conflict
2018-09-12 15:45:20 +05:30
Saurabh
393dd4286a
[resolved] merge-conflicts
2018-09-12 14:48:30 +05:30
Saurabh
6d5a29af6a
bumped to version 10.1.52
2018-09-12 15:14:25 +06:00
Zarrar
8dade79002
return blank if no data found ( #15387 )
2018-09-12 14:24:23 +05:30
Nabin Hait
6173e091ee
fix(test): test cases fixed
2018-09-12 11:46:20 +05:30
Zarrar
2b6584a296
accounts table should be mandatory in budget ( #15386 )
2018-09-12 11:14:24 +05:30
Ahmed Madi
20d8c52d2a
Update salary_slip.js ( #15200 )
2018-09-12 11:02:57 +05:30
Zarrar
ce6a09ca54
[Staging] Stock Reconciliation ( #15382 )
...
* optimize query and some fixes
* add get_query to filter warehouses based on company
* minor changes
2018-09-12 10:54:18 +05:30
Nabin Hait
0669a0e18a
fix(bank account): import fixed
2018-09-12 10:50:10 +05:30
Nabin Hait
13beb3a008
fix(test): test cases fixed
2018-09-11 19:37:08 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Faris Ansari
76b31deda5
Isomorphic marketplace ( #15384 )
...
* feat: Make marketplace run on hub server in Guest mode
* fix: Skip page actions on server
* fix: Limit PageContainer to marketplace route
* fix(eslint): Add hub variable to globals
2018-09-11 17:38:31 +05:30
Jamsheer
ede924c4a2
Remove print statements - Healthcare utils ( #15363 )
2018-09-11 17:32:52 +05:30
Sagar Vora
508189eaea
Use default conversion factor if not found in Item ( #15369 )
2018-09-11 17:22:25 +05:30
Frappe PR Bot
157bdb71ca
[Translation] Updated Translations ( #15375 )
2018-09-11 17:21:39 +05:30
Zarrar
2859300fe6
update modified date to reload doc ( #15385 )
2018-09-11 17:12:27 +05:30
Nabin Hait
84ddbc0ac9
fix(test): test cases fixed
2018-09-11 17:11:39 +05:30
Nabin Hait
2236f0aef0
fix(test): multiple test cases fixed
2018-09-11 16:50:46 +05:30
Nabin Hait
e11f299b21
Update production_order.py
2018-09-11 11:36:05 +05:30
Nabin Hait
2ce2d2ac02
fix(sales invoice): get value only if field exists
2018-09-10 13:16:25 +05:30
Faris Ansari
80e6cad7ac
Merge pull request #15360 from netchampfaris/marketplaces-fixes
...
fix(image): New Image component to consistently handle broken images
2018-09-10 12:29:50 +05:30
Zlash65
4b0e3741b2
job card patch use orm
2018-09-10 12:18:51 +05:30
Prateeksha Singh
3b3c80e6b5
Merge pull request #15371 from pratu16x7/marketplace-fixes
...
[hub] add Item Manager permission to Hub Tracked Item
2018-09-10 11:40:42 +05:30
Prateeksha Singh
62f5cd2dee
[hub] add Item Manager permission to Hub Tracked Item
2018-09-10 11:39:48 +05:30
Zarrar
68000c66fc
check if Data Migration Plan exists before deleting ( #15368 )
2018-09-09 19:19:13 +05:30
Zarrar
8448d9014d
[Fix] Patch fixes ( #15350 )
...
* fix typo in fieldname
* fallback for work_order/production_order in timesheet
2018-09-09 19:18:41 +05:30
Ameya Shenoy
8b7fea5a8a
Merge pull request #15349 from sagarvora/py3-fixes
...
[py3] print, StringIO import, and other fixes
2018-09-09 02:25:10 +05:30
Saif Ur Rehman
423549e084
Fixed PDC data in AR/AP report:
...
-Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared
-Get PDC data from submitted documents only
2018-09-08 15:48:55 +05:00
Faris Ansari
9fb5e1c61b
fix(image): New Image component to consistently handle broken images
...
- psuedo element hack didn't work cross browser
2018-09-07 23:17:29 +05:30
Nabin Hait
73165ebd33
fix(patch): create healthcare patch only if domain activated
2018-09-07 18:44:14 +05:30
Sagar Vora
538100148f
[py3] print, StringIO import, and other fixes
2018-09-07 17:59:59 +05:30
Pawan Mehta
2cc7eb1e94
fix default settings ( #15345 )
2018-09-07 17:59:10 +05:30
Nagarajan
8be8345b65
Stock Projected Qty Item Group Filter ( #15340 )
...
* Update stock_projected_qty.js
* Update stock_projected_qty.js
* Update stock_projected_qty.py
* Update stock_projected_qty.js
2018-09-07 16:20:18 +05:30
rohitwaghchaure
3cc77b52e7
[Fix] Timeout error for bom update tool ( #15343 )
2018-09-07 16:16:58 +05:30
rohitwaghchaure
bd4348db10
[Enhance] Add additional cost of the manufacture stock entry in the project costing ( #15341 )
2018-09-07 16:16:23 +05:30
Nabin Hait
562d942a7d
fix(patch): gst state number in address where number is less than 10
2018-09-07 16:14:44 +05:30
Nabin Hait
431e2e1c6d
fix(payment entry): Changed modified
2018-09-07 14:31:34 +05:30
Nabin Hait
399f3ddf82
fix(sales invoice): Restored missing field group_same_items
2018-09-07 14:27:14 +05:30
Nabin Hait
3a342e8d93
fix(report): project filter in financial statement
2018-09-07 14:17:57 +05:30
Zlash65
635890187a
remove console statement
2018-09-07 14:04:46 +05:30
Zarrar
525a005b78
TDS Monthly report & TDS Computation Summary report ( #15204 )
...
* tds computation report added
* tds computation logic added
* minor changes to commonify code
* tds payable monthly report added
* initial logic for monthly tds calculation added
* added field for supplier type and pan
* changes related to pan and entity type
* date filter fix and cleanup
2018-09-07 13:27:10 +05:30
rohitwaghchaure
eef5cda1a9
[Fix] Blanket order issue ( #15339 )
2018-09-07 13:19:45 +05:30
Zarrar
7737620ff4
[Staging] Patch fix - Shopify Settings ( #15338 )
...
* keep enable_shopify in Shopify Settings disabled by default
* patch fix for shopify refactor
* minor fallback fix
2018-09-07 13:19:33 +05:30
Nabin Hait
b479a87031
fix(report): Cost center filters in financial statements and general ledger
2018-09-07 13:17:23 +05:30
Rohit Waghchaure
e74a39752f
[Fix] Patch
2018-09-06 22:38:03 +05:30
rohitwaghchaure
32dc3bf082
[Enhance] Job Card ( #15244 )
...
* [Enhance] Added job card against the work order
* removed work order from timesheet
* Fixed codacy
* Added patch to make job card from the timesheet
* Timer in job card
* Dates validation in job card
* Added button to make job card from work order
* Added sub-assembly operation in the work order
2018-09-06 19:21:48 +05:30
Neil Trini Lasrado
6f77abe0dd
Added ability to create a Return Sales Invoice/ Credit Note against a delivery note of type return ( #15266 )
...
* Remove make subscription button on delivery note if it is of type returns
* Added 'issue_credit_note' checkbox on delivery note to pass a Sales Inv of type return if checked while creating a return delivery note
* Added logic to auto-create Return Sales Invoice/ Credit Note if issue_credit_note checkbox is checked while return delivey note is submited
* Update delivery_note.py
2018-09-06 19:17:47 +05:30
Alchez
4b290e5561
Map details from Delivery Trip back to Delivery Note ( #15261 )
...
* Map details from Delivery Trip back to Delivery Note
* Add pop-up to indicate changed Delivery Notes
2018-09-06 19:08:19 +05:30
Alchez
f2fe0b2194
Keep Delivery Trip stops unique based on their Delivery Notes ( #15264 )
...
* Keep Delivery Trip stops unique based on their Delivery Notes
* Pull single row when making a Trip from Delivery Note
2018-09-06 19:05:09 +05:30
Bassam Ramadan
574cd46e41
Adding cashier closing feature ( #15273 )
...
* adding cashier closing feature
cashier closing feature has been added as now the cashier can make a
closure to record every thing from his pos as the expenses which has
been paid and the custody which he had at the starting and the amount
which is in his save and the system will record the date and time and
the user and the total net amount automatically which supposed be equal
to all of his sales invoices totals
* add cashier closing link at pos menu
* add cashier closing link to accounts config file
adding cashier closing link at accounts config file to show it at the
accounts module page
* adding more features to cashier closing
adding from time to the cashier closing in case the cashier working more
than one shift also giving him the ability to add the type of payments
to his cashier closure ,
also adding validation to be sure the from time is less than to time.
* Update cashier_closing.py
2018-09-06 19:02:25 +05:30
Nabin Hait
4fd1cebf95
fix(patch): Delete all documents from Hub Node module
2018-09-06 18:53:46 +05:30
Alchez
e52ae4eacb
[Fix] 'To Bill' status even if the amount is zero ( #14784 )
...
* Fix 'To Bill' status even if the invoice amount is zero
* Modify fix to only apply on Delivery Note documents
2018-09-06 18:27:06 +05:30
Faris Ansari
b892cc8b02
fix(item): Remove Hub Category field ( #15331 )
2018-09-06 18:02:48 +05:30
Zarrar
203baa9a3a
update modified date to load blanket order field ( #15332 )
2018-09-06 17:46:11 +05:30
Nabin Hait
a2a6568b7e
fix(reports): Made gstr1 ready for govt portal
2018-09-06 17:44:31 +05:30
Sanjay Kumar
1b49f3a4e7
Allow cost center in entry of balance sheet accounts ( #14972 )
...
* Allow Cost Center In Entry of Balance Sheet Account
* Add parent cost center in get payment entry
* Add Tests for Allow Cost Center In Entry of Balance Sheet Account
* Add tests for cost center wise account and party balance
* set parent cost center in taxes
* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents
* fix Codacy and Travis issue
2018-09-06 14:39:35 +05:30
Nabin Hait
b94008dab3
fix(patch): reload loyalty program in healthcare patch
2018-09-06 14:27:03 +05:30
Nabin Hait
8652bce9e3
Update modules.txt
2018-09-06 14:18:49 +05:30
Faris Ansari
4e372a30fa
fix(patch): Remove old Hub Page ( #15328 )
2018-09-06 14:08:31 +05:30
Prateeksha Singh
df327f2974
[remove-hub] delete hub module
2018-09-06 13:34:47 +05:30
Prateeksha Singh
3ccbb8f8b7
[remove-hub] delete hub_settings and hub_category
2018-09-06 13:28:47 +05:30
Zarrar
1b37186460
set POS Invoice format only if its enabled ( #15326 )
2018-09-06 13:25:52 +05:30
ahmad zaqout
2350dc26f6
fix syntax error HTTPError in amazon_mws_api ( #15324 )
2018-09-06 13:21:04 +05:30
Zarrar
0d931e1d7d
fix uom & stock_uom print hide logic ( #15327 )
2018-09-06 13:08:58 +05:30
Nabin Hait
f846c43361
Merge branch 'ESS-LLP-healthcare_v11_wip' into develop
2018-09-06 13:07:08 +05:30
Nabin Hait
ffeff2d385
fix(tests): reset session user as administrator after running tests
2018-09-06 12:45:07 +05:30
Nabin Hait
e5a4037b57
minor fix in deferred revenue booking
2018-09-05 17:44:39 +05:30
Nabin Hait
aacb915cae
Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip
2018-09-05 17:21:47 +05:30
Zarrar
2705af488d
[Minor] [Staging] POS Profile ( #15321 )
...
* update modified date to load field display_items_in_stock
* stop dialog from popping up if no loyalty program found
* warehouse not used for not is_pos type invoice
2018-09-05 17:20:07 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year ( #15320 )
2018-09-05 17:18:59 +05:30
Pawan Mehta
6010a10ad1
Amazon MWS Connector ( #15061 )
...
* [fix] #15054
* [fix] #15058
* codacy issues
* Codacy fixes-1
* Travis Fix
* fix codacy
* fix codacy
* review changes 1
* Custom fields and fixes
* remove amazon id
* remove item.json and sales_order.json
* added back sales_order and item files
2018-09-05 17:16:57 +05:30
Benji
6c9a92671b
Minor bugfix ( #15210 )
...
* Minor bugfix
Bugfix for https://github.com/frappe/erpnext/pull/15170
* Update project.py
2018-09-05 13:24:53 +05:30
Nabin Hait
5122a8e0d7
Merge branch 'staging' into develop
2018-09-05 11:47:30 +05:30
johnhkelley1
431b4fba72
Allow for 0 valuation rate in Stock Reconciliation ( #15313 )
...
Currently, a valuation rate of 0 gets treated the same as an omitted
valuation rate, and gets overwritten during validation. This hotfix
allows a Stock Reconciliation Item's valuation rate to be set to 0.
2018-09-05 11:43:28 +05:30
Zarrar
3cea3c46b6
change modified date of account to reload fields ( #15317 )
2018-09-05 11:41:54 +05:30
Saif
8f00db58bd
-Moved JE's User Remark on the top of the generated remarks ( #15314 )
...
-Added a field in JE's Account entries to add remarks in specific JE Account entry
2018-09-05 11:13:06 +05:30
rohitwaghchaure
bcaca85873
[Fix] Meta object has no attribute permissions ( #15316 )
2018-09-05 11:10:17 +05:30
KanchanChauhan
73bd3cb278
Moved daily event (update_latest_price_in_all_boms) to daily_long since it was timing out ( #15253 )
2018-09-05 11:01:35 +05:30
Charles-Henri Decultot
b07f482c0c
Test case for contact references ( #15077 )
...
* test case for contact references
* Add teardown
2018-09-05 11:00:14 +05:30
Prateeksha Singh
8a160684b7
[fix] filter() result in list
2018-09-04 10:59:20 +05:30
Faris Ansari
f8af7e0b3d
Merge pull request #15309 from frappe/hub-multiuser
...
fix: Revert skeleton in Sidebar
2018-09-04 10:43:52 +05:30
Faris Ansari
7be9c381d8
fix: Revert skeleton in Sidebar
...
- sidebar items repeating for some reason
2018-09-04 00:12:47 +05:30
Faris Ansari
74a32e6ffe
Merge pull request #15305 from frappe/hub-multiuser
...
feat: Add skeleton to Home and Sidebar
2018-09-03 19:40:22 +05:30
Faris Ansari
66321e6af7
feat: Add skeleton to Home and Sidebar
2018-09-03 19:39:19 +05:30
Prateeksha Singh
76f2430152
Merge pull request #15303 from frappe/hub-multiuser
...
Hub Multiuser
2018-09-03 18:57:41 +05:30
Prateeksha Singh
1265a26c0c
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d
[hub] update settings after publish, fix route_map
2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de
[hub] hide Contact Seller and Save Item in read-only
2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016
fix: Selling Messages
2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d
[hub] show become a seller button to all, but not dialog
2018-09-03 17:31:43 +05:30
Faris Ansari
49ccdd6f07
fix: Move image saving code to hub server
2018-09-03 17:24:17 +05:30
Faris Ansari
d4bba297c2
fix: Container title
2018-09-03 17:12:22 +05:30
Saurabh
1fe1884b73
Merge branch 'master' into develop
2018-09-03 17:00:17 +05:30
Saurabh
4bd562d669
bumped to version 10.1.51
2018-09-03 17:30:15 +06:00
Faris Ansari
28652baacc
Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e
fix: email in profile dialog
2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17
[fix] add message for admin users before register dialog
...
- use is_registered api for page routes
2018-09-03 16:39:59 +05:30
Prateeksha Singh
8fe5e8adf8
Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-03 16:15:42 +05:30
Prateeksha Singh
adef70f8df
[hub] update_hub_url patch to use marketplace_url
2018-09-03 16:12:50 +05:30
Saurabh
7b38d93e03
[fix] setup lang in patch
2018-09-03 16:07:40 +05:30
Frappe PR Bot
5c0a831ff2
[Translation] Updated Translations ( #15299 )
2018-09-03 15:58:04 +05:30
Faris Ansari
ad0be6aaa2
fix: Messages
...
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109
[marketplace] Disallow unregistered routes if not registered
2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85
[hub] ask company description in dialog
2018-09-03 13:11:23 +05:30
Shreya Shah
bb88e964a4
Remove unnecessary code ( #15296 )
2018-09-03 13:01:12 +05:30
Nabin Hait
13109aef9d
fix: validate only if service stop date
2018-09-03 12:18:17 +05:30
Jamsheer
8f808cbaf6
Patch - redesign healthcare billing work flow - fix
2018-09-03 11:26:19 +05:30
Jamsheer
34e561876a
Test prescription in Sales Invoice - Patient Encounter in draft status
2018-09-03 11:26:19 +05:30
Jamsheer
0640b4794e
Healthcare Practitioner - dashboard - updated
2018-09-03 11:26:19 +05:30
Jamsheer
a3b76fa40e
Healthcare - Masters - allow import set to 1
2018-09-03 11:26:19 +05:30
Jamsheer
b0ea297cf8
Patient Appointment - department - reqd = 0
2018-09-03 11:26:19 +05:30
Ranjith
2e48337cd4
Patient Encounter - update fields patient_name, patient_age
2018-09-03 11:26:19 +05:30
Jamsheer
a0b3e0268b
Healthcare - Doctype - field index = 1
2018-09-03 11:26:19 +05:30
Jamsheer
359bb512b4
Payment mode and Paid amount in Patient Appointment
2018-09-03 11:26:18 +05:30
Jamsheer
7cc205946c
Restrict to Healthcare
2018-09-03 11:26:18 +05:30
Jamsheer
363deb67c3
Automate - Patient Apointment Invoicing
2018-09-03 11:26:18 +05:30
Jamsheer
4371c7e492
Healthcare Service Unit - Tree View Updated
2018-09-03 11:26:18 +05:30
Jamsheer
c64880b578
Invoice - lab prescription from submitted Patient Encounter
2018-09-03 11:26:18 +05:30
Jamsheer
0ae100b035
Configuration - Create Lab Test on Sales Invoice Submit
2018-09-03 11:26:18 +05:30
Jamsheer
61574d18bf
Fix - Create Multiple Lab Test from Sales Invoice or from Patient Encounter
2018-09-03 11:26:18 +05:30
Jamsheer
858e026fc0
Lab Test - Create Multiple from Sales Invoice or from Patient Encounter
2018-09-03 11:26:18 +05:30
Jamsheer
80468bec31
Lab Test - Remove unused methods
2018-09-03 11:26:18 +05:30
Jamsheer
2ae06d3a35
Healthcare Service Unit - rename field - occupied to occupancy status
2018-09-03 11:26:18 +05:30
Jamsheer
b19993b5bc
Codacy - fixes
2018-09-03 11:26:18 +05:30
Jamsheer
25dda3a91a
Invoice inpatient occupancy - Qty updated
2018-09-03 11:26:18 +05:30
Jamsheer
9b9518eaaa
Healthcare Service Unit Type - Validation and Item price updation
2018-09-03 11:26:18 +05:30
Jamsheer
c8f827be66
Healthcare Service Unit Type - Field - UOM Conversion in Hours
2018-09-03 11:26:17 +05:30
Jamsheer
ee5f9c7b80
Healthcare Invoice - Practitioner Specific Service Item
2018-09-03 11:26:17 +05:30
Jamsheer
e1d215352b
Healthcare Practitioner - Service Item Fields - Filter and Validation
2018-09-03 11:26:17 +05:30
Jamsheer
1dbfd5c1e7
Healthcare Settings - Heathcare Service Item - Validation
2018-09-03 11:26:17 +05:30
Jamsheer
e82f27ac10
Healthcare - Invoice Drug Prescription
2018-09-03 11:26:17 +05:30
Jamsheer
197cd88d36
Lab Test Template - rate updation - fix
2018-09-03 11:26:17 +05:30
Jamsheer
a5c3fc69b8
Patch - Healthcare - Invoice - fix
2018-09-03 11:26:17 +05:30
Jamsheer
8da6f4e30c
Healthcare - Invoice - Redesign
2018-09-03 11:26:17 +05:30
Jamsheer
25e535c66f
Clinical Procedure Item - Remove field invoiced
2018-09-03 11:26:17 +05:30
Jamsheer
1646010059
Clinical Procedure - Consumables Invoice Separately
2018-09-03 11:26:17 +05:30
Jamsheer
0eb64ca38b
Healthcare Settings - Filter For Service Items
2018-09-03 11:26:16 +05:30
Jamsheer
edf8821a4e
Healthcare Settings - fields - service items
2018-09-03 11:26:16 +05:30
Jamsheer
b2a615b8e8
Healthcare Practitioner - new field - Inpatient Visit Charge
2018-09-03 11:26:16 +05:30
Jamsheer
7f51ffa5eb
Patch - Healthcare - Redesign Billing - fix
2018-09-03 11:26:16 +05:30
Jamsheer
eafb046fce
Healthcare Utils - prescription - invoice - fix
2018-09-03 11:26:16 +05:30
Jamsheer
fd2879c077
Patch - Healthcare - Redesign Billing
2018-09-03 11:26:16 +05:30
Jamsheer
c6974a79a8
Sales Invoice - show Healthcare Fields - Healthcare in active Domains
2018-09-03 11:26:15 +05:30
Jamsheer
94efed161a
Fee Validity - Test - Updated
2018-09-03 11:26:14 +05:30
Jamsheer
146683bbff
Fee Validity - invoice reference
2018-09-03 11:26:14 +05:30
Jamsheer
f7a6531fb3
Inpatient Record - Test - Updated
2018-09-03 11:26:14 +05:30
Jamsheer
54ae74eb28
Inpatient Billing
2018-09-03 11:26:14 +05:30
Jamsheer
8cb142bf29
Field Changes - Healthcare Invoice Work Flow Redesign
2018-09-03 11:26:14 +05:30
Jamsheer
bab55390f8
Sales Invoice in Patient Dashboard
2018-09-03 11:26:14 +05:30
Jamsheer
ba11972302
Healthcare Service - Invoice Work Flow - Redesign
2018-09-03 11:26:14 +05:30
Frappe PR Bot
3921660747
[Translation] Updated Translations ( #15285 )
2018-09-03 11:14:57 +05:30
Saurabh
0754ece288
Patch fixes ( #15295 )
...
* patch fixes
* [Fix] disable shopify if any exception occured while
2018-09-03 10:44:40 +05:30
Prateeksha Singh
85563ddfd3
[hub] update publish hub api
2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06
[hub][api] Update save and view api to be user specific
2018-09-03 02:25:41 +05:30
Prateeksha Singh
2cf52e53dd
Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser
2018-09-02 19:46:30 +05:30
Prateeksha Singh
a094c0f3f1
[fix] encrypted password in Hub User child record by frappe/frappe#6048
...
- use save() instead of insert()
2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c
feat: Add add_user dialog and methods
...
- wip
2018-09-02 18:29:00 +05:30
Nabin Hait
41b630759c
fixed type
2018-09-01 18:37:07 +05:30
Nabin Hait
4e187e88f8
ignore non stock items in stock entry against work order
2018-09-01 18:15:33 +05:30
Prateeksha Singh
b2b745fc7a
[hub] simplify marketplace settings, remove company fields
...
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d
feat: Add new registration flow
2018-09-01 14:30:46 +05:30
Prateeksha Singh
4e1fd0b417
[hub] register_seller -> register_marketplace
...
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
2018-09-01 09:55:43 +05:30
Prateeksha Singh
810ae01832
[hub] make client connection for first registered user
...
- remove usage of Hub Connector
2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962
[fix] hub_url -> marketplace_url
2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248
[fix] save() -> insert() for single doc, use doc.append in child table
2018-09-01 00:12:17 +05:30
Prateeksha Singh
a8065ff725
[hub] move register_seller to api, remove old code
2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1
[hub] set first user's password in marketplace users
2018-08-31 20:42:48 +05:30
Prateeksha Singh
3588486e5b
[fix] hub_settings -> marketplace_settings in call
2018-08-31 20:12:33 +05:30
Prateeksha Singh
ea2b9cbd1c
[hub] add user selection in register
2018-08-31 17:56:50 +05:30
Faris Ansari
dc1a2e2a37
fix: Allow read permission to everyone on Marketplace Settings
2018-08-31 17:31:22 +05:30
Nabin Hait
f1a3fbdb6b
minor fixes in dropship
2018-08-31 17:05:20 +05:30
Fisher Yu
2e5c776293
Update sales_order.py
...
1. filter out the suppliers by which the dropship purchase order already created
2. allow create multi dropship draft purchase orders
2018-08-31 17:05:20 +05:30
Fisher Yu
102bc7f5cf
Update sales_order.js
...
for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.
2018-08-31 17:05:20 +05:30
Rohit Waghchaure
12b4096e68
[Minor] Don't validate on cancelled budgest
2018-08-31 16:54:59 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3
...
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:52:26 +05:30
Valmik
2175b90b8d
Added feature to optimize routes, also cleaned up code ( #15193 )
2018-08-31 16:39:29 +05:30
Faris Ansari
f9a66c1c36
fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:30:34 +05:30
Rushabh Mehta
a2288ff8e7
fix(assessment_result): student must be in group ( #15255 )
...
* fix(assessment_result): student must be in group
* fix(test_student_group): raise correct exception
* fix(unused-import): assessment-plan.py
* fix(tests)
* fix(tests)
* fix(test)
* fix(tests)
2018-08-31 16:12:49 +05:30
Faris Ansari
25f509ebd3
feat: Add disable marketplace option in Hub Settings
2018-08-31 15:35:32 +05:30
Nabin Hait
1b73505391
Update sales_invoice.py
2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d
minor fixes
2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9
minor fixes
2018-08-31 14:49:20 +05:30
Ameya Shenoy
203152d67e
indentation: fixes
2018-08-31 14:33:48 +05:30
Nabin Hait
e033df2757
minor fixes
2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06
Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date
2018-08-31 12:39:46 +05:30
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
Saurabh
648191b9e8
bumped to version 10.1.50
2018-08-31 11:59:13 +06:00
Shreya Shah
ee8f8281b4
[py3] Convert filter object to list ( #15260 )
2018-08-30 19:22:22 +05:30
Faris Ansari
91ac26c2ff
fix(seller dialog): Email should be session user email ( #15270 )
2018-08-30 19:19:57 +05:30
rohitwaghchaure
624927bf0b
[Fix] Not able to export the Supplier-Wise Sales Analytics report ( #15271 )
2018-08-30 19:19:14 +05:30
Charles-Henri Decultot
7e86d7b014
Add default payable account for expense claims ( #15246 )
2018-08-30 19:18:26 +05:30
Bassam Ramadan
8d7c1868d6
fix for fields names at sales invoice return payments and verifying the payment amount ( #15245 )
...
* fix for payments field names in sales invoice return
* add verification for payment amount at sales invoice return
adding verification to be sure the payment amount is negative at sales
invoice return
* correction for precision field name
2018-08-30 19:15:15 +05:30
KanchanChauhan
0cd5313c69
Validate Completed Qty and Produced qty in Stock Entry for Manufacture ( #15248 )
2018-08-30 19:11:15 +05:30
Nabin Hait
9983d41fb0
Fixed divison error
2018-08-30 19:10:36 +05:30
Faris Ansari
00f6aef947
fix(publish items): Filter out disabled items ( #15268 )
2018-08-30 18:54:28 +05:30
Rushabh Mehta
49f9747385
major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc ( #15267 )
...
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc
* fix: remove debug
2018-08-30 18:50:48 +05:30
Nabin Hait
f6b784e39e
Test fixes
2018-08-30 18:42:35 +05:30
Shreya Shah
68348d4130
[Attendance-Tool] Filter employees based on date of joining ( #15262 )
2018-08-30 17:25:58 +05:30
Shreya Shah
3df2639a32
Optimize patch ( #15263 )
2018-08-30 17:24:03 +05:30
Prateeksha Singh
75ae844d70
Merge pull request #15247 from frappe/hub-redesign
...
[encore] MarketPlace
2018-08-30 17:12:41 +05:30
Prateeksha Singh
ecad873d19
[hub] remove item.js, fix seller decription condition
2018-08-30 16:21:26 +05:30
Nabin Hait
2390da647f
GSTR-1 minor fixes
2018-08-30 16:16:48 +05:30
Prateeksha Singh
5797565dd0
Merge with upstream
2018-08-30 16:15:27 +05:30
Prateeksha Singh
ff52e93e69
[hub] Merge conflicts
2018-08-30 16:11:41 +05:30
Prateeksha Singh
997bfa4916
[hub] add review timeline element
2018-08-30 16:08:52 +05:30
Faris Ansari
f3034ae262
feat: Add Report Item dialog
2018-08-30 16:05:15 +05:30
Faris Ansari
8e04487253
fix: Rename 'Product' to 'Item'
2018-08-30 15:35:17 +05:30
Prateeksha Singh
dc36d52ef9
[hub] fix review send
2018-08-30 15:12:18 +05:30
Faris Ansari
6b695d32b2
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-30 14:36:14 +05:30
Faris Ansari
90265aec24
fix: Page container routing
2018-08-30 14:36:05 +05:30
Faris Ansari
062cd62484
fix: Add restrictions for session user who is not hub seller
2018-08-30 14:35:56 +05:30
Prateeksha Singh
bff2bdc858
[hub] UI and empty state in 'your products' to guide on publishing
2018-08-30 12:58:46 +05:30
Prateeksha Singh
47f5f0e608
[hub] remove See All from non expandable sections
2018-08-30 12:16:08 +05:30
Prateeksha Singh
a4c24bda65
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-30 12:01:39 +05:30
Prateeksha Singh
b20c4e3184
[hub] remove client hub_settings scripts
...
- multiline to single line messages to translate
2018-08-30 12:01:04 +05:30
Faris Ansari
d32e7f8d02
fix: Administrator cannot register on marketplace
2018-08-30 11:53:46 +05:30
Faris Ansari
95e4141bf2
fix: Remove unused imports
2018-08-30 11:46:14 +05:30
Zlash65
80f5cb05cc
fixes in setting end_date and manual provision of start&end date
2018-08-30 10:39:48 +05:30
Zlash65
91eae54383
manually provide start and end date
2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6
start date logic fix
2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943
end date / stop date calc fix
2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383
end date should reset if start date is changed
2018-08-30 10:39:48 +05:30
Zlash65
d676a67769
validate changing service stop date once its set
2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15
book last gl_entry based on service stop date
2018-08-30 10:39:48 +05:30
Zlash65
243863a290
validation for stop date added
2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e
service stop date field added
2018-08-30 10:39:48 +05:30
Rushabh Mehta
20fd2ddd1c
ux(hr): module listing and quick entry for employee
2018-08-30 09:21:54 +05:30
Prateeksha Singh
04d051bb73
[hub] add review area
2018-08-30 02:42:13 +05:30
Prateeksha Singh
89ed2d9b34
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-30 02:33:28 +05:30
Prateeksha Singh
a6f184bcb7
[hub] remove old post and preprocess, log with minimal info
2018-08-30 02:30:40 +05:30
Faris Ansari
114d595de9
fix: Set hub_url in Hub Settings
...
- add patch to set the value
2018-08-29 18:24:49 +05:30
Faris Ansari
e4c7729089
fix(Hub Settings): Set site_name before seller registration
2018-08-29 17:13:43 +05:30
Faris Ansari
b7126c23f7
fix(Hub Settings): Remove unused fields
2018-08-29 17:13:16 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab
(fix)test case: loyalty program, course schedule and more
2018-08-29 17:05:11 +05:30
Faris Ansari
458cf6fcc5
style: remove trailing spaces
2018-08-29 16:19:39 +05:30
Faris Ansari
8683bd82ed
fix: Base64 extraction
...
- use requests to fetch the image without storing it anywhere
- only read local files
2018-08-29 16:18:36 +05:30
Faris Ansari
ff8f1c6120
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416
fix: Only a System Manager can register as a seller
...
- every other user has read only access
2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6
[hub] fix code lint issues, styles
2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Nabin Hait
af497ef669
bumped to version 10.1.49
2018-08-29 13:43:53 +06:00
Nabin Hait
6b539d65d7
Restored missing rounded_total fields
2018-08-29 12:41:23 +05:30
Faris Ansari
8bc954ecc6
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 18:29:08 +05:30
Faris Ansari
b26381e6b8
fix: Scroll to top when route changes
2018-08-28 18:29:01 +05:30
Prateeksha Singh
bd7d964848
[hub] Merge Develop
2018-08-28 18:25:07 +05:30
Zarrar
34208cc89d
Revert "Google maps settings"
2018-08-28 17:25:21 +05:30
Prateeksha Singh
2d45373f33
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 17:25:01 +05:30
Prateeksha Singh
1e02f00075
[hub] record views, update favourite api
2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97
fix: Show empty state if there are no items
2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-28 17:17:36 +05:30
Faris Ansari
811a2deb0f
fix: Load and save base64 image in publish
2018-08-28 17:17:29 +05:30
Faris Ansari
5689494f9c
chore: Remove old messages page
2018-08-28 16:52:17 +05:30
Saurabh
5b398f293a
[fix] typo fix
2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0
[fix] naming series refactor patch
2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895
[fix] naming series refactor patch
2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7
[fix] naming series refactor patch
2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74
[fix] fix google map imports ( #15240 )
2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf
[fix] naming series refactor patch
2018-08-28 15:18:48 +05:30
Suraj Shetty
b92403fbed
Add 'Become Seller' as a primary key
...
- Also remove some unwanted code
2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b
Remove 'Become Seller' option from sidebar
2018-08-28 15:03:01 +05:30
Nabin Hait
2b9186da5a
[fix] naming series patch
2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307
[fix] for python 3
2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7
[fix] missing functions related to google maps
2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3
erpnext: refactor async to is_async ( #15231 )
2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c
minor fix
2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094
[minor][fix] call update_percent_complete via validate ( #15235 )
2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f
Improve performance for warehouse tree ( #15207 )
...
* Fix conflicts
* Modify query structure
* Remove whitespaces
2018-08-28 13:46:22 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Saurabh
1898e11585
patch sequence fix
2018-08-28 13:04:40 +05:30
Suraj Shetty
ec12b34a79
Add margin below publish area
2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e
Add strip html filter
2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548
fix: Add empty state in Selling
2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9
feat: Selling Page
...
- common Messages page for both buying and selling
2018-08-27 19:51:36 +05:30
Saurabh
51570f731c
[Fix] patch fixes for V11 migration
2018-08-27 17:00:51 +05:30
Prateeksha Singh
bc859cbf1d
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f
[hub] merge conflicts
2018-08-27 15:16:19 +05:30
Suraj Shetty
dc7e8e6a26
Replace hub_item_code -> hub_item_name
2018-08-27 14:11:48 +05:30
Zarrar
93577665f2
[Enhance] Multiselect for Cost Center and Project ( #15208 )
...
* add filter for Cost Center, make CC & Project multiselect field
* update queries according to project/cost_center multiselect
* add multiselect filter for cost_center and project
* update query according to multiselect
2018-08-27 12:08:53 +05:30
Maxwell Morais
a2c1d92374
Revert "Fix shipping_address for DropShipping" ( #15218 )
...
* Revert "Cleaned up welcome email code (#15175 )"
This reverts commit 771fbb8f01#15187 )"
This reverts commit 2b72d09948#15184 )"
This reverts commit c5cf428d00#15206 )"
This reverts commit 2b2712bb9e8fe8d1758a#15203 )"
This reverts commit fbc3df3247#15202 )"
This reverts commit 4a394bcbf4
2018-08-27 12:05:41 +05:30
Ahmed Madi
1516b8d54a
Update asset_category.js ( #15222 )
2018-08-27 12:04:12 +05:30
Zarrar
b94c7075d8
rectify item price route ( #15223 )
2018-08-27 11:44:13 +05:30
rohitwaghchaure
e33047250e
[Fix] Speacial character issue in searching project in sales invoice ( #15220 )
2018-08-27 11:43:57 +05:30
Prateeksha Singh
fa26899cd0
[hub] added DetailHeaderItem to detail pages, contact seller button
2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda
[hub] Register components, init Item Page
...
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7
feat: Sidebar in vue
2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e
fix: Add back link to Buying
2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69
chore: Remove old messages files
2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9
feat: Buying and BuyingMessages in vue
2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940
feat: Add helper directives
...
- v-route
automatically route to a valid frappe route
- v-img-src
handle img loading and error handling
2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823
feat: SectionHeader component
2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd
fix(search-input): submit on enter
2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27
feat: Add dynamic routes in PageContainer
2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94
[hub][vue] add action object in empty state, make NotFound page
2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5
[hub][vue] add skeleton state to DetailView
2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda
[hub][vue] Seller Page
2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86
[hub][vue] DetailView and Profile page
2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff
feat: Add PageContainer
2018-08-26 12:41:02 +05:30
Suraj Shetty
0e59ec3ed2
Update messages UI
2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9
Separate links for selling and buying messages
...
- Add separate UI for selling messages
- Remove some redundant code messages
2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543
[hub][vue] Home page, add section title in item key in v-for
2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9
[hub][vue] search page
2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b
[hub][vue] Category and Published Products pages
2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013
[hub][vue] replace page files, fix item 'seen' prop
2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e
[hub][vue] Saved Products Page, remote item card
...
- also undo unfavouriting items
2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974
[hub][vue] add import
2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a
[hub][vue] Publish Page
2018-08-24 16:38:34 +05:30
Neil Trini Lasrado
771fbb8f01
Cleaned up welcome email code ( #15175 )
2018-08-24 15:15:56 +05:30
rohitwaghchaure
2b72d09948
[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry ( #15187 )
2018-08-24 11:28:34 +05:30
rohitwaghchaure
c5cf428d00
[Enhance] Provision to backflush raw materials from WIP warehouse ( #15184 )
2018-08-24 11:27:41 +05:30
Zarrar
2b2712bb9e
[Minor] Create default department on country setup ( #15206 )
...
* make default department when creating new company
* remove departments and tds entry for the company
2018-08-24 11:26:51 +05:30
Prateeksha Singh
67e0374261
[hub] add data-driven notification message
2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d
[hub][vue] add empty state and dynamic publish button
2018-08-23 21:25:53 +05:30
Nabin Hait
8fe8d1758a
Permissions issue in BOM tree
2018-08-23 16:25:51 +05:30
Prateeksha Singh
d7d2bb261b
[hub] add SearchInput
2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845
[hub][vue] init item card container in vue
2018-08-23 12:22:20 +05:30
Mario Monroy
fbc3df3247
Fix indentation accounts_receivable.py ( #15203 )
2018-08-23 11:10:15 +05:30
Faris Ansari
c4e38ffd4d
Remove hub page ( #15195 )
2018-08-23 11:09:31 +05:30
Maxwell Morais
4a394bcbf4
Fix shipping_address for DropShipping ( #15202 )
...
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.
To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
2018-08-23 11:08:37 +05:30
Charles-Henri Decultot
25712f8d65
Sales order correction ( #15190 )
2018-08-23 10:51:44 +05:30
Benji
363dd2773e
Update email_digest.py ( #15144 )
2018-08-22 21:57:51 +05:30
Suraj Shetty
341386e3a7
Add list view for messages
2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc
Add recent message block to item_card
2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1
Remove unused message to avoid confusion
2018-08-22 16:44:55 +05:30
Valmik
6ad16db88c
check for existing task before appending to child table ( #15183 )
2018-08-22 14:46:33 +05:30
Shreya Shah
be7703387d
Fetch reserved qty ( #15182 )
...
* Fetch reserved qty
* Update get_item_details.py
2018-08-22 14:45:22 +05:30
Faris Ansari
427a1301b7
Issues on the Portal should be editable ( #15181 )
2018-08-22 14:43:32 +05:30
Suraj Shetty
7ee79498fc
Hide review option for unregistered user
2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101
Stop event bubbling on clicking edit item
2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11
Fix publish button alignment
2018-08-22 11:50:23 +05:30
Suraj Shetty
fc7b7b6b97
Allow item list for System Manager
2018-08-22 11:32:49 +05:30
Suraj Shetty
7a040c4dd8
Show favorite button only for registered user
2018-08-22 11:32:49 +05:30
Suraj Shetty
f9e4cca334
Throw error if hub_url is not present in site_config
2018-08-22 11:32:49 +05:30
Suraj Shetty
3cd0c54438
Fix pyhton 3 compatibility
2018-08-22 11:32:49 +05:30
Prateeksha Singh
631c170ccf
[hub] fix merge conflicts
2018-08-21 21:00:53 +05:30
Prateeksha Singh
caadd8af4e
[Hub] sync with insert_many, Remove Data Migration Run 💥
...
- Use FrappeClient insert_many to publish items
- We will be syncing small amounts of items anyway
- Also, we need only the insert action in bulk
2018-08-21 19:59:15 +05:30
Faris Ansari
e745e85d98
feat: route to message room page after contact seller dialog
2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6
fix: remove items with invalid image
2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17
Merge with upstream
2018-08-21 19:17:25 +05:30
Faris Ansari
ff189b6853
fix: publish items
...
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
2018-08-21 19:14:44 +05:30
Faris Ansari
d29a3b3567
Highlight links with part route or full route
2018-08-21 19:12:10 +05:30
Zlash65
4d462d637f
indentation fix
2018-08-21 18:19:26 +05:30
Rushabh Mehta
9a29bfa49e
fix(indentation): sales_and_purchase_return.py
2018-08-21 17:53:25 +05:30
Prateeksha Singh
b0a3a106fc
[hub] profile email uneditable, style additions, base64 sync enable
2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719
Add BuyingMessages page
2018-08-20 18:33:46 +05:30
Bassam Ramadan
1ff2315899
Trial balance and payable accounts reports and sales return fixes ( #15000 )
...
* adding supplier type filter to payable accounts and payable accounts summary reports
adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter
* fix trial balance opening and closing values
the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account
* fix for supplier type filter field on payable accounts reports
rename the supplier type filter field to supplier group in payable
accounts and summary reports
* fix for paid amount in returned sales invoice
the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.
* fixing trial balance values and totals
fixing trial balance opening and closing ( DR - CR ) values and totals
2018-08-20 17:58:28 +05:30
Saif
15636a3b98
Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency ( #15153 )
...
Fix: PO will set party_account_currency to supplier's default currency on validation.
2018-08-20 17:57:00 +05:30
Saif
a09a8c3bf7
Fixed missing DocType info for Purchase Items ( #15152 )
...
* Made Purchase Invoice Items' Batch No and Serial No fields non copyable.
* Added appropriate currency field options to Purchase...Items DocFields:
-Landed Cost Voucher Amount
-Billed Amt
2018-08-20 17:55:18 +05:30
rohitwaghchaure
8cca61f1ba
[Fix] Removed roles for Eway bill report ( #15157 )
2018-08-20 17:53:56 +05:30
rohitwaghchaure
b800382abf
[Fix] Due to incorrect conversion factor user not able to make purchase return entry ( #15163 )
2018-08-20 17:50:31 +05:30
rohitwaghchaure
e689a903d8
Allowed data import for Assessment Result ( #15168 )
2018-08-20 17:50:04 +05:30
Saif
e3947296e8
Group by Voucher fix in General Ledger Report ( #15169 )
...
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries
* Group by Voucher show groups with totals at the end of group
2018-08-20 17:49:29 +05:30
Benji
299185fe24
Improved task weight calc ( #15170 )
...
* Improved task weight calc
Removed the requirement to have total of task weights to be exactly 1.
* Update project.py
2018-08-20 17:41:56 +05:30
rohitwaghchaure
ecc6af9d2a
[Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project ( #15171 )
2018-08-20 17:39:54 +05:30
Nabin Hait
c95153f83b
Offer date mandatory in job offer
2018-08-20 16:58:06 +05:30
Faris Ansari
8de6380648
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771
[hub] response data in hub call event trigger
2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de
[hub] emit hub call event to set category options while publishing
2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007
[feat] new component: ItemPublishDialog
2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011
[feat] new component: NotificationMessage
2018-08-20 13:07:23 +05:30
Zarrar
2b0ecbed2b
python3 based fix for sorted ( #15159 )
2018-08-20 11:15:06 +05:30
Prateeksha Singh
42be665412
Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d
[hub][feat] stateful publishing area
2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60
[hub][feat] Edit your Profile, recycle profile dialog
2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1
[hub] Register in a dialog instead of Page
...
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
2018-08-20 00:25:26 +05:30
Prateeksha Singh
a525d12f69
[hub] sync multiple image urls
...
- using a simple multiselect currently
2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96
[hub] Publishing Dialog, Sync category
...
- Hub Category selection
- Recycled
2018-08-19 19:39:00 +05:30
Faris Ansari
2ce2e1b6b0
feat(messages): split messages into buying and selling
...
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f
feat: custom cache invalidation for hub calls
...
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7
feat: empty states for favourites and search page
2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439
refactor: rename hub-card-container to hub-items-container
2018-08-17 14:29:22 +05:30
Rushabh Mehta
5f33b69f2f
fixes(minor): clean item group html and hide image
2018-08-16 14:48:02 +05:30
Nabin Hait
9409eddf28
Update __init__.py
2018-08-16 13:58:44 +05:30
rohitwaghchaure
5c5688b374
Added provision to disabled in stock in products settings ( #15133 )
2018-08-16 10:33:28 +05:30
Charles-Henri Decultot
bd06a5b0ee
Small python 3 compatibility correction ( #15151 )
2018-08-16 10:32:49 +05:30
Shreya Shah
80f30094fb
Fix error msg ( #15146 )
2018-08-16 10:29:16 +05:30
rohitwaghchaure
6fb2117767
Allow to make budget for the same cost center with different account ( #15149 )
2018-08-16 10:22:06 +05:30
Rushabh Mehta
8705371ef0
fix(product-listing): fix variant selection in website
2018-08-16 09:22:45 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report
...
[Fix] Consolidated balance sheet report
2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85
[Fix] Consolidated balance sheet report
2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa
rounding off fixes and conversion fix ( #15140 )
2018-08-14 16:28:14 +05:30
Ameya Shenoy
338dfcfb63
monkey patching for demo ( #15141 )
2018-08-14 16:27:47 +05:30
Prateeksha Singh
460e2798cd
[hub] Favourites UI
...
- remove from listing
- add to favourites
2018-08-14 11:42:40 +05:30
Faris Ansari
4809f86035
fix(report): field -> fieldname, dateutil -> frappe.datetime ( #15106 )
2018-08-14 10:56:18 +05:30
Shreya Shah
0631aed3d9
Discount amount field in all transactions' child tables ( #15124 )
...
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
2018-08-14 10:51:48 +05:30
rohitwaghchaure
88b0a1305f
Code optimization for accounts receivable report to avoid timeout error ( #15114 )
...
* Code optimization for accounts receivable report to avoid timeout error
* Added index for party_type
2018-08-14 10:51:13 +05:30
Prateeksha Singh
1a0fb5b63a
Add detail page favourited state
2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785
[refactor][major] Separate out Components
...
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
2018-08-13 21:36:07 +05:30
Nabin Hait
3b5f18231a
fix(item_defaults): Item name was overwriting by child name
2018-08-13 17:45:29 +05:30
Saurabh
ddbf3aaccb
Merge branch 'master' into develop
2018-08-13 13:15:58 +05:30
Saurabh
cd6b955b99
bumped to version 10.1.48
2018-08-13 13:45:56 +06:00
Rohit Waghchaure
18960c7757
Project task custom field not copying and error on project
2018-08-13 11:40:11 +05:30
Zarrar
a4d06fc881
replace cur_frm with frm
2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b
replace department group to department
2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9
replace customer to department
2018-08-11 21:54:56 +03:00
Nabin Hait
c35271aef5
fix(various)
2018-08-10 19:01:13 +05:30
Saurabh
20fb443f0c
[Resolved] merge conflicts
2018-08-10 17:11:30 +05:30
Saurabh
57d3c93e6b
bumped to version 10.1.47
2018-08-10 17:37:01 +06:00
Prateeksha Singh
b777f3dbfd
[layout][iterate] item detail page actions
2018-08-10 10:38:28 +05:30
Nabin Hait
8bf52fef42
minor fixes
2018-08-09 19:45:33 +05:30
Nabin Hait
c13960ddc9
minor fix
2018-08-09 18:25:03 +05:30
Nabin Hait
e07bf15de2
minor fix
2018-08-09 17:38:04 +05:30
rohitwaghchaure
a0b846fb88
[Minor] Added condition for get_bank_cash_account ( #15112 )
2018-08-09 15:51:38 +05:30
rohitwaghchaure
8356d4b892
[Fix] disable_rounded_total not found error ( #15113 )
2018-08-09 15:51:11 +05:30
rohitwaghchaure
ba62013cbb
[Fix] Not able to delete the task even if task removed from the project ( #15105 )
...
* [Fix] Not able to delete the task even if task removed from the project
* [Fix] Custom field's data in task not updating from the project
2018-08-09 15:50:23 +05:30
Nabin Hait
2a774fa0ac
minor fix
2018-08-09 11:50:34 +05:30
Nabin Hait
6a5695fe17
minor fix
2018-08-09 11:30:21 +05:30
rohitwaghchaure
59de1dae6a
[Fix] Math domain error ( #15107 )
2018-08-09 10:58:37 +05:30
Nabin Hait
9a33bc6417
optimizing transactions by caching
2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049
[optimize] tree conditions for pricing rule
2018-08-08 18:43:04 +05:30
Himanshu Mishra
859d942b22
Cached calls ( #15109 )
...
* [optimize]: bin updates
* [optimise]: use frappe.get_cached_value instead of get_value for item
* [fix]: change db.get_cached_value to get_cached_value
2018-08-08 18:33:50 +05:30
Himanshu Mishra
f56aac65e1
[optimize]: bin updates ( #15108 )
2018-08-08 18:32:03 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Rushabh Mehta
4d0b8da0e5
fix(style): modal for website
2018-08-08 14:48:02 +05:30
Nabin Hait
84c7c77009
[optimize] Get defaults from item group based on doc
2018-08-08 14:30:44 +05:30
Nabin Hait
3f142b874a
item defaults based on caching
2018-08-08 13:02:59 +05:30
ahmad zaqout
63a741e5c8
fix throw_overlap_error in Shift Assignment ( #15103 )
...
fix throw_overlap_error in Shift Assignment
2018-08-08 10:36:40 +05:30
Solufyin
3be899caff
Item Alternate Image Features in e-commerce site. ( #15044 )
...
* [ADD] Added Item Alternate Image Features in e-commerce site.
* [IMP] Improved Code for Item Alternate Image Feature.
* [IMP] Improved code for Item alternative image functionality.
* Remove .css file and make a build for erpnext-web.css
* Cleanup styling for item alternate image, also add delegated handler
* Spaces -> Tabs
* Spaces -> Tabs in item.html
2018-08-07 18:28:39 +05:30
rohitwaghchaure
8f0acf30bf
Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet
...
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:53:21 +05:30
Rohit Waghchaure
9a9974f5c3
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:51:56 +05:30
Ameya Shenoy
c63e0f9902
Merge pull request #15100 from codingCoffee/splitissue2
...
[fix] Split issue
2018-08-07 16:43:35 +05:30
Ameya Shenoy
f2e73dd687
[fix] Split issue
...
take reference name from communication
2018-08-07 16:34:37 +05:30
Meritsystems
1ad8eca4e8
Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. ( #14895 )
...
* Update point_of_sale.py
* Update point_of_sale.py
Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.
* New field " Display Items in Stock" added
* Update point_of_sale.py
* Update point_of_sale.py
ORM used instead of SQL
used Bin to find actual quantity balances.
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
* Update point_of_sale.py
2018-08-07 14:38:50 +05:30
Saurabh
824b388631
Resolved merge conflicts
2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c
[hub][fix] Category page api call
2018-08-07 12:56:56 +05:30
Saurabh
6ec558bd59
bumped to version 10.1.46
2018-08-07 13:25:51 +06:00
Prateeksha Singh
318cca8cae
[hub] Add 'See All' for Category items
...
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622
Add Products by Seller
2018-08-07 12:02:14 +05:30
Faris Ansari
796ca56f85
Use frappe.utils.md_to_html instead of manual import ( #15087 )
2018-08-07 11:53:36 +05:30
Prateeksha Singh
658d1bbae2
Fix product header styles
2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4
Home: Category-wise Items
2018-08-06 18:31:26 +05:30
Prateeksha Singh
b614ece991
[hub] Move sync, correct legacy code
2018-08-06 17:48:45 +05:30
Zarrar
2cadb1e12e
add tax withholding & loyalty program in explore view ( #15074 )
2018-08-06 14:46:16 +05:30
Doridel Cahanap
59e4c32e9f
Allow Disabling Batch and edit Validations ( #15076 )
2018-08-06 14:45:18 +05:30
Shreya Shah
11dd3ffdb5
Force delete item on deletion of Lab test template ( #15079 )
2018-08-06 14:43:00 +05:30
Shreya Shah
f0ef673498
Accounts receivable aging based on supplier due date ( #15080 )
...
* Accounts receivable aging based on supplier due date (#13801 )
* Remove spaces
2018-08-06 14:42:35 +05:30
Charles-Henri Decultot
614959d5f8
Correction of the get_price method for pricing rules ( #15082 )
...
* Addition of currency arg in get_price
* Change Price to Rate
2018-08-06 14:42:04 +05:30
Jignesh Greycube
ef961746c1
Spelling updated from Maxiumm to Maximum ( #15093 )
...
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:46 +05:30
rohitwaghchaure
57d07d6b8e
Merge pull request #15097 from rohitwaghchaure/incorrect_tax_amount_in_report
...
[Fix] Incorrect tax amount calculation because of same fieldname in the code
2018-08-06 14:32:44 +05:30
Jignesh Greycube
56027e3799
Spelling updated from Maxiumm to Maximum ( #15092 )
...
Spelling updated from Maxiumm to Maximum
2018-08-06 14:32:31 +05:30
Jignesh Greycube
cb66f6904f
Spelling updated from Maxiumm to Maximum ( #15091 )
2018-08-06 14:32:19 +05:30
Jignesh Greycube
b2d16aca74
Updated Spelling Maxiumm to Maximum ( #15090 )
2018-08-06 14:32:05 +05:30
rohitwaghchaure
fc682c86c6
[Fix] Inactive student validation issue while disabling the student group ( #15095 )
2018-08-06 14:29:46 +05:30
Rohit Waghchaure
15f52e7b71
[Fix] Incorrect tax amount calculation because of same fieldname in the code
2018-08-06 14:29:34 +05:30
KanchanChauhan
7fb8540b70
Get item defaults from item group ( #15089 )
2018-08-06 14:29:14 +05:30
Prateeksha Singh
a5f6e54b70
fix merge conflict
2018-08-06 13:56:53 +05:30
Prateeksha Singh
0c796229dc
prevent jinja exec in search title
2018-08-06 12:33:34 +05:30
Ameya Shenoy
26bfede116
Merge pull request #15078 from rohitwaghchaure/task_email_alert_not_working_from_project
...
Fix] Task's email alert on status change not working if we change the task status from the project form
2018-08-06 12:33:07 +05:30
Ranjith Kurungadam
752fd5a7a0
Tests SO for Serial No based delivery ( #15072 )
...
* fix remove SO from Serial No only when voucher SE
* SO tests - delivery by Serial No
2018-08-03 10:39:51 +05:30
Rohit Waghchaure
86217ca96c
[Fix] Task email alert on status change not working if we change the task status from the project form
2018-08-02 16:41:53 +05:30
Prateeksha Singh
106856b1ab
Show View count on items
2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651
[hub] Company (Seller) page
2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6
Messages: first cut
2018-08-01 19:19:53 +05:30
KanchanChauhan
e1f0be6da5
Delivery Date Change based on Delivery Date change in child table ( #15068 )
2018-08-01 18:11:58 +05:30
rohitwaghchaure
ae4ff5a403
[Fix] In words showing grand total instead of rounded total ( #15065 )
2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b
Get Advances and auto allocate ( #14970 )
2018-08-01 18:07:39 +05:30
Ranjith Kurungadam
d54991d624
Delivery by Serial No ( #15030 )
...
* fields added for delivery by Serial No
* SO - validate item for delivery by Serial No
* Stock Entry - add Serial No on production, validate reserved consumption
* add item by reservation to transaction if delivery by Serial No
* SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice
* Sales Order - validate Ensure Delivery by Serial No
* Serial No - remove SO ref on cancel
2018-08-01 17:47:07 +05:30
rohitwaghchaure
0452b405f4
[Fix] Not able to submit the expense claim ( #15057 )
2018-08-01 17:45:51 +05:30
Zarrar
7f8024c516
[Enhancement] Tax Withholding Category ( #15064 )
...
* add single, cumulative threshold, remove checkboxes
* remove tds child table from supplier & add tds link field
* add description field in tax withholding category
* add tax withholding data for indian setup, some fixes
* add a checkbox for tax withholding in purchase invoice
* remove supplier's child table for tds
* enable tds field if supplier has tds set inits master
* move rates data to child table - adding fiscal year support
* change bootstrap data according to child table config of tds
* show category name in list view
* loyalty program fixes
* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry
* add fiscal year dependency in company test
* minor loyalty program fix
* minor tier calculation fix
* minor handling duplicate exception
* toggle apply_tds according to supplier, code rectify
* minor fixes for loyalty program
* test case for single and cumulative threshold
* codacy fix
2018-08-01 17:45:05 +05:30
Nabin Hait
e45ec661ea
Additional fields in Item Price ( #14540 )
...
* [IMPROVEMENT] Item Price New Fields and Features
* [IMPROVEMENT] Item Price
- Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
- Stock Setting to accept Default Price List for Purchase or Sales Item
- Move Item Section in Item Price
* Fetch default Item Price based on Customer as null
* test fixes
* Code cleanup and fixed the issue of incorrect item price fetched against the customer
* Removed min qty from packing_increment calculation
* Removed auto_update_price_list_rate from the stock settings
* Revert sales_order.json changes
* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings
* Removed unnecessory file
* Fixed item price validation code
2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f
[hub] make get_items generic, add legacy.py
2018-08-01 17:32:13 +05:30
Prateeksha Singh
4d4791ab39
[chore] remove imports
2018-08-01 16:42:09 +05:30
Prateeksha Singh
b4e9ec33cb
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6
[restructure] make api.py
2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27
Prevent access of registered routes
2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed
Add generic action handler to subpage
2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383
Rename base_page to subpage
2018-08-01 15:57:13 +05:30
Faris Ansari
fbe9a46d51
Add Marketplace link to user dropdown in toolbar
2018-08-01 15:56:39 +05:30
Nabin Hait
7d9a1db97a
Update buying_settings.json
2018-08-01 15:26:40 +05:30
Faris Ansari
709a4a3f4e
Break marketplace.js into multiple files
2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e
Item Menu dropdown
2018-08-01 13:35:32 +05:30
Faris Ansari
a12076e0fd
Convert image to base64 before sending Item to sync
2018-07-31 23:06:00 +05:30
Faris Ansari
057839298c
fix get_category call
2018-07-31 19:06:11 +05:30
Nabin Hait
06029194cb
Patch fixes
2018-07-31 18:16:11 +05:30
Faris Ansari
300c07c3d9
Use hub.call for categories and favourites
2018-07-31 18:02:13 +05:30
Faris Ansari
1ff25279bf
Remove old hub styles
2018-07-31 17:59:03 +05:30
Faris Ansari
c1438c6169
refactor(hub connection): read only connection
...
- Seller activity in Activity Log
- Move hub_url to site_config
2018-07-31 17:51:45 +05:30
Nabin Hait
14ad9f70b5
Patch fixes
2018-07-31 17:33:14 +05:30
rohitwaghchaure
dc7004e083
[Fix] Patient Appointment Calendar not showing data properly ( #15052 )
2018-07-31 16:01:02 +05:30
Faris Ansari
b1d6f94cdf
Merge branch 'hub-redesign' into hub-redesign-contact-seller
2018-07-31 14:54:58 +05:30
Fisher Yu
13aec3aecb
Simplified Chinese Translation Update ( #14992 )
...
* delete the old version to be replaced by a new one
* New version of the translated simplified Chinese
2018-07-31 13:29:35 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
Nabin Hait
e9afbfde76
bumped to version 10.1.45
2018-07-31 12:48:22 +06:00
Faris Ansari
2ae80fd000
wip
2018-07-31 12:02:20 +05:30
Prateeksha Singh
425356c21c
[hub] remove test code
2018-07-31 10:45:53 +05:30
Nabin Hait
d53c2c031d
more payroll improvements and tests fixes
2018-07-30 20:17:15 +05:30
rohitwaghchaure
1fa5698798
[minor] Freeze the screen to avoid multiple time clicks ( #15047 )
2018-07-30 19:11:43 +05:30
rohitwaghchaure
086da451ca
Removed academic term from validation to check duplicate program enrollement ( #15046 )
2018-07-30 19:11:14 +05:30
Nabin Hait
d305a7a959
Made leave application importable
2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805
Payroll entry ux improvements and processing via background jobs
2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754
Fixed conflict
2018-07-30 16:37:07 +05:30
Prateeksha Singh
46df72d55d
[hub] test progress trigger
2018-07-30 13:24:01 +05:30
Shreya
21ce5e0609
Fix typo in label
2018-07-30 12:07:46 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs ( #15026 )
2018-07-30 10:58:49 +05:30
Zarrar
89c87fd6a6
[Minor] Patch fix ( #15041 )
...
* update modified date
* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Zarrar
6004b66797
[Minor] Job Offer UX improvise ( #15042 )
...
* job offer ux improv
* Update job_offer.js
2018-07-30 10:57:13 +05:30
Nabin Hait
cce7c5c245
Fixed salary structure employee patches
2018-07-30 10:52:51 +05:30
rohitwaghchaure
91d2ace9bb
Account no + account name in trial balance and financial statements reports ( #15038 )
2018-07-30 10:38:51 +05:30
Prateeksha Singh
efbd2ee3f5
[hub] Realtime Sync Progress
...
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
2018-07-30 09:17:14 +05:30
Prateeksha Singh
811cc3f78f
[hub] resolve merge conflicts
2018-07-29 18:05:07 +05:30
Prateeksha Singh
d27b27f88a
Hub Seller Profile and Timeline
...
- profile details fetched from server
- timeline updates on publishing items
2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e
[hub] Track Hub Sync on the Server
...
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
2018-07-29 14:40:52 +05:30
Faris Ansari
296848cb69
Publish Page
...
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5
Push review area to bottom
2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90
[hub] differentiate self-published items
2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10
[hub] Item page skeleton
2018-07-28 12:25:14 +05:30
Shreya Shah
91a9ee5179
Merge accounts functionality ( #14993 )
...
* Add dialog to merge accounts
* Add conditions and merge functionality
* Fix travis
* Add test case
* Add more test scenarios
2018-07-28 10:26:11 +05:30
Prateeksha Singh
dd8045759f
[hub] Published Products Page
2018-07-28 01:54:51 +05:30
Prateeksha Singh
83d60ffa1d
[hub] update hub item mapping
2018-07-28 00:07:25 +05:30
Prateeksha Singh
6e7fb71f1f
[hub][patch] reset publish_in_hub for all items
2018-07-27 22:02:47 +05:30
Faris Ansari
19d40cafba
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-07-27 21:51:31 +05:30
Faris Ansari
b7a63ab81e
Homepage
...
- show random items from each hub seller
- show items from country
- move add_review method on hub
2018-07-27 21:51:26 +05:30
Prateeksha Singh
f4fbf5215b
[hub][search] empty search and route fallback
2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b
SearchPage
2018-07-27 15:33:00 +05:30
Shreya Shah
749094dd52
Translatable UOMs ( #15024 )
2018-07-27 12:54:34 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Nabin Hait
584153a1b1
bumped to version 10.1.44
2018-07-27 13:05:42 +06:00
Shreya Shah
eed0a4e2df
Do not copy remarks field while duplicating ( #15023 )
2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd
f5cc1bd44c
Created Eway Bill Report ( #14926 )
...
* Created Eway Bill Report
* Field value changes
* Changed module from Stock to Regional
* Added comments and minor fix
* minor fix
2018-07-27 11:21:42 +05:30
Yaqin Shurrab
cc56ff5c37
Get the correct Summation of Closing Balances ( #14990 )
...
Fix total raw values for Closing Credit and Closing Debit
2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3
[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report ( #14994 )
2018-07-27 11:03:53 +05:30
mist-01
9821d51e31
Updated appointment availability to consider appointment duration in healthcare domain ( #15011 )
...
* Updated appointment availability to consider appointment duration in healthcare domain.
Fix bug - must clone moment before adding time to avoid updating original moment
* Add spaces after comments
2018-07-27 11:02:03 +05:30
Shreya Shah
1f4c263a63
[minor] Program Enrollment Tool ( #15013 )
...
* Make academic term field mandatory
* Add disabled field to Student Group
* Mandatory check in Education Settings for Academic Term
* Fix as per review
2018-07-27 10:59:14 +05:30
Shreya Shah
f71d18a35a
Increase margin ( #15016 )
2018-07-27 10:57:32 +05:30
Nabin Hait
d0a2b1619b
Optimization for marking student attendance
2018-07-27 10:51:55 +05:30
rohitwaghchaure
0fe6ced99d
[Fix] Valuation rate for serialized items ( #15017 )
2018-07-27 10:33:30 +05:30
Zarrar
4282729c72
delete version log while deleting company transaction ( #15021 )
2018-07-27 10:32:17 +05:30
Faris Ansari
24d5f17255
NotFound page for marketplace
2018-07-26 19:22:58 +05:30
Faris Ansari
9d1b7d493a
[patch] Delete old hub page
2018-07-26 18:54:58 +05:30
Faris Ansari
b5ce1976b8
Move marketplace code back to marketplace.js
2018-07-26 18:46:38 +05:30
Faris Ansari
521fe4d01d
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-07-26 18:39:34 +05:30
Faris Ansari
cae856cbda
Add marketplace back to hub_listing
2018-07-26 18:39:28 +05:30
Faris Ansari
f4884f8108
Marketplace
...
- Cache hub calls
- call_hub_method using FrappeClient connection
- Become a seller UX fixes
2018-07-26 18:37:01 +05:30
Faris Ansari
2ca5afa214
Move marketplace ui to marketplace.js
2018-07-26 18:35:04 +05:30
Prateeksha Singh
d885248309
[hub] remove sync_in _progress set
2018-07-26 18:21:33 +05:30
Prateeksha Singh
bcd7077342
[hub] remove sync_in_progress set
2018-07-26 18:20:58 +05:30
Prateeksha Singh
d450c0ac08
[hub][publish] in_progress/empty state
2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288
[hub] sync in progress
2018-07-26 16:25:22 +05:30
Ranjith Kurungadam
e555b5bcf2
Salary Slip tests for tax calc on benefits, additional salary ( #14985 )
...
* tests for tax calc on benefits, additional salary
* fix tests - remove created additional salary
2018-07-26 14:39:59 +05:30
Prateeksha Singh
d1224ca662
[hub][init] add profile page
2018-07-26 13:39:06 +05:30
Nabin Hait
8173d9f17a
Update additional_salary.json
2018-07-26 12:20:05 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections
...
Gocardless improvement and payment request correction
2018-07-26 11:41:43 +05:30
Faris Ansari
195436093d
Merge pull request #15004 from netchampfaris/hub-factory-syntax
...
Fix Syntax Error in hub_factory.js
2018-07-26 10:57:02 +05:30
Prateeksha Singh
f26177bdbc
[hub] setup publish items flow
2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e
[hub][publish] add search, fix multiple append
2018-07-26 08:36:33 +05:30
Prateeksha Singh
505f6f14e9
[hub][publish] select/deselect all items
2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a
[hub] registered vs read-only views
2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75
[hub][init] add publish items page
2018-07-25 20:02:12 +05:30
Nabin Hait
22fa99d040
Payroll Fixes
2018-07-25 18:21:39 +05:30
Nabin Hait
e50e0e4b30
Update repost_reserved_qty_for_production.py
2018-07-25 17:49:47 +05:30
Faris Ansari
6b07898ef0
semicolon
2018-07-25 17:07:26 +05:30
Faris Ansari
ed1190126e
Fix Syntax Error in hub_factory.js
2018-07-25 16:51:01 +05:30
Prateeksha Singh
bc8caefc19
[hub] add register as a seller page
2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504
Add review area
2018-07-25 00:49:11 +05:30
Zlash65
617532b2cb
Factory: class.extend -> es6 class
2018-07-24 14:20:10 +05:30
Nabin Hait
90bb5f43d5
Added more status in task web form
2018-07-24 11:33:05 +05:30
Ranjith Kurungadam
e51c175aca
Fix tests ( #14991 )
...
* minor improv in fetching account
* pass name field while creating tds doc
* create tds fixture after creating tds account
* Inpatient Record - Test - Fix
* fix batch query
2018-07-24 11:07:28 +05:30
Faris Ansari
ea2d1b0a19
New page: marketplace
...
- subpages: home, favourites, item, category
2018-07-23 18:44:46 +05:30
Nabin Hait
4037915b3c
Update setup.py
2018-07-23 18:05:55 +05:30
Nabin Hait
797497d22e
Fixed web form perm for tasks
2018-07-23 17:58:40 +05:30
Prateeksha Singh
ebb5662cb7
[revert] modules dropdown
2018-07-23 17:04:34 +05:30
Ameya Shenoy
218f2f841e
Merge pull request #14920 from codingCoffee/split_issue
...
Split a given Issue into 2
2018-07-23 16:09:05 +05:30
Ameya Shenoy
769054e00d
Split a given Issue into 2
...
Bugs encountered:
Once the dialog pops up, filling in the subject and pressing RETURN
doesn't work. It fails to read the subject. The primary button needs to
be clicked on. This is a generic issue, not related to this PR
Behaviour:
-[x] Add button on communication to split thread
-[x] Popup asks for new subject
-[x] Copy "Customer", "Sender" and other relevant fields to this issue
-[x] Move thread and replies to new issue
fixes #14600
2018-07-23 10:31:38 +00:00
Nabin Hait
0c0c345678
Added index on SLE based on batch_no, item and warehouse
2018-07-23 14:38:50 +05:30
yimesgen
20a80fee45
Update batch.py ( #14905 )
...
* Update batch.py
Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and".
* Update batch.py
2018-07-23 14:36:50 +05:30
Charles-Henri Decultot
6321a6b908
use standard dict method
2018-07-23 08:56:38 +00:00
Alchez
56bd5d8aaa
Fix finance book getter error when book doesn't exist ( #14987 )
2018-07-23 14:16:35 +05:30
Shreya Shah
cd717e422f
Modify renaming process of Account ( #14839 )
...
* Disable renaming for Account Master
* Update account name along with account number
* Fix as per suggestions
* Update account.js
* Fix typo
* Remove after_rename and before_rename methods
* Modify test case
* Modify field placement
* Remove unused method
2018-07-23 14:15:20 +05:30
Jamsheer
425fb4c5f4
[Feature][Enhance] Healthcare Inpatient ( #14940 )
...
* New DocTypes - Inpatient Record and Healthcare Service Unit Type
* Patient Appointment - Button - Get Prescribed Procedure - hide after save
* Patient Encounter - Schedule Inpatient button
* Inpatient - Healthcare Fields and references
Conflicts:
erpnext/healthcare/doctype/lab_test/lab_test.json
erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
erpnext/healthcare/doctype/vital_signs/vital_signs.json
* Healthcare Service Unit Type - Item Creation - UOM Fix
* Healthcare Service Unit - healthcare service unit type fix
* Inpatient Record - Admission Scheduled and Discharge Scheduled status
* Patient - rename field inpatient to inpatient_status
* Inpatient Record - rename field inpatient to status
* Refactor - Inpateint Occupancy
* Remove unused imports
* Healthcare service unit - patch - fix
* Healthcare IP - Codacy Fix
* Inpatient Record - Encounter and Practitioner References
* Patch - add healthcare service unit tree - enhance
* Healthcare Setup - Remove - Lab Test and Item creation
* Discharge note in Inpatient Record
* Codacy fix
* Inpatient Record - Update transfer service unit filter
* Inpatient Record - Test
2018-07-23 13:05:35 +05:30
rohitwaghchaure
6b862fcae5
[Fix] Rounded total is not working in the purchase receipt ( #14984 )
2018-07-23 13:02:07 +05:30
Saurabh
a638400e5d
Merge pull request #14707 from chdecultot/stripe_improvements_4
...
Stripe Subscriptions
2018-07-23 12:11:58 +05:30
Faris Ansari
f585197045
Cleanup homepage
2018-07-23 11:55:07 +05:30
darthguru
f2d4e33eb5
Fixed IGST ISSUE ( #14975 )
...
* Fixed IGST ISSUE
the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it
* Update gstr_2.py
2018-07-23 11:52:26 +05:30
Ranjith Kurungadam
1e90dafef8
fixes Benefit Application, Additional Salary ( #14971 )
...
* fix - add Additional Salary if multiple in one slip
* fix - Benefit Appication, None comparison
2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371
fix - assigned Salary Structure query ( #14965 )
2018-07-23 11:31:46 +05:30
Zarrar
a22e0d0c99
return empty if no stock ledger entry found ( #14968 )
2018-07-23 11:31:04 +05:30
Shreya Shah
83dfc0a2b1
Add Priority field in issue webform and portal ( #14967 )
2018-07-23 11:14:00 +05:30
Faris Ansari
789ad180ea
Merge pull request #14969 from netchampfaris/financial-statement-reports
...
Financial Reports fixes
2018-07-21 12:28:31 +05:30
Faris Ansari
b23d15fba9
Fix typo
2018-07-20 18:16:31 +05:30
Faris Ansari
5e096df5ae
columnDef => column
2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd
Return early if filters not initialized
2018-07-20 16:31:01 +05:30
Prateeksha Singh
abca510f9a
Update conf.js
2018-07-20 16:07:50 +05:30
Faris Ansari
5986d59b01
Financial Reports
...
- Update formatter for use with DataTable
- Fetch Currency from filters and fallback to company currency
2018-07-20 15:11:55 +05:30
Charles-Henri Decultot
39418b1532
CSS correction due to latest version of develop
2018-07-20 09:37:22 +00:00
KanchanChauhan
0c3d345a9f
[Minor] Moved mandatory Company field from More Information section to top ( #14950 )
2018-07-19 14:39:31 +05:30
Ranjith Kurungadam
dff2ba72d3
test TDS calculation ( #14919 )
...
* test TDS calculation
* fix failing test cases
* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
a8e24cba46
Merge patch and delete fields from subscription ( #14941 )
...
* Delete subscription records after migrating all records to auto-repeat
* delete old fields from subscription
2018-07-19 14:33:31 +05:30
Saurabh
139d165258
Merge pull request #14962 from saurabh6790/staging_version_1
...
Update staging version to support semantic versioning
2018-07-19 13:38:34 +05:30
Saurabh
dfdad651ea
Update staging version to support symentic versioning
2018-07-19 13:36:32 +05:30
Nabin Hait
9c5afc3620
website permission for support portal
2018-07-19 13:02:36 +05:30
Nabin Hait
47ce481394
Minor fix
2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property
2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707
[fix] format fiscal year docname to proper date before using 🤦 ( #14955 )
2018-07-18 18:03:27 +05:30
Saurabh
0bfbf8aa6f
[minor] remove conflicts
2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Saurabh
6c46b4edc4
bumped to version 10.1.43
2018-07-18 16:54:54 +06:00
Shreya Shah
8395a7ad6f
Modifications in last purchase rate button ( #14948 )
...
* Make last purchase rate button visible until submitted
* Move buttons
- Get last purchase rate and link to material request buttons moved to toolbar under Tools button
* Remove disable fetch last rate functionality
* Make last purchase rate field read_only
2018-07-18 12:27:27 +05:30
Shreya Shah
9baa3bef8b
[Portal] Display issues raised by all users of a customer ( #14947 )
...
* Display issues raised by all users of a customer
* Fixed as per review
2018-07-18 12:25:38 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57
Gocardless improvement and payment request correction
2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832
Defaults in Item Group ( #14874 )
...
* Add Defaults table in Item Group
* Fetch defaults from Item group if not found in Item
* Add patch
* Remove default fields from Item Group
* Set query for defaults
* Fix Codacy
* Modify test records
* Modify budget.py and sales_order.py
* Remove join from query
* Else condition to avoid error if no defaults found
* refrain from making item test records before item_group
* default cost center fetch correction
* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790
Naming series increase even if there is an exception while saving the invoice from the backend ( #14938 )
2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1
[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order ( #14899 )
...
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order
* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
af479c8192
set valid delivery date ( #14890 )
...
* set valid delivery date
* calculate delivery date based on diffrence in transation date and delivery date of ref doc
2018-07-17 16:49:32 +05:30
rohitwaghchaure
216f9373c9
Provision to select the cost center in the asset ( #14934 )
2018-07-17 16:47:51 +05:30
Shreya Shah
663b435919
Update modified time to fix patch ( #14931 )
2018-07-17 16:47:18 +05:30
Saurabh
e78a877202
patch fixes ( #14936 )
2018-07-17 16:38:11 +05:30
Nabin Hait
1e693fe6c9
Replaced spaces with tabs
2018-07-17 16:08:39 +05:30
Nabin Hait
26786bd35d
minor route fix for general ledger
2018-07-17 15:59:15 +05:30
rohitwaghchaure
5fe88ea93e
[Fix] Not able to update the current value of the prefixes which are defined in the autoname field ( #14918 )
2018-07-17 12:45:25 +05:30
Shreya Shah
fbeab5bf73
Show opening balance of leaves ( #14925 )
...
* Show opening balance of leaves
* Update employee_leave_balance.py
2018-07-17 11:59:51 +05:30
Ameya Shenoy
8ba1310915
[fix] Location test ( #14921 )
2018-07-17 11:57:49 +05:30
Zarrar
fc0a5833a5
run set query if doctype exist ( #14929 )
2018-07-17 11:57:06 +05:30
Suraj Shetty
a6f984366a
Fix typo
2018-07-16 18:39:01 +05:30
Zarrar
26c9b94cc6
[ Improv ] Loyalty Program more fixes and test case ( #14888 )
...
* remove console statements
* set account & cost center for redemption
* add test case for single/multi tier & is_return scenario
* reset tier when changing loyalty program
* make loyalty fields non copy type
* fix test case - delete si after every test to avoid interference
2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b
[Fix] Invoices not showing in the gross profit report against which sales return entry has created ( #14914 )
2018-07-16 18:11:19 +05:30
Suraj Shetty
6dfc165193
Add patch to skip user perm check for doctype ( #14873 )
...
* Add patch to skip user perm check for doctype
Skip user permission check for doctypes where
department link field was recently added
* Remove new doctype entries
* Skip doctypes if department field already exists (custom field)
* Add patch to set department value based on employee
* Update set_department_for_doctypes.py
* Update skip_user_permission_check_for_department.py
2018-07-16 18:10:16 +05:30
Jamsheer
f926911399
[Enhance][Fix] Healthcare - DocType and Fields renaming ( #14861 )
...
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot
* Role name change
* Rename DT - Physician Schedule to Practitioner Schedule
* Rename DT - Physician Service Unit Schedule
* Rename DT - Physician to Practitioner
* Lab Test Template - field disabled in standard filter
* Patient - customer creation fix
* Rename DT - Consultation - Encounter
* Patches.txt updated for rename doctypes and fields in Healthcare
* Patch - Rename doctypes and fields in Healthcare Domain
* Fix - Patch - rename_healthcare_doctype_and_fields
* Vital Signs - New Fields - Abdomen, Tongue and Reflexes
* Web Form - Patient - Personal Details
* Rename DocType Physician to Healthcare Practitioner
* Rename DocType Consultation to Patient Encounter
* Web Form - Personal Details - Fix
* Web Form - Personal Details - Codacy Fix
* Healthcare patch run for all domain
* Rename label Practitioner to Healthcare Practitioner
* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Ranjith Kurungadam
14e94f824e
fix - HRA India ( #14911 )
2018-07-16 16:12:46 +05:30
Shreya Shah
ffd2254944
Make item defaults non-collapsible ( #14908 )
2018-07-16 14:55:54 +05:30
Nabin Hait
656016b4e0
Reloaded location doctype in patch
2018-07-15 20:10:23 +05:30
rohitwaghchaure
526ab2ca30
[enhance] Allow transfer for manufacture in the BOM ( #14891 )
...
* [enhance] Allow transfer for maufacture in the BOM
* Added patch
* Fix codacy
* Fixed typo and added test cases
2018-07-15 20:04:41 +05:30
Zarrar
f579a2bd5d
[Minor] Fix Crop Cycle test record ( #14901 )
...
* fix crop cycle test record
* load crop cycle doc if not yet loaded
* create test records for location
* land unit -> location , update in patch for tree index
2018-07-15 20:04:24 +05:30
Charles-Henri Decultot
3fa3104dcc
Debug cleanup
2018-07-13 14:00:42 +00:00
Charles-Henri Decultot
c047bf88db
Rebase following Subscription corrections
2018-07-13 13:25:53 +00:00
Charles-Henri Decultot
7722b81c8e
Variable correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a0b7236f66
Corrections following Saurabh's comments
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
90669a03b3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
da8b11fd12
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
8b3e841fbf
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6
Review corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a
Codacy corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
bbed5d41ca
Remove remaining images
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
63e1dd5993
Remove doc
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3
Dev cleanup
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7
Remove payment plan reference
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631
Subscription integration
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9
Corrections to Subscriptions
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d
Stripe integration corrections
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a45ea63b5d
Codacy correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6c2ad66522
Codacy corrections
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a27673ecfe
Travis correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
79380c6a74
Travis correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
30da37fbb8
Move Stripe to ERPNext
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
e25d2ee66d
Update Stripe Documentation
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad
Payment Request modifications
2018-07-13 13:05:54 +00:00
Nabin Hait
03b597418a
Patch order fixed
2018-07-13 17:45:27 +05:30
Saurabh
3d825e5689
Subscription test and fixes ( #14875 )
...
* Add dashboard on subscriber screen
* Add Subscription and Subscription Plan to Account Dashboard
* Fetch customer name while creating subscriber
* [fix] add section for Subscription Period
* minor fixes
* optimization
2018-07-13 17:41:36 +05:30
rohitwaghchaure
3ffe89659a
[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice ( #14879 )
2018-07-13 17:40:48 +05:30
Nabin Hait
b2da082798
Fixed logic and tests
2018-07-13 17:02:08 +05:30
Doridel Cahanap
6f06cc27e6
Update Qty and Rate in PO and SO
2018-07-13 17:02:08 +05:30
Alchez
df1eae8981
Merge the Land Unit doctype with the Location doctype ( #14613 )
...
* Merge Land Unit with the Location doctype
* Fix patch
* [minor] modification to Location structure
- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
2018-07-13 12:50:04 +05:30
Ameya Shenoy
5c3b69476d
shift to self-hosted frankfurter api ( #14792 )
2018-07-13 12:46:07 +05:30
KanchanChauhan
09e680b4aa
[Fix] Should not get approvers for disabled Departments ( #14868 )
2018-07-13 12:26:56 +05:30
Nabin Hait
da17ceea73
patch fixes
2018-07-13 12:04:06 +05:30
Ameya Shenoy
a559b0de5a
Role modifications for Shareholder ( #14872 )
...
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
2018-07-13 11:34:19 +05:30
Saurabh
b6d5f1fea1
[fix] add staging version ( #14871 )
2018-07-13 11:33:31 +05:30
rohitwaghchaure
2d84945839
[Fix] Stock reconciliation wrong difference amount calculation ( #14893 )
2018-07-13 11:07:27 +05:30
Prateeksha Singh
0c51d40ad0
Merge pull request #14889 from pratu16x7/support-portal
...
[fix][minor] search help alignment
2018-07-12 16:06:49 +05:30
Prateeksha Singh
4cc7957a2a
[fix][minor] search help alignment
2018-07-12 16:05:57 +05:30
Shreya Shah
8dc4c945dc
Fix UX ( #14862 )
2018-07-11 14:36:49 +05:30
Zarrar
5899d98077
[ Major ] Loyalty Program Fixes ( #14863 )
...
* fix checking of customer_group & territory of customer in loyalty program
* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options
* removed disabled field, added from_date & to_date
* loyalty program section made collapsible, added redeem check in it
* setting loyalty program improvised, manual selection if multiple found
* get_query added, amount calculation updated
* args passed rectified for expiry_date
* get loyalty_points logic improv, redemption_details logic added
* improv based on from/to date and other rectification
* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03
[Minor] Employee Separation Fix ( #14867 )
...
* delete associated task & project forcefully
in Employee Seapration cancel trigger
* remove leftover print statement
* remove console statements
2018-07-11 14:34:55 +05:30
Saurabh
e8345f9ae0
add key to trace beta version ( #14859 )
2018-07-10 19:05:38 +05:30
rohitwaghchaure
cc9c7d5e2a
[Fix] GSTIN not displaying in the address print ( #14855 )
...
* [Fix] GSTIN not displaying in the address print
* Made changes in the patch and set Patch as False
* Update update_address_template_for_india.py
2018-07-10 15:41:42 +05:30
Alchez
9155e40bc7
[Fix] Set default CF in case none exist ( #14829 )
2018-07-09 16:57:42 +05:30
Frappe PR Bot
b48c769588
[Translation] Updated Translations ( #14849 )
2018-07-09 16:56:49 +05:30
rohitwaghchaure
07d0e9a2b2
Don't show disabled items in the stock balance report ( #14851 )
2018-07-09 16:56:41 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
Saurabh
07bb1811af
bumped to version 10.1.42
2018-07-09 16:23:50 +06:00
rohitwaghchaure
f07462860b
Merge pull request #14846 from shreyashah115/fix-digest
...
Filter out pending orders based on company
2018-07-09 14:48:13 +05:30
Ranjith Kurungadam
ea089d67ce
Employee Benefit Application - fix ( #14837 )
2018-07-09 14:01:18 +05:30
rohitwaghchaure
720b06495c
[Fix] Not able to save project ( #14848 )
2018-07-09 13:57:16 +05:30
Shreya
83ad646af4
Filter out pending orders based on company
2018-07-09 12:14:03 +05:30
rohitwaghchaure
8179bcbabd
[Fix] Code cleanup ( #14843 )
2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a
[Fix] Unable to print Salary Register ( #14844 )
2018-07-09 09:28:56 +05:30
rohitwaghchaure
6be8bea934
Provision to view return entries in Sales Person-wise Transaction Summary ( #14830 )
2018-07-08 19:25:13 +05:30
Shreya Shah
21d3352aa2
Merge pull request #14835 from shreyashah115/print-hide
...
Print hide loyalty program related fields
2018-07-06 18:36:47 +05:30
Zarrar
8111705f82
Merge pull request #14833 from Zlash65/min-ac-fix
...
[Minor] Change field name in Accounts utils
2018-07-06 18:24:55 +05:30
Shreya
9bcb959f81
Print hide loyalty program related fields
2018-07-06 18:17:02 +05:30
Shreya Shah
c8c17ff5cf
Return if Item Defaults exist ( #14834 )
2018-07-06 18:07:28 +05:30
Zlash65
1aeca1d349
change name that fetches numbered value from acc & cc
2018-07-06 17:15:33 +05:30
Zarrar
17705f932d
[ Minor ] Cost Center Number field added in field's dialog ( #14781 )
...
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function
* rename function's name appropriately
2018-07-06 14:44:44 +05:30
Alchez
8f2a0f3d79
[Fix] Incorrect assignment of Serial No in POS Invoice ( #14772 )
...
* Fix incorrect assignment of serial no in Sales Invoice through POS
* Add conversion factor to quantity check
2018-07-06 14:36:52 +05:30
Ranjith Kurungadam
6429ba9ed9
Payroll Entry - fix query, get assignment by end date ( #14827 )
2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
Saurabh
778e06d0ee
bumped to version 10.1.41
2018-07-06 13:32:57 +06:00
rohitwaghchaure
3f5e80ebe3
Allow bulk edit for the sales invoice item ( #14826 )
2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
rohitwaghchaure
ea943c6fe4
[Fix] Due date validate issue in the POS ( #14825 )
2018-07-06 12:28:58 +05:30
Ranjith Kurungadam
5d134e0465
TDS Calculate tax for whole period on deduct checkboxes ( #14824 )
...
* Tax Exemption Proof Submission - fields submission_date, exemption_amount
* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary
* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
2018-07-06 11:57:32 +05:30
rohitwaghchaure
839320dca5
[Fix] Original Invoice outstanding is not updating after making Debit Note ( #14821 )
2018-07-06 10:42:15 +05:30
Andrew McLeod
686284261d
Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. ( #14811 )
2018-07-06 10:41:37 +05:30
rohitwaghchaure
82a9fde921
Added compact print option for the material request ( #14799 )
2018-07-06 10:40:51 +05:30
bobzz-zone
58236ffc1e
Update budget_variance_report.py ( #14798 )
...
Make sure GL Entry only called once in each row
2018-07-06 10:39:00 +05:30
Saurabh
f403031449
[fix] Add Overdue status in Project Task
2018-07-05 19:38:59 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes ( #14787 )
...
* [cleanup] add dashboard to leave policy, employee form cleanup
* [test] first_name in employee
* [fix] tests
* [fix] tests
* [fix] tests
* [hr] add more dashboards
* [minor] fixes + ux
2018-07-05 15:19:28 +05:30
Rushabh Mehta
c1b430c8bd
[enhance] added priority to issue ( #14815 )
2018-07-05 11:38:02 +05:30
Zarrar
a3f6856d81
python 3 fix for sorted ( #14814 )
2018-07-05 10:37:39 +05:30
Nabin Hait
d4453aef68
Fixed permission issue
2018-07-04 16:38:10 +05:30
rohitwaghchaure
25f36489b3
Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online
...
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 16:26:48 +05:30
Rohit Waghchaure
5005e467a0
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 12:37:38 +05:30
Shreya Shah
430810f64c
Fix typo ( #14802 )
2018-07-04 10:17:36 +05:30
Aditya Hase
69711d2df2
Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) ( #14803 )
...
This should also fix #13909 as a side effect.
2018-07-04 10:17:17 +05:30
Zarrar
68a148e293
half_day enable/disable check ( #14795 )
2018-07-03 17:00:38 +05:30
rohitwaghchaure
205eae322b
[Fix] BOM replace timeout issue ( #14782 )
2018-07-03 15:06:38 +05:30
Nabin Hait
24ee7e5eb1
Patch fix
2018-07-03 13:15:47 +05:30
Nabin Hait
9911309631
Patch fixes
2018-07-03 13:06:49 +05:30
Nabin Hait
f4660d2479
Ignore calculating tds if amount/formula is mentioned in salary structure
2018-07-03 13:06:49 +05:30
Ameya Shenoy
935f4a474b
Prevent creation of more than 500 item variants ( #14790 )
2018-07-03 10:48:59 +05:30
Zarrar
c1225a84cc
fix css for coa dialog in setup wizard ( #14793 )
2018-07-03 10:35:31 +05:30
Britlog
4412f10918
Add missing fields in select, the same as in get_product_list_for_group ( #14789 )
2018-07-03 10:33:49 +05:30
Charles-Henri Decultot
6d97ab6f78
Make fields translatable ( #14786 )
2018-07-03 10:32:53 +05:30
Shreya Shah
aa62a62bb0
Add VAT related fields after printing settings fields ( #14773 )
2018-07-03 10:28:20 +05:30
Vishal Dhayagude
0e027a14a7
[minor] Link to Employee Separation template and Onbording template added in HR Module Page ( #14748 )
...
* [minor] Link to Employee Separation template and Onbording template added in HR Module Page
* [minor] Employee templated added in Employee Life Cycle Section
2018-07-03 10:20:02 +05:30
Shridhar Patil
4987c4ef53
on delete contact update issue ( #14770 )
...
* on delete contact update isuue
remove contact from issue if the deleted contact exists
* moved issue update function to issue.py
* Update formatting and comment
2018-07-03 10:10:04 +05:30
Suraj Shetty
27067b34e1
Rename ( #14771 )
...
- Daily Work Summary Settings to Daily Work Summary Group
in hr.py
2018-07-03 10:08:45 +05:30
Shreya Shah
93d60869ed
Fix patch ( #14769 )
...
Income account instead of expense account
2018-07-03 10:07:32 +05:30
Ranjith Kurungadam
273e8e59ca
fix Salary Component ( #14783 )
2018-07-03 10:05:01 +05:30
Pawan Mehta
e734b7c17b
Add filters to show Draft salary slips in salary register ( #14780 )
...
* [fix] #14778
* replace if-elif block with inline block
2018-07-03 10:01:19 +05:30
Frappe PR Bot
1baa811a40
[Translation] Updated Translations ( #14776 )
2018-07-03 09:59:57 +05:30
rohitwaghchaure
afe764264d
[Fix] Employee advance issues ( #14750 )
2018-07-01 16:48:00 +05:30
Charles-Henri Decultot
f02bef78f0
FEC report corrections ( #14741 )
...
* Report corrections to match government requirements
* Untranslatable headers
* Remove unused onchange logic
2018-07-01 16:46:48 +05:30
Zarrar
dfe897b888
[ Fix ] UOM Conversion fix ( #14768 )
...
* increase precision for conversion value
* inverse the conversion data
* update uom data
* rectify conversion logic according to inversion of values
* rectify test case for uom conversion
* patch improv to correct conversion data
2018-07-01 16:45:53 +05:30
Ranjith Kurungadam
4dc5721ba5
fix - Benefit Application query ( #14767 )
2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
Nabin Hait
e3daaa63f0
Payroll fixes ( #14758 )
...
* Ignore calculating tds if amount/formula is mentioned in salary structure
* [fix] Paid amount in Journal Entry from Payroll Entry
* fix codacy
2018-07-01 16:43:34 +05:30
Ranjith Kurungadam
b1a756cc9f
HRA Indian regional - field basic in company, calc changes ( #14757 )
2018-07-01 16:42:38 +05:30
rohitwaghchaure
1501a6e58e
[Fix] Data missing issue in stock ledger report ( #14755 )
2018-07-01 16:42:00 +05:30
rohitwaghchaure
01fe4a3726
[Fix] Consider the cancelled purchase receipt in backflush raw materials ( #14753 )
2018-07-01 16:41:39 +05:30
Ranjith
69b03a3b53
fix typo
2018-06-29 20:14:20 +05:30
rohitwaghchaure
c5183b7c2a
Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties
...
[Fix] Patch
2018-06-29 19:02:38 +05:30
Rohit Waghchaure
4178030c99
[Fix] Patch
2018-06-29 17:54:25 +05:30
Ranjith Kurungadam
fd7ef2e15c
Salary Component - field display, value dependency ( #14747 )
2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5
Payroll Entry - make only one JE, separate JE for Flexi ( #14752 )
2018-06-29 16:48:49 +05:30
Nabin Hait
b192a4af77
reload doc in patch
2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540
Set user permissions for new departments based on company
2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d
Set salary component properties in existing components and salary structures
2018-06-29 14:36:45 +05:30
Manas Solanki
ee32a78e9f
Update bom_stock_calculated.py
2018-06-29 13:33:32 +05:30
Nabin Hait
104f62090d
Add filters for cost center in Budget Variance report
2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026
Add configurable frequency in Selling Settings for update of project … ( #14670 )
...
* Add configurable frequency in Selling Settings for update of project and company
* remove redundant code
* remove redundant code, only trigger calculation if order/invoice is present
* removed dangling commas as per common convention in hooks
* fix:handling multiple documents
* Update selling_settings.json
2018-06-28 23:43:23 +05:30
Nabin Hait
d0c6184e24
minor patch fixes
2018-06-28 23:42:55 +05:30
rohitwaghchaure
191876f51b
[Fix] Bank Account mandatory ( #14734 )
2018-06-28 23:28:58 +05:30
Ranjith Kurungadam
a10f118ddd
Payroll Entry - Validate Attendance ( #14738 )
2018-06-28 23:28:07 +05:30
Nabin Hait
7324815fdb
map payment terms template from SO to SI
2018-06-28 23:12:02 +05:30
Charles-Henri Decultot
52fb43fc4f
Add no copy to payment terms template ( #14725 )
2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
97fa94e77d
Journal and Entry number correction ( #14720 )
2018-06-28 23:05:58 +05:30
Cadmandata
d673afccf2
Updated comment in make_stock_entry() function ( #14726 )
...
Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.
2018-06-28 23:05:32 +05:30
Ranjith Kurungadam
f6e654eccc
Payroll Entry - fix deduct taxes ( #14730 )
2018-06-28 23:04:51 +05:30
rohitwaghchaure
cae945e743
Added validation and fixes UX for asset ( #14727 )
2018-06-28 23:04:25 +05:30
Ranjith Kurungadam
6ceed038e6
Fix benefits ( #14735 )
...
* Employee Benefit Application - fix typo
* Employee Benefits - fix field renamed
2018-06-28 23:02:58 +05:30
Manas Solanki
3ff7f79cc7
Merge pull request #14740 from manassolanki/fix-20
...
[minor] fix for the args in the frm.call
2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387
[minor] fix for the args in the frm.call
2018-06-28 20:44:53 +05:30
Rohit Waghchaure
ed71c36748
[Fix] Not able to save subcontracted purchase receipt
2018-06-28 18:36:35 +05:30
Ranjith Kurungadam
b66bde32f8
Payroll Entry - fix only one employee fetched ( #14718 )
2018-06-28 14:40:29 +05:30
Charles-Henri Decultot
8b22310d66
Allow auto repeat update ( #14706 )
...
* Allow auto repeat update
* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1
[ Enhance ] Setup Wizard - Chart of Accounts ( #14698 )
...
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart
* read chart from file and make a tree render-able dict of it
* tree method to return node data for coa setup wizard
2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5
Fix error message ( #14716 )
2018-06-28 14:14:28 +05:30
Pawan Mehta
c7897e491d
[fix] #14714 ( #14715 )
2018-06-28 14:13:56 +05:30
KanchanChauhan
168e66b107
Blanket Order translation fix for DE ( #14711 )
2018-06-28 14:13:24 +05:30
rohitwaghchaure
e27b85de4f
Added test cases for Overproduction against Work Order / Sales Order ( #14704 )
2018-06-28 12:48:28 +05:30
rohitwaghchaure
4c23be1821
Added test cases for subcontract ( #14702 )
2018-06-28 11:18:37 +05:30
Prateeksha Singh
5d227c9028
Revert "[hub] add link in modules"
2018-06-28 09:59:46 +05:30
Prateeksha Singh
84d358bd0a
Merge pull request #14708 from pratu16x7/hub-fixes
...
[hub] add link in modules
2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7
[hub] add link in modules
2018-06-28 03:17:39 +05:30
Manas Solanki
4933e6bfeb
Update test_finance_book.py ( #14703 )
2018-06-27 17:30:09 +05:30
Ranjith Kurungadam
23e235395e
Salary Slip - remove check query limited to one ( #14699 )
2018-06-27 17:29:40 +05:30
Shreya Shah
f2f54e741b
Merge pull request #14701 from shreyashah115/testing-1
...
[minor] Blanket order
2018-06-27 16:00:02 +05:30
Shreya
32b57da335
Make supplier_name and customer_name fields read only
2018-06-27 15:20:33 +05:30
Shreya
18bed504dc
Set target qty 0
...
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
2018-06-27 15:14:43 +05:30
Manas Solanki
b912374b96
[test] check the finance book via the journal entry
2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3
[Fix] Wrong rate calculation in Itemwise sales register report for multi uom ( #14690 )
2018-06-27 11:22:03 +05:30
Ranjith Kurungadam
53cdbe960e
Salary Slip - fix query ( #14693 )
2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c
[Fix] - Get payroll period days ( #14686 )
...
* Fix - get_payroll_period_days
* Fix - get_payroll_period_days
2018-06-27 11:13:20 +05:30
Deepak kumar
55cf6c5f7e
Membership ( #14688 )
...
* Correct the label and field name
* Update membership.json
2018-06-27 09:17:33 +05:30
rohitwaghchaure
f3cf15fa0d
[Fix] While saving project getting timeout error ( #14672 )
2018-06-26 17:06:00 +05:30
Nabin Hait
e2a8120ef8
ignore user permissions for some fields
2018-06-26 15:27:34 +05:30
Prateeksha Singh
34aeefc0a1
[fix] yet another python attribute fetch
2018-06-26 12:18:29 +05:30
Manas Solanki
7707cee6b7
Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo
...
Allow only submitted Blanket Order in PO/SO
2018-06-26 11:46:23 +05:30
Manas Solanki
860e169081
Update sales_order.js
2018-06-26 11:45:04 +05:30
Manas Solanki
0ebd0f0d62
Update purchase_order.js
2018-06-26 11:44:29 +05:30
Kanchan Chauhan
bddebb52d6
Allow only submitted Blanket Order in PO/SO
2018-06-26 09:31:27 +05:30
Rushabh Mehta
096b943b0c
[minor] fixes to moment.defaultDateFormat and daily work summary eplies
2018-06-25 22:38:20 +05:30
Frappe PR Bot
5c13cb3221
[Translation] Updated Translations ( #14669 )
2018-06-25 15:08:15 +05:30
mnaim-cloude8
56e4346ead
To fixed if if no schedule and disposal is NOT within the period. ( #14637 )
...
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.
* Update asset_depreciations_and_balances.py
2018-06-25 15:05:26 +05:30
Jamsheer
4f8deb92cc
[Fix] - Leave Perid - Grant Allocations ( #14668 )
...
* Leave Perid - Grant Allocations - Fix
* Codacy - string statement has no effect
2018-06-25 14:49:54 +05:30
Shreya Shah
d8031d1a53
Clear child table before appending ( #14648 )
2018-06-25 10:34:55 +05:30
rohitwaghchaure
34c187706d
[Enhance] Added Budget exception approver role in company ( #14645 )
...
* [Enhance] Added Budget exception approver role in company
* Added test cases for budget
2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77
Salary Structure Assignment - remove to_date ( #14642 )
...
* Salary Structure Assignment - remove to_date
* fix Salary Assignment - remove to_date
* Salary Slip - fix codacy remove sting based query, add end_date to condition
2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50
[Enhance] Refactor ( #14647 )
...
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view
* Salary Component - additional component and flexi not comes in same component
* Salary Structure - refactor validation messages
2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0
[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases ( #14649 )
...
* [Fix] POS Closing Voucher, on save collected amount becomes zero
* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Jamsheer
648728f330
Fix - depends on lwp - employee benefit ( #14644 )
2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389
Employee benefit - Last payroll period benefit ( #14634 )
...
* Employee benefit - Last payroll period benefit
* Method name refactor
2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc
Added adational filters to Tax Rule doctype ( #14639 )
2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b
Fetch company on employee selection ( #14633 )
2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20
Added test cases for asset accounting, asset value adjustment ( #14572 )
...
* Added test cases for asset accounting, asset value adjustment
* Accounting entry for the asset created manually
* Added asset movement test cases and validation
* Added validation to make asset from purchase receupt, invoice only
2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39
Fix tax calculation ( #14635 )
...
* Salary Detail - field is_additional_component
* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax
* fix indentation
2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop
2018-06-22 05:10:29 +00:00
Ameya Shenoy
774f676a25
bumped to version 10.1.40
2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa
Merge pull request #14629 from pratu16x7/css-fixes
...
[portal] fix item-preview column #13077
2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7
[portal] fix item-preview column #13077
2018-06-21 22:42:03 +05:30
Nabin Hait
3ebc15cc8f
test fixes
2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea
Test case fixes
2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc
expense_claim related fix in payment entry
...
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1
Don't allow to sale asset item from POS ( #14623 )
2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0
[Tests] Employee Onboarding & Separation ( #14606 )
...
* Set query on department
* Add test for Employee Onboarding
* Add fetch for Employee Separation fields
* Add test for Employee Separation
* Fix Staffing Plan test case
2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4
improve performance of stock_value retrieval using tabBin instead of … ( #14584 )
...
* improve performance of stock_value retrieval using tabBin instead of stock ledger
* rename fn
* rename fn
* Update warehouse.py
2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62
[Fix] Subscription method ( #14604 )
...
* [Fix] Subscription method path
* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125
[Fix] Deferred account must be liability account ( #14612 )
2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard
...
[Enhance] Employee Onboarding & Separation
2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68
Compensatory Leave Request ( #14611 )
...
* Compensatory Leave Request - Validate Holidays and Attendance
* Compensatory Leave Request - Cancel
* Half Day in Compensatory Leave Request
* Leave allocation on Compensatory Leave Request - Fix
* Unused import
2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b
Test case fixes
2018-06-21 11:36:13 +05:30
umaepoch
0484547150
BOM Stock Calculation Report ( #14561 )
...
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8
Job Applicant Source ( #14543 )
...
* New doctype - Job Applicant Source
* Source and source name field in job applicant
* Updated install_fixtures with default options
* Update install_fixtures.py
* Fixes codacy
2018-06-21 10:47:54 +05:30
Frappe PR Bot
748c0240db
[Translation] Updated Translations ( #14615 )
2018-06-21 10:34:28 +05:30
Charles-Henri Decultot
fc2292f08c
Email alert renamed to Notification ( #14618 )
2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555
changed fieldname of inventory section break in Item
2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8
Update status if tasks have been completed ( #14601 )
2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2
Test leave management ( #14587 )
...
* test max allowed days in leave policy
* test the leave period
* test leave encashment
2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352
Daily work summary reply report ( #14583 )
...
* Add daily work summary reply report
* Show user name instead of email
* Remove print statement
* Change field datatype
* ReRun Travis
2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df
minor fix
2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b
add missing brand filter to stock balance report ( #14597 )
...
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273
Fix codacy
2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8
Update and set status on the basis of project completion
2018-06-20 15:55:27 +05:30
Shreya
a5afd96019
Employee Onboarding and Separation lists
2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
Saurabh
98b7bb5679
bumped to version 10.1.39
2018-06-20 15:51:40 +06:00
Zarrar
99017b173d
naming for asset maintenance task should be task name ( #14607 )
2018-06-20 14:53:13 +05:30
Ranjith Kurungadam
c1030a3958
fix - Employee Transfer, Promotion ( #14603 )
2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d
Pro-rata component consistency for monthly Salary slip ( #14595 )
...
* Pro-rata component consistency for monthly Salary slip
* Resolve merge conflict
2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0
Update tax calculation ( #14564 )
...
* Tax Slab remove to_amt mandatory, condition data type Code
* Salary Slip - consider condition in tax slab
* Payroll Period - help text for tax slab condition
2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d
HRA fix ( #14589 )
...
* hra - fix var ref before assignment
* Tax Exemption Category - remove deduction component
2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71
Employee Benefit ( #14571 )
...
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim
* Employee Benefit Application - Validate previous benefit claim
* Employee Benefit Claim - Code refactor
* Salary Slip - additional salary - fix
2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183
[Fix] Additional Salary Component and tax calculation ( #14581 )
...
* Additional salary not include in tax calculation
* Additional salary get doubled in salary slip via Payroll Entry - Fix
* Salary Component - if is_additional_component hide flexi
2018-06-20 10:52:20 +05:30
Shreya Shah
222c550c29
Parse left out time ( #14586 )
2018-06-20 10:51:32 +05:30
Shreya Shah
0cb0c0b642
[Tests] Staffing Plan ( #14585 )
...
* Add test case for Staffing Plan
* Fix codacy
2018-06-20 10:50:54 +05:30
Zarrar
42f2d1a7a8
fix incase no customer fetched ( #14596 )
2018-06-20 10:50:11 +05:30
Ranjith Kurungadam
f972e7b259
Staffing Plan - remove department filter, query by dates ( #14590 )
2018-06-20 10:48:40 +05:30
rohitwaghchaure
fd5ac45775
[Fix] Not able to make invoice in the subscription ( #14594 )
2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c
Allowed paid amount against debit/credit note
2018-06-19 12:07:02 +05:30
Shreya Shah
b0575265fb
Test case for Attendance Request ( #14566 )
...
* Add test case for Attendance Request
* Add a message if attendance not submitted
* Add test for cancelled document
2018-06-19 10:47:40 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Zarrar
ba1cdc6c57
fix opening invoice related authorization control - item=None ( #14567 )
2018-06-19 10:45:47 +05:30
Shreya Shah
cbff30f718
[Tests] Shift Planning ( #14570 )
...
* Cancel shift assignment on cancellation of shift request
* [minor] Fix shift type test
* Modify test for shift request
* Add test case for shift assignment
* Fix syntax
* Fix codacy
2018-06-19 10:45:33 +05:30
asbasawaraj
b0fafa9774
Additional fields in Certified Consultant DocType ( #14573 )
2018-06-19 10:43:55 +05:30
Shreya Shah
77de8dc102
Change Restaurant icon type to module ( #14578 )
2018-06-19 10:43:08 +05:30
Nabin Hait
875c941f3d
fixes in setting itemised tax breakup
2018-06-18 17:41:27 +05:30
Nabin Hait
8eeb5694ba
Fixed qty in item-wise sales history report
2018-06-18 17:41:27 +05:30
Nabin Hait
0bef91c241
minor fix in item type validation
2018-06-18 17:41:27 +05:30
Nabin Hait
ae02209b6a
Removed autoname of child table
2018-06-18 17:41:27 +05:30
Shreya Shah
5c3929c5ea
Fix positioning of fields ( #14562 )
2018-06-18 15:49:59 +05:30
Zarrar
e0adb6bbd6
cost_center overridden by company's default fix in SI ( #14560 )
2018-06-18 15:49:12 +05:30
Shreya Shah
1ac5585151
Bug - Add batch while creating serial nos ( #14559 )
2018-06-18 15:44:10 +05:30
Ranjith Kurungadam
5f7c7bfc78
remove patch to add hra fields ( #14552 )
2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
6cca03195f
fix- Salary Structure filter ( #14558 )
2018-06-18 15:42:38 +05:30
Ranjith Kurungadam
28f49a5a8e
fix - link validation error ( #14547 )
2018-06-18 10:40:23 +05:30
Zarrar
80ff296e97
data not filled in acc. receivable report for some field fix ( #14546 )
2018-06-17 11:21:10 +05:30
Manas Solanki
efa191c72e
[minor fix] change the unicode/str to the datetime obejct ( #14534 )
2018-06-15 18:04:12 +05:30
rohitwaghchaure
83a2612a18
[Fix] Consolidated Financial Statement report ( #14537 )
2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa
Added expense account, cost center in the purchase order and material request item doctype and fix the code ( #14535 )
2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190
[minor] Fixes for Exchange rate revaluation doctype ( #14533 )
...
* Add set query for account and party_type
* Fix asset category error
2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4
Add test case for Inter company Journal Entry ( #14531 )
2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
Ameya Shenoy
ed77429496
bumped to version 10.1.38
2018-06-15 09:29:56 +00:00
Nabin Hait
380a74732c
salary structure related test case fixes
2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511
create user permissions on save of employee
2018-06-15 13:16:44 +05:30
rohitwaghchaure
e647c1f3cb
Renamed asset adjustment to asset value adjustment ( #14532 )
2018-06-15 13:06:28 +05:30
Nabin Hait
fcaeea70d2
Update employee.py
2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d
Test case fixes
2018-06-15 11:59:58 +05:30
asbasawaraj
4c263480c9
Certfication Application Doctype and webform,Certfied Consultant DocType ( #14528 )
2018-06-15 10:04:19 +05:30
Ranjith Kurungadam
0e5c8283fa
Salary Slip - update period factor for tax calc ( #14527 )
2018-06-15 10:03:57 +05:30
Nabin Hait
2737b08f0f
blanket order related fixes
2018-06-14 18:07:34 +05:30
Shreya Shah
0b9b8d6826
Remove unused code ( #14526 )
2018-06-14 17:57:39 +05:30
Shreya Shah
02575d1f2c
Merge pull request #14205 from Alchez/frappe-contract
...
[Feature] Managing Contracts in ERPNext
2018-06-14 17:57:02 +05:30
Ranjith Kurungadam
a8e047afc8
HRA tax exemption Indian regional ( #14520 )
...
* remove HRA fields fom declaration, proof submission
* HRA fields, methods India regional
* Company - remove Payroll Settings
* HRA India regional, override methods
* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Manas Solanki
c7afbea708
Update bom.py ( #14524 )
2018-06-14 17:30:26 +05:30
Nabin Hait
d1f40ad0b6
minor fix
2018-06-14 17:09:55 +05:30
Shreya
cdd3982b44
[minor] Fix
2018-06-14 16:43:47 +05:30
Shreya
f333536446
Remove test_records.json and modify test
2018-06-14 16:43:07 +05:30
Nabin Hait
44341c1637
removed blanket order docs
2018-06-14 15:58:41 +05:30
Nabin Hait
b2d3c0f040
Update ordered qty in blanket order
2018-06-14 15:56:29 +05:30
Manas Solanki
9a31dd7062
test + documentation
2018-06-14 15:56:29 +05:30
Manas Solanki
2df1b31707
[minor] minor fixes along with the codacy
2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137
[feature] Blanket Order
...
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724
init the blanket order
2018-06-14 15:55:37 +05:30
Rushabh Mehta
1198d94904
[rename] Email Alert -> Notification
2018-06-14 13:18:21 +05:30
Shreya Shah
c3d1353ab5
Merge pull request #14518 from shreyashah115/patch-fix
...
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0
Check if table exists else return
2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
...
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
6ffdf94003
[Fixes] Defaults and User-Permission based fixes in treeview ( #14501 )
...
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data
* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application
...
[Enhancement] toggle required fields on select of repayment option in loan application
2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab
[Fix] HR Fixes ( #14511 )
...
* Payroll Entry - fix in db query
* Salary Structure Assignment - Company read_only = 1
* Fixes in hr util and benefit claim
* Employee Benefit Application - Late application - fix
2018-06-14 11:55:17 +05:30
Zarrar
17089eeac3
[Minor] Fetching and appending items in Stock Reconciliation fix ( #14509 )
...
* minor fix in get_list of items in stock reconciliation
* reload doc fails because of backdated modified date
* item and item defaults should load prior to shopify refactor
* attribute value should't be none or empty, could be zero though
* Update item.py
2018-06-14 11:54:18 +05:30
Shreya Shah
dd8fba6783
Do not check for batch on cancellation ( #14506 )
2018-06-14 11:49:45 +05:30
Saurabh
8e74df09a4
[fix] On deletion of salary slip decrease the series count ( #14508 )
2018-06-14 11:47:21 +05:30
Rushabh Mehta
0d19744b17
[fix] for notification
2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES
62805e2101
Fix unicode literal issue that prevents payment entries to be created ( #14515 )
2018-06-14 09:14:07 +05:30
rohitwaghchaure
fb997d6539
[Fix] Woocommerce test cases ( #14513 )
2018-06-14 09:13:39 +05:30
Prateeksha Singh
0738483343
[docs] remove docs folder 💥 , update docs app to foundation ( #14516 )
2018-06-14 09:11:05 +05:30
Manas Solanki
687c6bb002
Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption
...
[Fix] Travis for the test case test_material_consumption
2018-06-13 18:41:12 +05:30
Rohit Waghchaure
80d4477d1e
[Fix] Travis for test_material_consumption
2018-06-13 18:37:03 +05:30
Shreya Shah
a2056a39bd
Fix patch ( #14503 )
...
* Modify patch to move leave approvers from Employee master to Department master
* Rename child table names
- Rename leave approver to leave approvers
- Rename expense approver to expense approvers
* Import cstr
* Fix a condition
2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py
2018-06-13 16:47:41 +05:30
Shreya Shah
3d73a6f7f2
Fetch details from Journal Entry in Accounts Payable report ( #14495 )
...
* Fetch bill_no, bill_date from Journal Entry
* Fix as per suggestion
* Fetch details only if bill_no exists
2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd
46c8ccc6a8
Fix conflict for taxable value having same item in GSTR-1 Report ( #14492 )
...
* Update gstr_1.py
Merge conflict for taxable value having same item
* Update gstr_1.py
* Minor Fix
* Update gstr_1.py
2018-06-13 15:34:17 +05:30
Jamsheer
30f37b2eb1
Payroll Entry - Separate JE for flexi salary component ( #14502 )
...
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry
* Journal Entry - validate cheque info on submit
* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5
Employee benefit application depends on lwp ( #14494 )
...
* Employee benefit - pro-rata amount - depends on lwp and working days
* HR Util - get holidays for employee
* Employee Benefit Application - calculate remainig on max benefit
* Employee benefit - late application - depends on lwp
* missing semicolon
2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84
[Fix] Travis for employee_tax_exemption_declaration ( #14500 )
2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f
Remove docstatus=1 to show pending leaves as well ( #14498 )
2018-06-13 15:11:43 +05:30
Manas Solanki
9385cd5203
Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases
...
[Fix] Travis for stock entry
2018-06-13 14:06:20 +05:30
Rohit Waghchaure
0eef3f665d
[Fix] Travis for stock entry
2018-06-13 13:06:25 +05:30
Manas Solanki
b12f0d90af
fix the timesheet
2018-06-13 12:30:02 +05:30
Jamsheer
f6d7b5d0c8
Salary slip - additional salary - deductions ( #14476 )
2018-06-13 11:36:43 +05:30
Tom Price
32c984cd3c
Fix fields being hidden by default. ( #14490 )
...
Modify the title property to be sensible for general usage, unique and translatable.
Add allow_in_quick_entry properties appropriately.
2018-06-13 11:14:44 +05:30
Manas Solanki
176e7c5ce2
fix the test case for the payroll ( #14480 )
...
* fix the test case for the payroll
* fix the shopify and stock entry
* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Prateeksha Singh
d1fffb6ba1
Merge pull request #14484 from pratu16x7/help-portal
...
[help-portal] don't show issues to guest
2018-06-12 17:40:36 +05:30
Prateeksha Singh
8d58429b69
[help-portal] don't show issues to guest
2018-06-12 17:39:12 +05:30
Nabin Hait
76c51b3068
minor ux fix
2018-06-12 16:29:10 +05:30
deepak-mnt
b95f60c6f3
minor changes
2018-06-12 16:04:49 +05:30
Rohit Waghchaure
b6381c66d8
[Fix] Purchase receipt test cases
2018-06-12 13:54:40 +05:30
rohitwaghchaure
a6b346f827
Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes
...
[Fix] Test cases for asset
2018-06-12 12:21:11 +05:30
Rohit Waghchaure
f270567c45
[Fix] Test cases for asset
2018-06-12 12:20:52 +05:30
Ranjith Kurungadam
138e6abaff
Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof ( #14428 )
2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494
Check if user permission for employee exists ( #14474 )
...
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d
Employee benefit - Late employee benefit application ( #14465 )
...
* HR Utils - get salary slip total benefit given for a payroll period
* Late employee benefit application
* Additional Salary - code refactor - get_amount
* new line in salary detail json
* Employee benefit late application - validation refactor
* Codacy fix
2018-06-12 11:30:59 +05:30
rohitwaghchaure
2354c1eba3
Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no
...
Code cleanup and fixes for the asset
2018-06-12 11:19:01 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py
2018-06-12 11:18:01 +05:30
Rohit Waghchaure
ec2a2ac47e
[Fix] patch
2018-06-12 01:16:28 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1
...
fix the salary slip test cases
2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d
fix the salary slip test cases
2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158
Code cleanup and fixes for the asset
2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0
typo fixed
2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav
...
Travis again
2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c
Patch for total quantity ( #14458 )
...
* Add path to patches.txt
* Modify patch
2018-06-11 17:32:17 +05:30
Jamsheer
0ca76323af
Clinical Procedure Template - get_item_details - fix ( #14449 )
2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255
Merge pull request #14455 from frappe/kennethsequeira-patch-3
...
Fix minor div issue in Accounts index page
2018-06-11 16:33:51 +05:30
rohitwaghchaure
7cd59a2089
Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush
...
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 15:44:37 +05:30
Shreya
9680dc476f
Remove commented code
2018-06-11 15:40:09 +05:30
deepak-mnt
bb6753f206
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type
2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775
patch for sales partner type field
2018-06-11 14:53:25 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py
2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af
Fix minor div issue in Accounts
2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 14:11:00 +05:30
Rohit Waghchaure
cdec44ee81
Removed company data from test item records
2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75
[tax-breakup] store itemized tax by item_name when can
2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14
toggle required fields on select of repayment option in loan application
2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016
[Enhance] Standalone debit/credit note ( #14269 )
...
* [Enhance] Standalone debit/credit note
* Test cases
* Test cases and documentation
* Removed credit, debit note links from accounts module
2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663
Merge pull request #14363 from frappe/manassolanki-patch-10
...
PR to check the current state of Travis
2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c
Employee Transfer allow same company, update internal work history ( #14430 )
2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5
minor fix in account and account utils ( #14432 )
2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b
Fix Employee tax declaration test case
2018-06-11 10:31:40 +05:30
Shreya
664f30a018
Fix asset maintenance json
2018-06-11 10:31:40 +05:30
Shreya
294238abfd
Fix shopify test case
2018-06-11 10:31:39 +05:30
Shreya
956277b121
Fix tests
2018-06-11 10:31:39 +05:30
Zarrar
65994210f6
fix patch to add email template in hr settings ( #14427 )
2018-06-08 16:57:06 +05:30
Zarrar
44175904c6
Tree fix ( #14425 )
...
* use frm.set_value instead of this.set_value
* generic methods moved to accounts/utils
* clean up code, and make use of methods added in utils
2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf
Add patch to set update_field and update_value ( #14421 )
...
* Add patch to set update_field and update_value
- set update_field and update_value if empty
since expense claim workflow is dependent on it.
* Set update_field for workflow state of leave application
* Update patch entry
* Fix bug
* Update set_update_field_and_value_in_workflow_state.py
2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13
[Agriculture] Sort crop tasks chronologically and optimize disease task creation ( #14367 )
...
* Improve max crop period check and sort agriculture tasks chronologically
* Reformat crop cycle logic and add field to optimize task creation
2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a
Add Employee Status Temporary Leave ( #14423 )
2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717
[Fix] Travis data ( #14422 )
2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7
[ Fixes ] v11 Tree based doctype testing ( #14419 )
...
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node
* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash
* Company tree fix
Check if child exist while deleting a node validation added.
* Supplier Group tree fixes
on_trash validation added if child node present
* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Gaurav Naik
094617d29a
Fix to allow migration of individual sites ( #14413 )
2018-06-08 11:44:27 +05:30
Shreya Shah
b9399d8781
Cancel attendance if leave application is cancelled ( #14372 )
...
* Cancel attendance if leave application is cancelled
* Fix as per review
2018-06-08 11:24:08 +05:30
Zarrar
8cd0f67b25
query fix if name contains apostrophe ( #14370 )
2018-06-07 16:48:31 +05:30
Zarrar
13f9851609
[Docs] Update doc for Supplier Group ( #14373 )
...
* add breadcrumb for Supplier Group tree
* change occurrences of supplier-type to supplier-group
* update supplier-group doc, update pngs
2018-06-07 16:47:30 +05:30
Zarrar
209d8f36f7
doctype was not reloaded to pickup changes ( #14371 )
2018-06-07 16:43:55 +05:30
Prateeksha Singh
50ae6b891b
Merge pull request #14410 from pratu16x7/hub-fixes
...
Hub fixes
2018-06-07 14:19:01 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav
...
Some more travis fixes
2018-06-07 14:14:33 +05:30
Prateeksha Singh
00ab78d768
[hub] set page title dynamically
2018-06-07 14:13:00 +05:30
Shreya
88591314b0
Fix Leave Application test cases
2018-06-07 13:56:27 +05:30
Rohit Waghchaure
de82ad1c5f
[Fix] Clenaup code if supplier gstin is none
2018-06-07 13:24:25 +05:30
Prateeksha Singh
9a7f957ace
[hub] fix item page recursion
2018-06-07 12:40:40 +05:30
Shreya
88fe0d59d9
Fix daily work summary test
2018-06-07 11:22:26 +05:30
Shreya
4638d1ab97
Fix POS Profile test
2018-06-06 16:23:16 +05:30
