Ameya Shenoy
dc279ded15
Merge branch 'staging-fixes' into staging
2018-10-11 06:58:13 +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
75c1682e61
Merge branch 'hotfix'
2018-10-09 17:55:32 +05:30
Saurabh
2dc8972794
bumped to version 10.1.58
2018-10-09 18:25:32 +06:00
Saurabh
f786eccdf9
Merge pull request #15633 from Zlash65/setup-fix
...
[Minor] Setup Wizard failing fix
2018-10-09 17:49:54 +05:30
Zlash65
a1036ad50b
setup wizard failing fix
2018-10-09 17:38:28 +05:30
Zarrar
098d88ee0a
columns without fieldname's data not shown ( #15619 )
2018-10-08 18:34:23 +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
cf91f34ffa
Merge branch 'staging-fixes' into staging
2018-10-08 09:43:48 +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
ee3b788024
Merge branch 'hotfix'
2018-10-08 09:37:37 +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