Rushabh Mehta
95439db53f
[fixes] address and contact
2017-01-14 00:25:22 +05:30
Rushabh Mehta
c0bfb0ba56
[fix] contact and address for demo
2017-01-13 23:05:56 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
Nabin Hait
448acf6f46
Merge branch 'master' into develop
2017-01-13 17:30:46 +05:30
Nabin Hait
3d26ddd790
bumped to version 7.2.11
2017-01-13 18:00:45 +06:00
Nabin Hait
e7cb911634
Salary Slip Patch Fixed
2017-01-13 17:30:06 +05:30
Nabin Hait
26ac85be5b
Merge branch 'master' into develop
2017-01-13 17:10:52 +05:30
Nabin Hait
fd7f3240b4
bumped to version 7.2.10
2017-01-13 17:40:51 +06:00
Nabin Hait
b166caa9fb
Patch fixed
2017-01-13 17:09:57 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Rushabh Mehta
af077dc616
[minor] fix for custom perms
2017-01-13 14:47:37 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Nabin Hait
45cad45420
bumped to version 7.2.9
2017-01-13 15:03:56 +06:00
Nabin Hait
e43a94de4b
Merge branch 'hotfix' into draft_status_issue_after_amend
2017-01-13 13:14:32 +05:30
Nabin Hait
9698f1b923
Merge pull request #7473 from KanchanChauhan/salary-slip-before-june
...
Patch to add Start and End Date in Salary Slips
2017-01-13 12:53:15 +05:30
Rohit Waghchaure
29458836e4
[Fix] After amend the status become cancelled even if docstatus is zero
2017-01-13 12:51:19 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Kanchan Chauhan
b6114e672f
Patch to add Start and End Date in Salary Slips
2017-01-13 12:05:03 +05:30
Nabin Hait
4bd42146ba
Merge pull request #7462 from rohitwaghchaure/minor_pos_issue
...
[Fix] POS issues
2017-01-13 11:55:52 +05:30
Nabin Hait
ba2a76cfb7
Merge pull request #7453 from KanchanChauhan/salary-register-report
...
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
8f0c060578
Merge pull request #7447 from saurabh6790/tree_param_fix
...
[fix] provision to handle custom mandatory params while creating node
2017-01-13 11:50:18 +05:30
Nabin Hait
17cd36b7d5
Merge pull request #7451 from saurabh6790/chequeprint_date_fix
...
[minor][fix] show date in user format
2017-01-13 11:36:12 +05:30
Nabin Hait
90de12fea3
Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc
...
[Minor] Field type of Description field changed to Text Editor
2017-01-13 11:34:51 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Felipe Orellana
ac81440a81
[FIX] Contact form breaks on existing lead
...
When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.
2017-01-12 12:08:20 -05:00
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott
1cd7e54822
Adds button to find MRs linked to Supplier
2017-01-11 03:05:49 -08:00
Saurabh
056276c60e
[minor][fix] show date in user format
2017-01-11 15:50:09 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Saurabh
2f02101d7d
[fix] provision to handle custom mandatory params while creating node
2017-01-11 12:41:01 +05:30
Kanchan Chauhan
595cfb9f17
[Minor] Field type of Description field changed to Text Editor
2017-01-11 12:03:15 +05:30
Nabin Hait
0287d31c0f
Fetch bin details after setting warehouse based on POS Profile
2017-01-11 10:31:45 +05:30
Nabin Hait
c0eab41ec5
Fix for Budget against Project
2017-01-11 10:16:19 +05:30
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Nabin Hait
9e08ccdf39
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
...
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
1612fa1253
Merge pull request #7426 from nabinhait/hotfix
...
Show values based on precision and filter out zero value rows
2017-01-10 17:26:27 +05:30
Nabin Hait
20aba32318
Merge pull request #7427 from KanchanChauhan/projects-manager-role
...
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f
[Minor] Added Projects Manager role
2017-01-10 16:35:54 +05:30
Nabin Hait
5dd988207f
Show values based on precision and filter out zero value rows
2017-01-10 16:10:40 +05:30
Kanchan Chauhan
4a15fa4c86
Sync Project Task and Task
2017-01-10 16:01:38 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Nabin Hait
4180a37773
bumped to version 7.2.8
2017-01-10 13:00:09 +06:00
Nabin Hait
a7f616564e
Merge pull request #7417 from KanchanChauhan/quick-entry-for-item
...
[Minor] Valuation rate in Quick entry for Item
2017-01-10 12:23:36 +05:30
Nabin Hait
01baceb74e
Revert "proposed usage of daterange picker"
2017-01-10 12:19:48 +05:30
Kanchan Chauhan
43e07aed2c
[Minor]Valuation rate in Quick entry for Item
2017-01-10 12:06:51 +05:30
Nabin Hait
9215581345
Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle
...
[Fix] Payroll Frequency toggle fix
2017-01-10 11:58:36 +05:30
Kanchan Chauhan
2b41f9d548
[Fix] Payroll Frequency toggle fix
2017-01-09 18:43:52 +05:30
Neil Trini Lasrado
5a30467ae5
Added test case
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
a56224c03a
Rename Assessment to Assessment Plan
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
233ecfdd9c
Renamed min_score to threshold in Grading Scale
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
577cfd559f
Removed LMS code in Course master
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
5c87455918
Patch for assessment module redesign
2017-01-09 18:26:03 +05:30
Neil Trini Lasrado
06ed74dc7c
Redesign Assessment Module
2017-01-09 18:26:02 +05:30
Nabin Hait
ec793b4846
Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix
2017-01-09 17:24:10 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
a2fae844b6
Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
...
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 17:15:40 +05:30
Nabin Hait
2bb9093b9a
bumped to version 7.2.7
2017-01-09 17:27:10 +06:00
Nabin Hait
f0c41b5709
Merge pull request #7412 from nabinhait/hotfix
...
Allow fetching same items multiple times from source doc if all qty not processed
2017-01-09 16:00:08 +05:30
Nabin Hait
23b836dcdb
Merge pull request #7386 from arvindstutzen/patch-1
...
Update step-8-customer-names.md
2017-01-09 15:55:38 +05:30
Nabin Hait
297ae85c31
Merge pull request #7409 from RobertSchouten/daterangecontrol
...
proposed usage of daterange picker
2017-01-09 15:55:17 +05:30
Nabin Hait
1839fcca11
Merge pull request #7406 from saurabh6790/terms_and_cond_fix
...
[fix] if terms exists then only call render_template
2017-01-09 15:49:56 +05:30
Nabin Hait
d1eb237909
Merge pull request #7400 from rohitwaghchaure/minor_issue
...
Get item default warehouse
2017-01-09 15:49:14 +05:30
Nabin Hait
a9b9edd9bc
Merge pull request #7392 from frappe/bcornwellmott-patch-2
...
Fix number of digits on report
2017-01-09 15:48:04 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
nick9822
6f48d4be1c
whitelisted erpnext.stock.utils.get_stock_balance ( #7402 )
...
whitelisted erpnext.stock.utils.get_stock_balance with respect to
https://github.com/frappe/erpnext/issues/7364
2017-01-09 12:12:36 +05:30
robert schouten
138c2f6b29
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 12:50:35 +08:00
robert schouten
81130e848e
proposed usage of daterange picker
2017-01-09 08:38:27 +08:00
Saurabh
f65e8de5a5
[fix] if terms exists then only call render_template
2017-01-07 08:18:10 +05:30
bcornwellmott
34e34ed1e8
Trigger Restart of build checks
2017-01-06 17:21:16 -08:00
Rushabh Mehta
8b133ac087
[minor] [tests] fix, tests will fail on the 5th of a month!
2017-01-06 17:21:04 +05:30
Rohit Waghchaure
6734c4ad5c
Get item default warehouse
2017-01-06 14:39:40 +05:30
Nabin Hait
91621639e8
Reload in_standard_filter property
2017-01-06 12:54:16 +05:30
bcornwellmott
a3e7c38734
Fix number of digits on report
...
Currently the cells can show many digits.
2017-01-05 09:44:18 -08:00
Nabin Hait
59a67c3586
Update supplier_quotation.py
2017-01-05 14:58:30 +05:30
Arvind Subramanian
efc9372f46
Update step-8-customer-names.md
2017-01-05 08:34:58 +05:30
bhupen
107099aac9
you can make quotation from supplier quotation
2017-01-04 17:04:12 +05:30
Nabin Hait
d08c248642
Merge pull request #7354 from Scheercuzy/enlarge-item-image-website
...
Hyperlink on item image on website
2017-01-04 15:58:44 +05:30
britlog
35cefb1275
fix success_list if http status == 200 + utf-8 support + optional success message
2017-01-04 15:53:26 +05:30
Nabin Hait
8281b36a26
Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress
...
Email ID renamed to Email Address
2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245
Merge pull request #7379 from KanchanChauhan/accounts-reports
...
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-04 15:45:39 +05:30
Nabin Hait
0dab40f4a1
Merge pull request #7377 from KanchanChauhan/naming-series
...
[Fix] Naming series issue
2017-01-04 15:44:00 +05:30
Nabin Hait
96562e3eb7
Merge pull request #7362 from rmehta/minor-fixes
...
[minor] dont get warehouse in opening entry #7353
2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97
Fixed test case for margin
2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Kanchan Chauhan
f4832cf2b9
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-03 16:29:41 +05:30
Scheercuzy
7c161cfff2
Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website
2017-01-03 16:03:43 +06:30
Kanchan Chauhan
0e8361d1de
[Fix] Naming series issue
2017-01-03 14:29:17 +05:30
Nabin Hait
1d88c65be4
Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement
...
[Enhancement] Consolidated billed report, changed the report type from query to script
2017-01-02 17:40:51 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Nabin Hait
1ecf613c3c
bumped to version 7.2.6
2017-01-02 17:56:54 +06:00
Nabin Hait
ceea71bcfc
Merge pull request #7365 from rohitwaghchaure/terms_and_condition
...
minor fix
2017-01-02 17:24:42 +05:30
Nabin Hait
b0e329b803
Merge pull request #7367 from saurabh6790/sms_log_fix
...
[fix] status check fix
2017-01-02 17:24:25 +05:30
Nabin Hait
506120936a
Merge pull request #7373 from KanchanChauhan/leave-for-absent
...
[Fix] Attendance validation in Leave Application
2017-01-02 17:23:45 +05:30
Nabin Hait
7fc18f359c
Currency symbol for budget amount based on company
2017-01-02 17:21:34 +05:30
Nabin Hait
92254d3930
Set serial nos in DN based on FIFO based on Stock Settings
2017-01-02 17:01:27 +05:30
Rohit Waghchaure
5a383e5cdd
[Enhancement] Consolidated billed report, changed type from query to script
2017-01-02 16:20:43 +05:30
Nabin Hait
06966e8e1d
minor fix
2017-01-02 15:10:01 +05:30
Kanchan Chauhan
5594050104
[Fix] Attendance validation in Leave Application
2017-01-02 11:14:44 +05:30
Rohit Waghchaure
cdbacf5398
minor fix
2016-12-30 17:06:01 +05:30
Saurabh
6bbed0297b
[fix] status check fix
2016-12-30 17:05:40 +05:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
ce5f942678
Merge branch 'master' into develop
2016-12-30 15:54:32 +05:30
Nabin Hait
edb99f8750
bumped to version 7.2.5
2016-12-30 16:24:31 +06:00
Nabin Hait
4de4b56c60
Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company
...
set default terms and condition if tc_name is available on the form
2016-12-30 15:46:57 +05:30
Rohit Waghchaure
585448b225
set default terms and condition if tc_name is available on the form
2016-12-30 15:41:55 +05:30
Rushabh Mehta
985cb8226d
[minor] dont get warehouse in opening entry #7353
2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
Nabin Hait
5105b1e789
bumped to version 7.2.4
2016-12-30 15:26:19 +06:00
Nabin Hait
dc0a277085
Merge pull request #7355 from manassolanki/hotfix
...
Fetching the item details from the reference doctype in QI
2016-12-30 14:10:21 +05:30
Nabin Hait
fa2feae314
Merge pull request #7359 from nabinhait/hotfix
...
[fix] Make Journal Entry against SO
2016-12-30 12:38:56 +05:30
Kanchan Chauhan
7b29dc7208
[Fix] Monthly Salary Register Fix
2016-12-30 12:36:00 +05:30
Nabin Hait
9646be1d5d
[fix] Make Journal Entry against SO
2016-12-30 11:14:41 +05:30
Rushabh Mehta
a8326de4d0
[fix] on_update in item.py
2016-12-30 06:17:45 +05:30
Rushabh Mehta
2097ccfaea
[fix] item_group.py #7358
2016-12-30 06:09:41 +05:30
Manas Solanki
5c82e9ef8b
Fetching the item details from the reference doctype in quality inspection
...
Error Report [2016-12-29]
2016-12-29 18:01:25 +05:30
Scheercuzy
f483582957
Hyperlink Item Image
...
added hyperlink on item image
2016-12-29 18:56:44 +06:30
Nabin Hait
f327a58b7f
Merge branch 'master' into develop
2016-12-29 11:04:05 +05:30
Nabin Hait
3d98d23e22
bumped to version 7.2.3
2016-12-29 11:34:05 +06:00
Nabin Hait
11bde0ba14
Patch fixed
2016-12-29 10:58:05 +05:30
Nabin Hait
2469f247df
Merge pull request #7341 from StrellaGroup/develop
...
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 17:12:01 +05:30
Neil Trini Lasrado
986927ca98
Added Guardian to school module
2016-12-28 16:15:35 +05:30
Muhammad Huzaifah Bin Ismail
465da8ce09
Fixed spelling errors on Production Planning Tool and manual.
2016-12-28 18:15:45 +08:00
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Neil Trini Lasrado
0152516ba4
[Fix] Student Monthly Attendance Sheet
2016-12-28 13:01:14 +05:30
Rushabh Mehta
94c4d7014d
[fix] item_name in stock reco
2016-12-28 06:56:09 +05:30
Rohit Waghchaure
249bc6167f
fix company issue
2016-12-28 00:20:08 +05:30
Rohit Waghchaure
aa9b8603b9
added paid amount in print format
2016-12-27 17:43:23 +05:30
Rohit Waghchaure
fe7a5b305f
create customer from POS
2016-12-27 17:31:32 +05:30
Rohit Waghchaure
8c9c9cfc5f
When a new company is made, cash account should be automatically set for Mode of Payment
2016-12-27 17:31:32 +05:30
Rushabh Mehta
5cb1b6bf3f
[minor] translation fix
2016-12-27 16:30:20 +05:30
Nabin Hait
3bcf9b5e70
Fixed merge conflict
2016-12-27 14:30:17 +05:30
Nabin Hait
89c8b4d6ae
bumped to version 7.2.2
2016-12-27 14:57:19 +06:00
Rushabh Mehta
174c3478a1
[fix] item variants not directly shown in website due to route clash
2016-12-27 12:30:30 +05:30
Rushabh Mehta
512b85e040
[minor] replace autocomplete with awesomplete
2016-12-27 12:14:37 +05:30
Rushabh Mehta
e60c2c7b7a
[minor] dashboard cleanups
2016-12-27 12:14:37 +05:30
Neil Trini Lasrado
22239ac610
Improved Student Dashboard
2016-12-26 17:14:16 +05:30
Nabin Hait
88817b40df
Merge pull request #7284 from mntechnique/develop
...
Report : Batch Item Expiry Status
2016-12-26 16:10:46 +05:30
Nabin Hait
4573029a5e
Merge pull request #7292 from frappe/bcornwellmott-patch-1
...
Add hours to calendar labels
2016-12-26 16:09:11 +05:30
Nabin Hait
0631d516ce
Merge pull request #7290 from netchampfaris/pos-item-area-scroll
...
pos item area scrollable
2016-12-26 16:07:38 +05:30
Nabin Hait
c2690425e3
Merge pull request #7310 from bhupennewalkar1337/hotfix
...
Fix #7202 unchecking pos will reflect automatically
2016-12-26 16:07:19 +05:30
Nabin Hait
488ad54bbc
Merge pull request #7280 from neilLasrado/leave
...
Added mark as present to student leave application
2016-12-26 16:06:44 +05:30
Neil Trini Lasrado
df4b9ab630
Optimised code for Student Monthly Attendance Report
2016-12-26 15:40:01 +05:30
Nabin Hait
7b2177a544
[test] Fixed test cases for LCV
2016-12-26 15:31:05 +05:30
Neil Trini Lasrado
94f42ea145
Added from date and to date to student leave application
2016-12-26 12:09:27 +05:30
Neil Trini Lasrado
9a7cb6ce92
Added mark as present to student leave application
2016-12-26 12:09:27 +05:30
Nabin Hait
61a190dd69
Merge branch 'master' into develop
2016-12-24 11:01:26 +05:30
Nabin Hait
8b3e39ed27
bumped to version 7.2.1
2016-12-24 11:31:25 +06:00
Nabin Hait
1d90b41aea
[fix] Fetch serial nos on change of Warehouse
2016-12-24 10:42:23 +05:30
bhupen
bcf63a2a8f
unchecking pos will reflect automatically
2016-12-23 18:00:18 +05:30
Nabin Hait
ba95fc4fa0
Fixed version conflict
2016-12-23 17:44:05 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
90c57e5ffd
bumped to version 7.2.0
2016-12-23 18:13:13 +06:00
Nabin Hait
aad8527ff3
Update __init__.py
2016-12-23 17:00:17 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
Nabin Hait
11c5da1d8c
bumped to version 7.1.29
2016-12-23 17:15:07 +06:00
Nabin Hait
aa2d949f61
Merge pull request #7295 from bhupennewalkar1337/lcv
...
Fix#3717 entering amount in lcv is enabled
2016-12-23 15:49:07 +05:30
Nabin Hait
1e1e28b0ae
Update landed_cost_voucher.js
2016-12-23 15:48:57 +05:30
Nabin Hait
06c6628481
Merge pull request #7279 from KanchanChauhan/automate-user-creation
...
Create User button in Employee if no User ID selected
2016-12-23 15:31:55 +05:30
Nabin Hait
0177c02c0f
Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue
...
minor fix
2016-12-23 15:19:32 +05:30
Nabin Hait
0e9f16f59d
Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2
...
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-23 15:18:28 +05:30
Nabin Hait
6104fdc579
Update repost_stock_for_deleted_bins_for_merging_items.py
2016-12-22 17:49:46 +05:30
bhupen
a83de5eac1
applicabe charges field is now editable
2016-12-22 16:24:14 +05:30
bhupen
914ae77a22
Limit instead of Allowance in stock settings
2016-12-22 16:24:14 +05:30
bhupen
5bb85e7a95
partially orderd status will be shown in material request
2016-12-22 16:24:14 +05:30
bcornwellmott
e549984a42
Grabs title from SQL
...
Gets a concatenated title label for the Calendar event that includes the number of hours
2016-12-21 12:36:45 -08:00
bcornwellmott
3385bd4921
Add hours to label in calendar view
...
Adds a label for the number of hours to each calendar event
2016-12-21 12:33:32 -08:00
Rohit Waghchaure
1af1a43616
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-21 19:19:16 +05:30
Faris Ansari
0822e41f96
pos item area scrollable
2016-12-21 18:17:00 +05:30
Revant Nandgaonkar
1c00b1fb21
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 18:01:35 +05:30
Rohit Waghchaure
dd58d537d5
[Fix] POS issue for serialized items
2016-12-21 17:55:40 +05:30
Rushabh Mehta
0632ee3da9
Merge branch 'v7.2.0-beta' into develop
2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
2016-12-21 17:30:29 +05:30
Kanchan Chauhan
58ed0c6efa
Create User button in Employee if no User ID selected
2016-12-21 16:18:59 +05:30
Revant Nandgaonkar
00e65cb70b
Report - Batch Item Expiry Status
...
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
2016-12-21 14:21:53 +05:30
Rohit Waghchaure
9df946e96c
[Fix] Warehouse is mandatory for packing materials on the sales invoice
2016-12-21 13:27:54 +05:30
Rohit Waghchaure
d567e57f82
minor fix
2016-12-21 13:18:36 +05:30
Revant Nandgaonkar
c30ae28422
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-21 12:52:23 +05:30
Revant Nandgaonkar
0766d3e67e
Report : Batch Item Expiry Status
...
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
2016-12-21 12:32:12 +05:30
Nabin Hait
e7939fd87b
Merge branch 'master' into develop
2016-12-21 12:18:38 +05:30
Nabin Hait
399e414909
bumped to version 7.1.28
2016-12-21 12:48:37 +06:00
Nabin Hait
b3943cb53a
Update repost_stock_for_deleted_bins_for_merging_items.py
2016-12-21 12:04:39 +05:30
Nabin Hait
2b8aafb08d
Merge pull request #7276 from neilLasrado/develop
...
Allow Data Import for Student Guardian
2016-12-21 11:17:13 +05:30
rohitwaghchaure
34e820d02d
[Enhancement] Added letter head for the report ( #7250 )
2016-12-20 16:54:24 +05:30
Rushabh Mehta
17d05b4fd7
Merge branch 'v7.2.0-beta' into develop
2016-12-20 12:59:29 +05:30
Rushabh Mehta
5a3f421453
[fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474
2016-12-20 12:59:09 +05:30
Rushabh Mehta
89af62a680
Merge branch 'v7.2.0-beta' into develop
2016-12-20 12:21:03 +05:30
Rushabh Mehta
2a86c32267
[minor] [patch] remove icon if present, fixes #6949
2016-12-20 12:20:39 +05:30
Neil Trini Lasrado
8979e1c7a5
Allow Data Import for Student Guardian
2016-12-20 11:53:52 +05:30
Nabin Hait
f573d43b90
fixed version conflict
2016-12-20 11:40:15 +05:30
Nabin Hait
1cc2d7403b
bumped to version 7.1.27
2016-12-20 12:09:46 +06:00
Nabin Hait
778c1a022d
Merge pull request #7236 from rohitwaghchaure/item_variant_issue
...
[Fix] Timeout error in item attribute validation
2016-12-20 11:31:50 +05:30
Rushabh Mehta
f944fb9e46
Merge branch 'v7.2.0-beta' into develop
2016-12-19 17:06:56 +05:30
Rushabh Mehta
827588adf2
[minor] fixes to job opening
2016-12-19 17:06:26 +05:30
Rushabh Mehta
4c210527b2
[fix] https for SMS gateway, now using requests fixes #5404
2016-12-19 16:22:34 +05:30