Pranav Nachanekar
291e161793
Added permissions for sales user
2019-09-25 13:11:04 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency ( #19154 )
2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451
enhancement(tds-monthly-payable): remove zero value transaction ( #19141 )
2019-09-24 19:46:06 +05:30
Rucha Mahabal
c6b548b5b2
fix(Stock): item variant description ( #19134 )
2019-09-24 19:17:13 +05:30
gavin
fed5788c50
fix: patch fix ( #19147 )
2019-09-24 19:15:29 +05:30
Rucha Mahabal
824376a045
fix(Journal Entry): Opening Entry not fetching accounts ( #19148 )
2019-09-24 19:13:55 +05:30
Saqib
451d1a1744
fix: Bypass credit limit and Project Template field not visible( #19162 )
...
* Fix: Allow Project Template in Quick Entry
* Fix: Label Changes
2019-09-24 19:10:59 +05:30
thefalconx33
c15cc8fc28
fix : #18624
2019-09-24 18:49:16 +05:30
Sahil Khan
946f68f7f0
bumped to version 12.1.5
2019-09-24 18:36:53 +05:50
Vijaya Raghavan
e9affd97ac
LWP for half day in multi day leave
2019-09-24 17:04:32 +05:30
Pranav Nachanekar
9f86022c2b
fix: Error in test setUp
2019-09-24 16:07:41 +05:30
Pranav Nachanekar
d45c12b382
Formatting
2019-09-24 16:07:02 +05:30
prssanna
3f1444e410
fix: get leaderboards using hooks
2019-09-24 13:51:22 +05:30
prssanna
3bd15d3aaa
feat: remove leaderboard from erpnext
2019-09-24 13:06:31 +05:30
Pranav Nachanekar
c9cf5aebea
Changed required values, add clientside validation
2019-09-24 12:08:37 +05:30
Nabin Hait
7ab861fe95
Merge branch 'develop' into develop
2019-09-24 11:50:38 +05:30
Deepesh Garg
d9e9d562f8
fix: Travis (develop) ( #19140 )
...
* fix: Travis
* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Pranav Nachanekar
558d44e519
Removed auto-assignment for unverified appointments
2019-09-24 11:33:57 +05:30
Deepesh Garg
2e7419d78f
fix: Do not validate warehouse in case of Repack ( #19050 )
2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b
fix: get correct warehouse for product bundle ( #19130 )
2019-09-24 10:03:34 +05:30
Anurag Mishra
5a61880e6a
fix: provided delete permission ( #19143 )
2019-09-24 09:54:54 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Pranav Nachanekar
8393ebbbca
Fixed missing permission in update
2019-09-23 17:14:31 +05:30
Pranav Nachanekar
8b744b2d03
Added request verification and url encoding
2019-09-23 15:55:35 +05:30
rohitwaghchaure
8dd4699f10
feat: Allow to make landed cost voucher against the asset item ( #19121 )
2019-09-23 15:03:52 +05:30
rohitwaghchaure
e18f7b91c3
Merge pull request #19127 from rohitwaghchaure/removed_mandatory_property_for_address_field_in_quick_entry_develop
...
fix: removed mandatory property for address field in quick entry
2019-09-23 14:48:27 +05:30
Pranav Nachanekar
a35e34b5f0
FIxed typos and create_lead method
2019-09-23 14:38:22 +05:30
Pranav Nachanekar
3eccb84eaa
Fixed update method
2019-09-23 14:25:42 +05:30
Pranav Nachanekar
b6b27d9256
Corrected moving to doctype for email
2019-09-23 14:16:13 +05:30
Pranav Nachanekar
7b7962d28c
Added test cases
2019-09-23 13:05:18 +05:30
Pranav Nachanekar
dcfc849946
Moved email to appoitnmetn doctype
2019-09-23 11:52:26 +05:30
Pranav Nachanekar
f8cc86bfed
Moved email from class variable to doctype
...
Formatting
Made methods which link other doctypes idempotent
2019-09-23 11:28:05 +05:30
Pranav Nachanekar
0800031c0d
Addee email to appointment doctyoe
...
and asthetic changes
2019-09-23 11:26:46 +05:30
Pranav Nachanekar
6b0fea16b6
Added buttons to linked docs
2019-09-23 11:26:18 +05:30
Anurag Mishra
2c60f6419e
feat: missmatching amount in GST Sales report and itemised sales report ( #19116 )
2019-09-20 23:00:09 +05:30
Suraj Shetty
462d9cb331
feat: "Purchase Order items to be Received or Billed" report ( #19091 )
...
* feat: Init "Purchase Order items to be received or billed" report
* fix: Rename report
* fix: Column name
2019-09-20 18:30:22 +05:30
Mangesh-Khairnar
a44e8afe71
feat: add bank account in payroll entry ( #19021 )
...
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
2019-09-20 18:19:47 +05:30
Sahil Khan
0c665e5638
bumped to version 12.1.4
2019-09-20 15:37:21 +05:50
Rohit Waghchaure
1f9a84f165
fix: removed mandatory property for address field in quick entry
2019-09-20 12:18:23 +05:30
Pranav Nachanekar
9c0f462336
Fixed Syntax errors
2019-09-20 10:51:56 +05:30
Pranav Nachanekar
aa7d0c0163
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
2019-09-20 10:47:18 +05:30
Pranav Nachanekar
73420e462f
Added email
2019-09-20 10:44:52 +05:30
Pranav Nachanekar
fa4a2a53e8
Added email
2019-09-20 10:41:59 +05:30
Pranav Nachanekar
df1a5a9633
Added flow for verifying emails
2019-09-20 10:08:48 +05:30
Pranav Nachanekar
5324234bd0
Removed required lead
2019-09-20 10:08:26 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix
...
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 19:01:05 +05:30
Anurag Mishra
c16fb9eb9d
fix: dashboard button not working ( #19094 )
2019-09-19 18:12:39 +05:30
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue
...
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
2019-09-19 18:01:03 +05:30
marination
8590112faa
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 17:48:23 +05:30
Rohit Waghchaure
6daab3ca89
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given)
2019-09-19 17:01:49 +05:30
Rucha Mahabal
51eabfe352
fix: subcontracting material transfer dialog in Purchase Order ( #19111 )
...
* fix: subcontracting material transfer dialog in Purchase Order
* fix: dialog title
2019-09-19 16:57:03 +05:30
Mangesh-Khairnar
68a4c70b72
Merge branch 'develop' into attendance_template_fix
2019-09-19 13:34:39 +05:30
Pranav Nachanekar
ca2509423a
Added permissions for HR manager
2019-09-19 12:36:51 +05:30
Pranav Nachanekar
4109f88c04
Linked send_reminder in calendar event
...
to Appointment Booking Settings
2019-09-19 12:08:10 +05:30
Pranav Nachanekar
5bf52ebed6
limit assigment load to appointment day
2019-09-19 11:47:54 +05:30
Pranav Nachanekar
ba99945359
Prevent booking of appointments for past times
2019-09-19 11:21:05 +05:30
Suraj Shetty
28d182af15
fix: Permission issue in Total Stock Summary report ( #19110 )
...
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
2019-09-19 11:13:22 +05:30
Rohan
8a097c8627
fix: only set times if job card is filled ( #19107 )
2019-09-18 20:05:49 +05:30
Rucha Mahabal
1ba83427e5
fix: asset maintenance TypeError during date comparisons ( #19098 )
2019-09-18 20:04:15 +05:30
Marica
d793e39b6d
fix: Customer Credit Balance Report query fix ( #19104 )
2019-09-18 19:59:31 +05:30
Pranav Nachanekar
ec1dae023c
styling
2019-09-18 16:13:29 +05:30
Pranav Nachanekar
7d476a3e35
Moved lead assignment to the controller
2019-09-18 15:33:31 +05:30
Pranav Nachanekar
81449ece54
fix:Linking lead
2019-09-18 14:33:40 +05:30
Pranav Nachanekar
7323bfdad7
Styling and bug fixes
2019-09-18 14:33:10 +05:30
Rucha Mahabal
aeaf416d6d
fix: upload attendance template not marking attendance
2019-09-18 13:11:30 +05:30
Pranav Nachanekar
3c8bea65ef
Merged with local
2019-09-18 10:39:11 +05:30
Pranav Nachnekar
57c311f8e9
Merge branch 'develop' into develop
2019-09-18 10:33:39 +05:30
rohitwaghchaure
780fb8a4e5
fix: set stock adjustment account for the raw materials instead of COGS ( #19090 )
2019-09-17 18:46:49 +05:30
rohitwaghchaure
d019d28bc9
fix: Customer Ledger Summary report not working on python 3 ( #19092 )
2019-09-17 18:45:59 +05:30
Sahil Khan
4f96ec1b6c
bumped to version 12.1.3
2019-09-17 17:31:14 +05:50
sahil28297
c1930fa64d
Merge branch 'develop' into fix_indentation
2019-09-17 17:08:16 +05:30
Pranav Nachanekar
91a564989f
Styling and PR review changes
2019-09-17 16:58:41 +05:30
kaviya
9e4f674fb9
fix: indentation error in stock ageing
...
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
2019-09-17 16:02:11 +05:30
Suraj Shetty
627a3dcd6d
feat: Default energy point rules ( #19003 )
...
* feat: Add default energy point rules during install
* fix: Add completed_by field to task doctype
* fix: Rule data
* fix: Add default rules for opportunity
* fix: Add a patch to create default energy point rules
* fix: Default success action message
* fix: Use .items() instead of .iteritems()
* fix: Add "create_default_energy_points" patch entry
* fix: Reload Energy Point Rule to fix patch
* fix: Import frappe
2019-09-17 15:54:41 +05:30
Suraj Shetty
af2eac4334
fix: Create error log if something goes wrong while call log creation ( #19055 )
...
* fix: Create error log if something goes wrong while call log creation
- For better debbugging
* fix: Rollback if any error occurs during call log creation
2019-09-17 15:53:23 +05:30
Pranav Nachnekar
33daf281bd
Merge branch 'develop' into develop
2019-09-17 14:14:16 +05:30
Suraj Shetty
7563bdf6f8
Merge branch 'develop' into fix-exotel-call-log
2019-09-17 13:28:59 +05:30
rohitwaghchaure
ad5fc07652
Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11
...
fix: plc conversion issue for offline pos
2019-09-17 13:24:41 +05:30
Suraj Shetty
6b9b92afb0
fix: Return employee emails instead of employee
2019-09-17 13:22:40 +05:30
Rohit Waghchaure
094612dc02
fix: plc conversion issue for offline pos
2019-09-17 13:04:28 +05:30
Faris Ansari
4fe67236ed
fix: Python 3 fixes for MWS Connector ( #18986 )
2019-09-17 12:57:51 +05:30
Deepesh Garg
c5c3860c5c
fix: Mandatory accounting dimensions while creating asset depreciation entry ( #19073 )
...
* fix: Mandatory accounting dimensions while creating asset depreciation entry
* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42
fix: not able to change the account type in parent company account head ( #19083 )
2019-09-17 12:49:52 +05:30
Mangesh-Khairnar
5d41e3848d
fix: do not submit depreciation journal entry when workflow is enabled ( #19000 )
2019-09-17 12:45:14 +05:30
Pranav Nachnekar
a8752db012
Typo and styling fixes
...
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-09-16 20:02:20 +05:30
Frappe PR Bot
abd434f656
feat: Updated translation ( #19077 )
2019-09-16 19:57:27 +05:30
Suraj Shetty
bc001d2d9a
feat: Add stock ageing data to stock balance report ( #19036 )
...
* feat: Add stock ageing data to stock balance report
* fix: Use fifo queue warehouse wise
* fix: "Stock Ledger Entry" get query
* fix: Remove unwanted quotes in item details query
* fix: Check if no SLE was passed
* fix: Codacy
* fix: Add logic to include additional UOM columns
* fix: Show stock ageing data optionally
2019-09-16 19:57:04 +05:30
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center ( #19065 )
2019-09-16 19:44:37 +05:30
Marica
bac4b93639
fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master ( #19066 )
...
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
2019-09-16 19:44:28 +05:30
rohitwaghchaure
76df782006
fix: Decimal point issue for e-invoice ( #19068 )
2019-09-16 19:43:17 +05:30
Mangesh-Khairnar
dce04b7335
fix: filter for payment order ( #19070 )
2019-09-16 19:40:27 +05:30
Chinmay Pai
7e8e4783a1
fix: remove function call from kwarg ( #19072 )
...
this commit fixes mail not being sent for leave applications
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-16 19:14:42 +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
Pranav Nachanekar
018f0d3bbd
Fixed issue: agents weren't looked up in settings
2019-09-13 16:52:06 +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
Pranav Nachanekar
1cd762e9d0
Added ajuto assignment
2019-09-13 15:56:54 +05:30
Pranav Nachanekar
d88f850d0f
removed debugger
2019-09-13 15:56:47 +05:30
Pranav Nachanekar
cf045d86b0
fixed typo
2019-09-13 15:55:54 +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
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
Pranav Nachanekar
a3b8c77af1
Fixed leads
2019-09-12 15:19:22 +05:30
Pranav Nachanekar
1564f1476c
Added customer to calender event
2019-09-12 14:24:28 +05:30
Pranav Nachanekar
c9c8e19ec2
Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop
2019-09-12 14:13:18 +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
Pranav Nachanekar
469247bf73
Change max date of datepicker
...
to number of days in future as specified by the settings
2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3
Add lead and calender event to appointments
2019-09-12 10:48:26 +05:30
Pranav Nachanekar
8051ca1859
Limit advance booking of appointments
2019-09-12 10:47:45 +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
Pranav Nachanekar
249cdd92e0
Added uniqueness check for offset
2019-09-11 14:59:25 +05:30
Pranav Nachanekar
e543fc483f
Removed email reminders
...
As it will be handled by calender event in the future
2019-09-11 14:59:13 +05:30
Pranav Nachanekar
a322b159ab
Added back button from details page
2019-09-11 14:25:26 +05:30
Pranav Nachanekar
0cc837eac5
Create event for the appointment
...
TODO: Add lead and employee to this
2019-09-11 14:12:30 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document ( #18988 )
2019-09-11 12:43:27 +05:30
Pranav Nachnekar
4897897a3a
Merge branch 'develop' into develop
2019-09-11 11:21:26 +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
Pranav Nachanekar
5038d6a6db
Removed appointment tests
...
TODO: Write better tests after adding lead and calender event generation
2019-09-11 10:31:04 +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
Pranav Nachanekar
2d7370a525
Moved delete_appointment
2019-09-10 16:46:17 +05:30
Pranav Nachanekar
c4950a0281
Added doctype
...
availabitlity of slots added
2019-09-10 15:10:51 +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
Pranav Nachanekar
6f486f3719
Addded status to appointment creation
2019-09-10 13:12:28 +05:30
Pranav Nachanekar
5c008ef023
UI Fixes
...
Only 8 time slots will appear in a row
Date is more readable on the contact details page
2019-09-10 13:12:07 +05:30
Pranav Nachanekar
5c211d8abf
fixed codacy
2019-09-10 11:52:55 +05:30
Pranav Nachnekar
4ac25f28a3
Merge branch 'develop' into develop
2019-09-10 06:01:33 +00:00
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
Pranav Nachanekar
06facea895
added doctype
2019-09-09 17:09:03 +05:30
Pranav Nachanekar
110f4ea0c9
Formatting
2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26
Removed unneccessary doctype
2019-09-09 17:01:40 +05:30
Pranav Nachanekar
20c7c290fa
Formatting
2019-09-09 16:36:01 +05:30
Pranav Nachanekar
5945144c08
Added tests
2019-09-09 16:35:48 +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
Pranav Nachanekar
10711dd09d
Refactor UI
2019-09-09 15:41:20 +05:30
Pranav Nachanekar
63dbacd7c0
Disabled caching
2019-09-09 15:19:57 +05:30
Pranav Nachanekar
48e43e2421
build fix
2019-09-09 14:43:55 +05:30
Pranav Nachanekar
217aadba7e
Better autoname
2019-09-09 14:43:41 +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
Faris Ansari
32eccb8fb2
fix: Rename duplicate label Image to Website Image ( #18912 )
2019-09-09 14:29:01 +05:30
Nabin Hait
632fc6af79
feat: Added input field for max carry forwarded leaves
2019-09-09 13:33:00 +05:30
Suraj Shetty
f43825e4dd
fix: convert dict to list for iteration ( #18963 )
2019-09-09 13:23:01 +05:30
Shivam Mishra
5f59c2ae75
fix: reload account timeline before creating dashboards ( #18934 )
...
* fix: sync account balance timeline.json before running patch
* fix: reload account timeline before creating dashboards
2019-09-09 13:20:53 +05:30
Nabin Hait
fb7c7b53ba
feat: Added input field for max carry forwarded leaves
2019-09-09 12:08:58 +05:30
Suraj Shetty
d2f22b52a5
Merge branch 'develop' into employee-leave-balance-summary
2019-09-09 10:21:06 +05:30
MorezMartin
ffc4f8f2a5
feat: [stock -> packed_items] Enable modification of Description on packed items ( #18907 )
...
* Change packed item
* Remove description field on update_packed_items
* add possibility to modify description on packed items
2019-09-09 10:16:23 +05:30
rohitwaghchaure
cdcff6c26d
Multiple port from v11 hotfix ( #18954 )
...
* fix: circular dependency during asset cancellation
* fix: ImponibileImporto for On Previous Row Total
* fix: PrezzoUnitario decimal issue
2019-09-09 10:15:01 +05:30
Faris Ansari
e352fb754b
fix: Reload doctype in variants patch ( #18962 )
2019-09-08 21:25:33 +05:30
Suraj Shetty
5ae40a9500
fix: Use absolute import instead of relative import
...
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-09-08 15:16:35 +05:30
Suraj Shetty
40dbb63042
Merge branch 'develop' into employee-leave-balance-summary
2019-09-08 14:15:47 +05:30
Faris Ansari
594918bd3a
fix: Include Item variant patch in patches.txt ( #18961 )
2019-09-08 13:13:05 +05:30
deepeshgarg007
366451fc62
fix: Minor fix in GSTR-1
2019-09-08 09:51:15 +05:30
Suraj Shetty
a14ee7f1fe
Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary
2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93
fix: Column value and data indentation
2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69
fix: Re-arrange filters
2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8
feat: Added default Leave Approver in Employee ( #18953 )
2019-09-07 12:31:07 +05:30
Saurabh
8e67a3a8a8
fix: check if 'All Item Group' exists before settings it as parent_item_group ( #18956 )
...
* fix: check if 'All Item Group' exists before settings it as parent_item_group
* feat: get cached value to avoid db call on each insert
2019-09-07 12:29:29 +05:30
Nabin Hait
4726fc4893
fix: Deleted unwanted production order files
2019-09-06 15:45:17 +05:30
Shivam Mishra
c69cc13c85
fix: updated footer message ( #18949 )
2019-09-06 15:40:15 +05:30
Prssanna Desai
ddfbb07c3b
fix: fix accounts balance timeline dashboard chart source ( #18942 )
...
* fix: fix accounts balance timeline dashboard chart source
* fix: pass chart_name to get function instead of chart object
2019-09-06 15:38:06 +05:30
Nabin Hait
d30f87bbdf
Merge branch 'Mangesh-Khairnar-feat-customer-credit-limit' into develop
2019-09-06 14:39:59 +05:30
Nabin Hait
4ce38059ac
feat: Company wise credit limit
2019-09-06 14:33:10 +05:30
Anurag Mishra
bbc1b5cdcf
feat: added date filter based on billing date and based date ( #18935 )
2019-09-06 12:10:37 +05:30
Anurag Mishra
ac0c1edd23
feat: added date filter based on billing date and based date ( #18936 )
2019-09-06 12:10:10 +05:30
Marica
a93b665427
fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List ( #18937 )
...
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
2019-09-05 18:26:45 +05:30
Sahil Khan
ede7050afe
Merge branch 'develop' into version-12
2019-09-05 17:30:44 +05:30
Sahil Khan
0906bc8430
bumped to version 12.1.1
2019-09-05 17:50:44 +05:50
Nabin Hait
ac2b5ed84f
fix: credit limit patch
2019-09-05 16:57:26 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring ( #18931 )
2019-09-05 16:43:20 +05:30
Himanshu
6298da4458
fix: treeview fixes ( #18803 )
2019-09-05 16:12:33 +05:30
Deepesh Garg
cffe577028
fix: Add UOM in anlytics report when viewing based on item ( #18902 )
2019-09-05 16:03:15 +05:30
Raffael Meyer
48d1463825
fix(CoA): SKR04 ( #18820 )
...
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
- move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5
Party accounts if don't have default company ( #18771 )
...
Add check for get_default company
2019-09-05 15:14:09 +05:30
Anurag Mishra
867ac10ffd
fix: handle for product bundle ( #18420 )
...
* fix: handle for product bundle
* fix: Requested changes and some general fixes
2019-09-05 15:13:21 +05:30
KanchanChauhan
d114c8f88f
fix(Purchase Order): Status updater ( #18612 )
2019-09-05 15:11:43 +05:30
Karthikeyan S
1d1427de60
fix(auto attendance): handling None case for IN/OUT Logs ( #18867 )
2019-09-05 15:02:33 +05:30
Andy Zhu
91596f2467
Change the field name for Payment Entry ( #18874 )
...
In the Payment Entry Form, the field name for customer name is 'party' instead of 'party_name'.
Need to change the customer_dashboard file accordingly.
2019-09-05 15:01:38 +05:30
Nabin Hait
eb2ab3bf76
Merge branch 'develop' into develop
2019-09-05 14:59:16 +05:30
John Clarke
a7d448dcba
fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip ( #18913 )
...
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445
This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?
User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?
See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
2019-09-05 14:55:35 +05:30
Rohan
77da3b4347
fix: pull project from task ( #18776 )
2019-09-05 14:53:43 +05:30
Rohan
9d77e9f719
fix: error while trying to get directions ( #18827 )
2019-09-05 14:51:22 +05:30
Govind S Menokee
c901d6322c
fix(18837): Student creation error ( #18838 )
...
Academic user not able to create student
2019-09-05 14:50:23 +05:30
rohitwaghchaure
7496548c39
fix: not able to create invoice against patient ( #18858 )
2019-09-05 14:48:51 +05:30
rohitwaghchaure
f1fab871b8
fix: mismatch between warehouse tree value and warehouse based stock balance report value ( #18879 )
2019-09-05 14:47:43 +05:30
rohitwaghchaure
5aaf15d145
fix: healthcare practitioner not showing in the dropdown ( #18929 )
2019-09-05 14:42:28 +05:30
Nabin Hait
16a7ec95dc
fix: tax category is optional argument
2019-09-05 13:01:15 +05:30
Suraj Shetty
607a21e02a
feat: Init Employee Leave Balance Summary report
2019-09-05 12:42:29 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit
2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba
Update customer.py
2019-09-05 12:33:29 +05:30
Nabin Hait
c78c86663d
Update customer_credit_balance.py
2019-09-05 12:24:37 +05:30
Nabin Hait
7834a0182b
Update move_credit_limit_to_customer_credit_limit.py
2019-09-05 12:22:48 +05:30
sahil28297
1e0b0da7ad
fix(patch): add company in filters to get proper parent account ( #18905 )
2019-09-05 12:21:44 +05:30
Faris Ansari
a2db94761a
fix: Honor Shopping Cart Price List ( #18885 )
2019-09-05 12:19:50 +05:30
rohitwaghchaure
805b8634da
fix: incorrect stock value difference when stock move from negative to positive ( #18887 )
2019-09-05 12:18:33 +05:30
Rohan
1635967c4e
fix: attribute error when trying to fetch items ( #18900 )
2019-09-05 12:16:49 +05:30
Nabin Hait
a5907e17d5
Update accounts_receivable.py
2019-09-04 11:04:27 +05:30
Suraj Shetty
f5bece1afa
Merge branch 'develop' into fix-call-popup
2019-09-04 11:03:58 +05:30
Suraj Shetty
e46c56bfe8
fix: Use medium instead of to number to get schedule
2019-09-04 11:02:52 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py
2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working
...
fix: offline pos item search not working
2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659
fix: offline pos item search not working
2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) ( #18647 )
...
* feat: employee incentive and retention bonus added in additional salary
* fix: added salary component field, logic improved
* fix: codacy review
2019-09-03 20:45:52 +05:30
Sahil Khan
e8b1c82531
bumped to version 12.1.0
2019-09-03 16:53:06 +05:50
Saurabh
3f8f8d36b7
Merge branch 'develop' into changelog_v12_1_0
2019-09-03 16:25:44 +05:30
Sahil Khan
a70e2bdbc9
fix(change_log): add v12_1_0 changelog
2019-09-03 16:20:01 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report ( #18906 )
2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit
2019-09-03 14:20:17 +05:30
Mangesh-Khairnar
cb44f3a7c3
fix(purchase-invoice): add rounded total property setter for purchase invoice ( #18841 )
2019-09-03 14:18:15 +05:30
Deepesh Garg
c174e4d01a
fix: Default message from Payment Gateway Account not fetching ( #18848 )
2019-09-03 14:17:41 +05:30
pranav nachnekar
d272fd42c9
changed Autoname
2019-09-03 14:16:56 +05:30
pranav nachnekar
c5b2a58669
Added submit fucntionality
2019-09-03 14:16:47 +05:30
Rohan
7fa3f3fe98
fix: include start and end date for contract status ( #18866 )
2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca
A
2019-09-03 13:17:35 +05:30
pranav nachnekar
2791054327
Converted to an SPA
2019-09-03 12:04:52 +05:30
pranav nachnekar
eb4fa966b0
Added validation for timezones
2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690
Added guest permissions
2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7
Removed end time in favor of appointment duration
2019-09-03 12:03:14 +05:30
Mangesh-Khairnar
4bcc221ee3
Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit
2019-09-02 23:18:56 +05:30