rohitwaghchaure
bb5f99a34d
Merge pull request #19071 from rohitwaghchaure/naming_series_added_for_the_asset_movement_develop
...
minor: naming series added in the asset movement
2019-09-16 19:10:54 +05:30
Rohit Waghchaure
40c5bf9e94
fix: naming series added in the asset movement
2019-09-16 16:42:42 +05:30
Faris Ansari
8beca68948
feat: Scan Barcode using Camera in mobile ( #19033 )
...
* feat: Scan Barcode using Camera in mobile
* fix: Use input-group for scan button
* fix: Muted camera button
2019-09-16 15:20:10 +05:30
Rucha Mahabal
2818b5bbe7
fix: 'link to material request' button not showing any message if no Material Request found ( #19064 )
2019-09-16 15:16:38 +05:30
Deepesh Garg
8cc2f83bd5
fix: Fetch scrap items from BOM if purpose is repack ( #19056 )
2019-09-16 14:49:12 +05:30
Nabin Hait
57835f0a37
fix: Company is required to get bin details ( #19058 )
2019-09-16 14:48:16 +05:30
Rushabh Mehta
72dcb51177
fix(minor): opportunity_from may not be selected ( #19063 )
2019-09-16 14:47:43 +05:30
Sammish Thundiyil
a2a9b39794
modified: erpnext/accounts/doctype/account/account.json ( #19032 )
2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96
fix: Invalid reference doctypes for accounting dimensions ( #19027 )
...
* fix: Invalid reference doctypes for accounting dimensions
* fix: Add server side validation for accounting doctypes
* fix: set fieldname and label before insert
2019-09-16 13:26:37 +05:30
Nabin Hait
74fdfff5b5
fix: Set todo status as Closed if task completed ( #19059 )
2019-09-16 13:06:37 +05:30
rohitwaghchaure
87000977d5
Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop
...
fix: user can able to change rate and discount even if they don't have permissions
2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0
fix: user can able to change rate and discount even if they don't have permission
2019-09-16 11:15:22 +05:30
barredterra
5bd8562b5a
Merge branch 'develop' into datev_report_headers
2019-09-14 20:09:39 +02:00
rohitwaghchaure
4a323463f7
fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices ( #19039 )
2019-09-13 18:36:57 +05:30
Deepesh Garg
9c3fd8dbc3
Merge pull request #19044 from marination/gstr-error
...
fix: Changed error message in GSTR-1 Report
2019-09-13 18:04:38 +05:30
marination
3d433efdfe
fix[minor]: Changed error message in GSTR-1 Report
...
Error message didn't prompt where the user has to add the missing value(GSTIN No.)
2019-09-13 16:28:11 +05:30
Nabin Hait
93a9c08116
fix: Allocate payment amount in reference table on change of payment amount ( #19041 )
2019-09-13 15:48:50 +05:30
Chinmay Pai
b3c732daf5
refactor(plaid): move configuration from site_config to doctype ( #18712 )
...
* feat(plaid): move plaid from site_config to doctype
plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* feat(plaid): make changes to plaid_settings and add patch
* remove all references for get()-ing plaid variables from frappe.conf
and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
frappe.conf to plaid_settings doctype
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* fix(plaid): use get_single_value for Plaid Settings
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
* chore: reload plaid_settings before running patch
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove useless semicolon
fuck codacy
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-13 15:48:08 +05:30
Suraj Shetty
f8899827e0
fix: Add Exotel Settings to integration module ( #19025 )
...
* fix: Add Exotel Settings to integration module
* fix: Add description
2019-09-13 12:27:00 +05:30
Suraj Shetty
6996c2d17d
fix: Fetch image from user if available ( #19030 )
2019-09-13 12:25:06 +05:30
Mangesh-Khairnar
755020843b
fix: leave balance reports ( #18984 )
...
* fix: process allocation expiry
* fix: leave balance summary filter
* fix: opening and closing balance
* fix: check for department leave approvers
* fix: minor changes
* fix: consider leave approver in employee
* Update employee_leave_balance_summary.py
2019-09-13 11:07:09 +05:30
Rucha Mahabal
72949e7f73
fix: share transfer validations for journal entry ( #19018 )
...
* fix share transfer validations for journal entry
* fix: share transfer test
* fix: tests
2019-09-13 11:05:40 +05:30
Suraj Shetty
e4f8bda1ea
Merge pull request #19031 from surajshetty3416/fix-call-popup-name
...
fix: Make -> Create in call popup
2019-09-12 22:14:24 +05:30
Suraj Shetty
cdce6c746f
fix: Make -> Create
2019-09-12 22:04:49 +05:30
Himanshu
d51f7af9ab
fix: add contact phone to sales order ( #19012 )
2019-09-12 19:19:17 +05:30
Suraj Shetty
3b0ec48b0c
fix: Naming series check to avoid duplicate entry error ( #19015 )
...
* fix: Naming series check to avoid duplicate key error
* fix: Check for existence of naming series
2019-09-12 19:18:44 +05:30
Nabin Hait
a5dfe0725f
fix: payment against shareholder ( #19019 )
2019-09-12 19:17:24 +05:30
Shivam Mishra
a3095c987a
fix: optimized query ( #19026 )
...
Co-authored-by: nabinhait
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
2019-09-12 17:28:37 +05:30
Sammish Thundiyil
504e52ff46
refactor: cost center ( #19011 )
...
* modified: erpnext/accounts/doctype/cost_center/cost_center.json
* fix: removed unique property from cost_center_name
2019-09-12 13:48:41 +05:30
sahil28297
b1604a24ed
fix(add_to_cart): show add_to_card button only if specific conditions are satisfied ( #19007 )
2019-09-12 11:20:55 +05:30
Himanshu
e3ef56804c
fix(Issue): track split from in issue ( #18994 )
...
* fix: track split from in issue
* fix: rename field name
* fix: remove first_mins to response
2019-09-11 19:20:20 +05:30
Fisher Yu
cd38ba4833
fix: several bugs and improvement ideas for education module #18599 ( #18600 )
...
* Update student_report_generation_tool.py
bug fix
* Update student_applicant.json
* Update program_course.json
* Update course_activity.json
2019-09-11 19:10:39 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well
2019-09-11 18:39:49 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document ( #18988 )
2019-09-11 12:43:27 +05:30
Mangesh-Khairnar
7bcb24efbf
fix(purchase-invoice): Update paid amount on creation of debit note ( #18830 )
...
* fix(purchase-invoice): set paid amount for purchase return
* fix(purchase-invoice): remove payment schedule on creation of debit note
2019-09-11 10:49:33 +05:30
rohitwaghchaure
bb736248a2
fix: incorrect qty calculation in the production plan fopr the sub assembely work orders ( #18970 )
2019-09-11 10:20:49 +05:30
Saurabh
e919388ee6
fix: do not cache value while creating item group, in setup wizard it will raise link validation error ( #18992 )
2019-09-11 10:07:50 +05:30
rohitwaghchaure
358a01a226
fix: Quotation Trends report not working for filter group by customer ( #18989 )
2019-09-10 19:18:30 +05:30
Nabin Hait
a035428d43
fix: handling of key does not exists error
2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c
Merge branch 'develop' into version-12
2019-09-10 14:38:39 +05:30
Sahil Khan
a2fd1f22da
bumped to version 12.1.2
2019-09-10 14:58:39 +05:50
Sammish Thundiyil
bcda12f4bb
modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json ( #18829 )
2019-09-10 14:11:02 +05:30
Shivam Mishra
e851346b4c
fix: dont make dashboards if company is not set ( #18975 )
...
* fix: dont make dashboardss if company is not set
* fix: function call
* Update dashboard_charts.py
2019-09-10 14:08:31 +05:30
Nabin Hait
88e8688a4b
fix: set raw material's batch based on main item's batch only if RM has batch no ( #18977 )
2019-09-10 14:07:45 +05:30
Suraj Shetty
0254217314
fix: Make address fields mandatory ( #18979 )
2019-09-10 14:07:05 +05:30
Mangesh-Khairnar
1853a83453
fix(packing-slip): add a descriptive message ( #18981 )
2019-09-10 13:21:01 +05:30
rohitwaghchaure
d312d11062
fix: port from hotfix ( #18974 )
...
* fix: '>' not supported between instances of 'int' and 'str'
* fix: not able to save item because price list has disabled
2019-09-10 10:47:36 +05:30
Deepesh Garg
69aeff15ef
Merge pull request #18971 from Anurag810/sales_invoice_print_format_fixes_v13
...
fix: sales invoice return print format overriding the meta default print format
2019-09-09 18:35:05 +05:30
Anurag Mishra
89d3bc0b54
fix: sales invoice return print format overideing the meta default print format
2019-09-09 15:58:25 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves
...
feat: Added input field for max carry forwarded leaves
2019-09-09 14:38:06 +05:30