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
Rushabh Mehta
688f2284af
[minor] [patch]
2016-12-19 13:15:52 +05:30
Rushabh Mehta
c3d8479443
[minor] allow website user to be selected as employee
2016-12-19 12:32:11 +05:30
Rushabh Mehta
99c814b360
[fix] paging for products (support)
2016-12-19 11:55:10 +05:30
Rushabh Mehta
43d81063f8
Delete zh-tw.csv
2016-12-19 11:52:09 +05:30
Nabin Hait
7feef1f158
test case fixed
2016-12-16 16:50:03 +05:30
Nabin Hait
4d76d27dd2
translations
2016-12-16 16:18:45 +05:30
Nabin Hait
3fe99559ef
Fixed negative stock validation message for translation and fixed test cases
2016-12-16 15:30:43 +05:30
Rohit Waghchaure
6500ef404d
[Fix] Timeout error in item attribute validation
2016-12-16 13:35:50 +05:30
Rushabh Mehta
9277f3250d
[minor] partiall ordered in material request #6858
2016-12-16 12:36:50 +05:30
Rohit Waghchaure
61fb496be6
[Fix] Test case
2016-12-16 12:19:56 +05:30
Nabin Hait
43594b245c
changed version to beta
2016-12-15 19:37:53 +05:30
Nabin Hait
d25db23fdb
[translations]
2016-12-15 18:33:39 +05:30
Nabin Hait
565844cfac
Change log for v7.2.0
2016-12-15 17:49:31 +05:30
Nabin Hait
6eda07e445
Fixed merge conflict
2016-12-15 16:35:58 +05:30
Nabin Hait
8a321406b2
bumped to version 7.1.26
2016-12-15 17:05:32 +06:00
Nabin Hait
f89c96c7a3
Merge branch 'standard_filters' into develop
2016-12-15 14:57:41 +05:30
Nabin Hait
f02f1bb0c7
Added standard filters
2016-12-15 14:57:20 +05:30
Nabin Hait
8c61f343b3
Validate negative stock on delivery while missing valuation rate for booking expenses
2016-12-15 13:46:03 +05:30
Nabin Hait
0c9c6c9608
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2016-12-15 11:52:59 +05:30
Nabin Hait
f49bbe1142
Cleanup of lead and opportunity status updating logic
2016-12-15 11:51:54 +05:30
Rushabh Mehta
01fab2ae1c
[minor] fix salary slip test
2016-12-15 11:43:29 +05:30
Nabin Hait
6a1c0665bc
Merge pull request #7227 from nabinhait/country_coa
...
Chart of accounts for few countries, added test cases for each country
2016-12-15 11:31:07 +05:30
Nabin Hait
a107302224
Merge pull request #7221 from bhupennewalkar1337/production
...
Fix#7085 Issue Items Against Production Order
2016-12-15 11:30:31 +05:30
Rushabh Mehta
e9d9b8e6f0
[fix] demo and process payroll for demo ( #7224 )
...
* [fix] demo and process payroll for demo
* [fix] set payroll dates
2016-12-15 11:27:35 +05:30
Nabin Hait
1ae8e2c8fa
Revert "Revert "email cc test fixes for frappe/frappe#2441"" ( #7232 )
2016-12-15 11:27:02 +05:30
Nabin Hait
e3edfe2b12
Removed quick entry for tax rule
2016-12-14 18:44:27 +05:30
Nabin Hait
a756d64fca
Chart of accounts for some countries, added test cases for each country
2016-12-14 18:40:29 +05:30
Rushabh Mehta
9b049ee154
Revert "[Fixes]Payroll Fixes" ( #7225 )
2016-12-14 18:25:11 +05:30
bhupen
9e146669d3
Issue Items Against Production Order
2016-12-14 17:40:32 +05:30
Nabin Hait
42b6e37d15
Merge pull request #7216 from KanchanChauhan/salary-fixes
...
[Fixes]Payroll Fixes
2016-12-14 16:20:08 +05:30
Kanchan Chauhan
c292dd7213
[Fixes]Payroll Fixes
2016-12-14 15:50:54 +05:30
Nabin Hait
a9ecc0b700
Merge branch 'master' into develop
2016-12-14 14:33:06 +05:30
Nabin Hait
673d43cc8e
bumped to version 7.1.25
2016-12-14 15:03:06 +06:00
Rohit Waghchaure
39712b5e1d
[Fix] Pricing rule issue
2016-12-14 14:12:20 +05:30
Nabin Hait
cdb38de6af
Merge pull request #7209 from bhupennewalkar1337/mendatory
...
[Fix] No exception will be thrown when working hours field is kept blank in workstation #5166
2016-12-14 13:03:17 +05:30
Nabin Hait
db4cfeed0e
Merge pull request #7211 from frappe/shachiTakalkar-patch-1
...
Update adding-margin.md
2016-12-14 12:54:58 +05:30
Nabin Hait
a933713f9d
Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev
...
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
2016-12-14 12:54:04 +05:30
Nabin Hait
aba470f1e6
Merge pull request #7206 from strixaluco/develop
...
[docs] mention UID in LDAP instruction
2016-12-14 12:53:33 +05:30
Nabin Hait
3a8ea2a3bb
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
...
[POS] Provision to delete the offline records
2016-12-14 12:52:28 +05:30
Nabin Hait
36f5471bab
Merge pull request #6855 from neilLasrado/training
...
[new Feature] Added Training Module
2016-12-14 12:51:51 +05:30
Nabin Hait
44cdbbe346
Merge pull request #7203 from KanchanChauhan/employee-permissions
...
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-14 12:50:54 +05:30
Shachi Takalkar
41d4e33682
Update adding-margin.md
2016-12-14 12:41:07 +05:30
Neil Trini Lasrado
6a2fa29b4a
Fixes for training Module
2016-12-14 12:08:28 +05:30
bhupen
52b3924006
mendatory hours field
2016-12-14 11:32:23 +05:30
OluyomiKay
8f8fd39855
erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation
2016-12-14 13:25:58 +08:00
Neil Trini Lasrado
fef568ecfa
Documentation for Training Module
2016-12-13 16:48:50 +05:30
Neil Trini Lasrado
984ee372e8
[new Feature] Added Training Module
2016-12-13 15:42:12 +05:30
bhupen
b42dc5a899
mendatory hours field
2016-12-13 15:25:53 +05:30
strixaluco
757d127844
[docs] mention UID in LDAP instruction
2016-12-13 17:54:41 +08:00
Nabin Hait
80cea9795e
Address naming if multiple address for same type
2016-12-13 14:50:35 +05:30
Nabin Hait
201af80706
Fixed merge conflict
2016-12-13 14:30:32 +05:30
Nabin Hait
9d56d598bf
bumped to version 7.1.24
2016-12-13 14:52:15 +06:00
Kanchan Chauhan
b79aa1d091
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-13 14:16:57 +05:30
Nabin Hait
8ecc14b7bd
Revert "email cc test fixes for frappe/frappe#2441"
2016-12-13 14:11:49 +05:30
Nabin Hait
23165ce0b4
Merge pull request #7185 from KanchanChauhan/salary-test-cases
...
[Fix] Salary Slip test cases fix
2016-12-13 12:40:19 +05:30
Kanchan Chauhan
d917b66a31
[Fix] Salary Slip test cases fix
2016-12-13 12:12:49 +05:30
Nabin Hait
ee877fd631
Merge pull request #7199 from RobertSchouten/email_cc_dev
...
email cc test fixes for frappe/frappe#2441
2016-12-13 11:31:06 +05:30
Nabin Hait
784f6cc31a
Merge pull request #7181 from KanchanChauhan/sales-person-status
...
Added "Enabled" to Sales Person
2016-12-13 11:28:36 +05:30
Nabin Hait
346a6a5d84
Update set_sales_person_status.py
2016-12-13 11:27:46 +05:30
Nabin Hait
82ce67d49a
Merge pull request #7190 from KanchanChauhan/jinja-in-tc
...
Jinja template in Terms and Conditions
2016-12-13 11:25:07 +05:30
Nabin Hait
18d6dc0459
Merge pull request #7193 from KanchanChauhan/get-project-task
...
Show only Project tasks in depends on tasks
2016-12-13 11:24:11 +05:30
Nabin Hait
c5869a00df
Merge pull request #7194 from rohitwaghchaure/pricing_rule_issue_v7_1
...
[Fix] Ignore pricing rule not removed the discount percentage
2016-12-13 11:22:49 +05:30
Nabin Hait
9a1a4cd0ac
Fixed test cases for item / warehouse renaming
2016-12-13 10:46:50 +05:30
Rohit Waghchaure
2976e56d23
[Fix] Ignore pricing rule not removed the discount percentage
2016-12-13 10:28:27 +05:30
robert schouten
3d22eb1d59
email cc test fixes for frappe/frappe#2441
2016-12-13 11:32:09 +08:00
Kanchan Chauhan
f0b0db444d
Added Is Active to Sales Person
2016-12-12 19:12:41 +05:30
Kanchan Chauhan
a72841e5e5
Show only Project tasks in depends on tasks
2016-12-12 18:33:46 +05:30
Nabin Hait
da3a9e255d
Changed fieldtype of opening stock from Int to Float
2016-12-12 18:22:15 +05:30
Kanchan Chauhan
b642625ed2
Jinja template in Terms and Conditions
2016-12-12 17:34:30 +05:30
Nabin Hait
f67799197d
Merge pull request #7189 from nabinhait/fix_10111
...
Rename and merging of Item and Warehouse
2016-12-12 17:27:38 +05:30
Nabin Hait
f09c6679c7
Merge pull request #7187 from rohitwaghchaure/budget_report_issue
...
[Fix] Budget variance report based on cost center/project
2016-12-12 17:25:44 +05:30
Nabin Hait
37104b6bb1
Merge pull request #7184 from rohitwaghchaure/dropship_po_issue
...
[Fix] Unable to purchase item in the company warehouse if dropship has enabled
2016-12-12 17:24:48 +05:30
Rohit Waghchaure
9f2cc382a8
[POS] Provision to delete the offline records
2016-12-12 17:15:47 +05:30
Nabin Hait
fb1fb83b8c
[tests] Test cases for Item and Warehouse renaming and merging
2016-12-12 17:01:24 +05:30
Rohit Waghchaure
f4074c2029
[Fix] Budget variance report
2016-12-12 16:48:14 +05:30
Nabin Hait
3ef63bef02
Rename and merging of Item and Warehouse and patch to fix deleted bins
2016-12-12 15:37:52 +05:30
Nabin Hait
142aab79bf
Fieldtype of payment url should be Small Text
2016-12-12 15:37:52 +05:30
Nabin Hait
0fa0af18cc
Merge pull request #7175 from neilLasrado/develop
...
Student Attendance Tool
2016-12-12 15:03:59 +05:30
Rohit Waghchaure
c858d52ce7
[Fix] Unable to purchase item in the company warehouse if dropship has enabled
2016-12-12 13:06:06 +05:30
Rohit Waghchaure
5664f8553e
[Fix] Item group missing in the POS profile
2016-12-12 12:28:07 +05:30
Neil Trini Lasrado
eccbf43235
Renamed Student Batch Attendance Tool to Student Attendance Tool
...
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
2016-12-09 17:41:09 +05:30
Saurabh
940084ed59
[minor][fix] show tax rate if account type is tax
2016-12-09 17:38:36 +05:30
Rushabh Mehta
81af229466
[minor] google analytics id in docs and minor fixes to web forms
2016-12-09 17:29:36 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +05:30
Nabin Hait
10de98c0be
bumped to version 7.1.23
2016-12-09 16:15:45 +06:00
Nabin Hait
00ae31bd1c
Merge pull request #7172 from nabinhait/hotfix
...
Issue fixed in Quality Inspection, P&L period and purchase register
2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8
Merge pull request #7171 from rohitwaghchaure/payment_entry_issue
...
[Fix] Payment entry showing wrong invoice amount
2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0
Fixed period end date if year starts in the middle of the month
2016-12-09 15:09:11 +05:30
Nabin Hait
76a8508d2b
Unlink Quality Inspection from PR while cancelling QI
2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176
Fixed renamed fieldname
2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887
[Fix] Payment entry showing wrong invoice amount
2016-12-09 12:55:29 +05:30
Nabin Hait
abd5a92bcc
Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1
...
Exchange rate base on date
2016-12-09 12:34:15 +05:30
Nabin Hait
a0fc404eb8
Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix
...
[Fix] Quoted Item Comparison
2016-12-09 12:18:06 +05:30
Nabin Hait
8e885163a3
Update quoted_item_comparison.py
2016-12-09 12:17:45 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
d249c76ce0
Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups
...
[Minor]Added type to Salary Components
2016-12-09 11:50:43 +05:30
Viet Pham
ddb856377c
Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null
2016-12-08 20:02:39 +07:00
Kanchan Chauhan
13f19993c5
[Minor]Added type to Salary Components
2016-12-08 17:50:15 +05:30
Kanchan Chauhan
5c031a3512
[Fix] Quoted Item Comparison
2016-12-08 17:29:04 +05:30
Kanchan Chauhan
0ece9e0e2e
[Fix] Salary Slip Test cases fix
2016-12-08 17:02:36 +05:30
Nabin Hait
352d95344e
Set exchange rate on change of date for Journal/Payment Entry
2016-12-08 16:06:47 +05:30
Nabin Hait
aa0d174d3d
Replaced spaces with tabs
2016-12-08 15:44:16 +05:30
Nabin Hait
3113f00c46
Replaced spaces with tabs
2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
b267a6c90e
Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1
2016-12-08 14:45:12 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
32e5b7af20
Update set_budget_against_as_cost_center.py
2016-12-08 14:42:04 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b
Merge pull request #7094 from manassolanki/budget
...
[Enhancement] Budget Against Project #7036
2016-12-08 13:52:33 +05:30
Nabin Hait
f5460e9e6f
Merge pull request #6846 from KanchanChauhan/payroll-updates
...
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
2016-12-08 13:51:55 +05:30
Nabin Hait
ded059b253
[fix][tests] Fetching serial nos via get item details
2016-12-08 13:20:43 +05:30
Nabin Hait
1b9caf90dd
Merge branch 'master' into develop
2016-12-08 12:33:54 +05:30
Nabin Hait
7b513891e3
bumped to version 7.1.22
2016-12-08 13:03:53 +06:00
Kanchan Chauhan
f7b25cbb6b
[WIP] Payroll Updates
2016-12-08 12:20:20 +05:30
Manas Solanki
482fa672c2
[Fix] Patch for budget_against
2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Rohit Waghchaure
0327b35b5e
[fix] timesheet datetime issue
2016-12-07 18:32:36 +05:30
Manas Solanki
2e0fbdeebe
[Fix] Test Case
...
- Previous test case fixed
- Additional test case for project against budget
2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf
[Fix] More optimized code
2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932
[Fix] Budget against Projects
...
- Test case fixed
- Either cost center or project is mandatory
2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482
[Enhancement] Budget against Project
2016-12-07 18:17:26 +05:30
Rushabh Mehta
b78fc37ce9
[minor] Add button to add help article from Issue #7132 ( #7154 )
2016-12-07 14:41:23 +05:30
James Robertson
e4b9473f83
Fixes erpnext issue 6891 ( #7128 )
...
* Fixes erpnext issue 6891
Updated all 4 items listed on the issue. Removed old out of date image
files and created new ones. Fixed broken links.
* Update to Pull Request #7128
Changes to images to comply with guidelines.
2016-12-07 12:14:51 +05:30
Rushabh Mehta
2167ff589c
[minor] update font awesome icons
2016-12-07 11:09:02 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
bc2deafcf9
bumped to version 7.1.21
2016-12-06 16:44:44 +06:00
Nabin Hait
45fda8a257
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
...
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
2016-12-06 16:01:38 +05:30
Nabin Hait
67d226f491
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
...
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-06 15:48:47 +05:30
Nabin Hait
cb3f44716a
Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue
...
[Fix] Currecny symbol for customer's total annual billing, total unpaid amount
2016-12-06 15:42:37 +05:30
Nabin Hait
9313a7408c
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
...
[Enhancement] Total row added for report builder
2016-12-06 15:42:19 +05:30
Nabin Hait
e644ca8992
Merge pull request #7146 from RobertSchouten/digest_cache_dev
...
[fix] email digest cache by frequency
2016-12-06 15:41:33 +05:30
Nabin Hait
cacfb6839f
Merge pull request #7138 from rohitwaghchaure/so_po_status_issue
...
[Fix] Status of sales order and purchase order
2016-12-06 15:40:57 +05:30
Kanchan Chauhan
dc80b35104
[Minor] Apply Salary Slip validation only if it is submitted
2016-12-06 15:37:24 +05:30
robert schouten
7f72cd0f97
[fix] email digest cache by frequency
2016-12-06 08:51:40 +08:00
Rohit Waghchaure
6f6a533d66
[fix] salary slip working days
2016-12-05 23:33:02 +05:30
Rohit Waghchaure
36a01d3464
[Enhancement] Total row added for report builder
2016-12-05 18:59:59 +05:30
Rohit Waghchaure
bcc6ea450a
[fix] test cases for customer credit
2016-12-05 18:32:57 +05:30
Neil Trini Lasrado
f5c2cf4b5c
Updated schools.py in Config
2016-12-05 17:53:41 +05:30
Rohit Waghchaure
c857f37f3a
[fix] currecny symbol for customer's total annual billing, total unpaid amount
2016-12-05 17:44:06 +05:30
Neil Trini Lasrado
9e7ad6a630
Updated schools.py in Config
2016-12-05 17:28:07 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Nabin Hait
4306cc80d0
removed print
2016-12-05 16:51:30 +05:30
Rohit Waghchaure
82fa27c36f
[Fix] Status of sales order and purchase order
2016-12-05 16:32:23 +05:30
Rushabh Mehta
86f8ab95f6
[minor] font-awesome fixes
2016-12-05 15:02:24 +05:30
Nabin Hait
12a396ef25
Merge pull request #7107 from RobertSchouten/timesheetdates
...
calc timesheet dates on validate not just submit
2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
4a888b4c91
[Fix] lwp issue fixed for salary slip without salary structure
2016-12-04 13:42:30 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
Neil Trini Lasrado
6841b3198b
Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance
2016-12-01 18:40:49 +05:30
Neil Trini Lasrado
305166b111
Fixes for Student Batch Wise attendance tool
2016-12-01 18:40:49 +05:30
Nabin Hait
14a4c729b3
Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart
...
Apply Pricing Rule in Shopping Cart
2016-12-01 18:09:34 +05:30
Nabin Hait
6c44d259ca
Merge pull request #7106 from pratu16x7/doc-fixes
...
CRM: Customer page fixes
2016-12-01 18:09:02 +05:30
Nabin Hait
1ab446a810
Merge pull request #7086 from frappe/netchampfaris-documentation
...
Update quotation.md
2016-12-01 18:08:36 +05:30
Nabin Hait
cd43d3aa20
Merge pull request #7088 from rohitwaghchaure/documentation_november
...
[fix] Documentation
2016-12-01 18:08:05 +05:30
Nabin Hait
ee9d1b4520
Merge pull request #7099 from ishanloya/patch-1
...
Update merging-documents.md
2016-12-01 18:07:49 +05:30
Nabin Hait
feec1abb6e
Merge pull request #7103 from bhupennewalkar1337/delivery-note-fix
...
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-12-01 18:07:28 +05:30
Nabin Hait
d97ec828b5
Merge pull request #7113 from rohitwaghchaure/edit_serial_no
...
Allow user to edit serial no for credit note, debit note
2016-12-01 18:06:58 +05:30
Neil Trini Lasrado
71aaeae91c
Fixes for Student Batch-Wise Attendance report and Absent Student Report
2016-12-01 16:48:27 +05:30
Nabin Hait
1f1ffd79e2
Merge pull request #7109 from RobertSchouten/project_wise
...
[fix] Project wise Stock Tracking is script report
2016-12-01 16:12:46 +05:30
Nabin Hait
c92e2f9044
Update project_wise_stock_tracking.json
2016-12-01 16:12:35 +05:30
Rohit Waghchaure
2e8a94458d
allow user to edit serial no for credit note, debit note
2016-12-01 16:04:41 +05:30
Neil Trini Lasrado
e6fb25cce8
Fixes for Student Batch-Wise Attendance report
2016-12-01 16:02:11 +05:30
Kanchan Chauhan
faa525e4f1
[Fix] Fixed condition and formula issue in Salary Slip
2016-12-01 15:31:38 +05:30
Neil Trini Lasrado
19e8bd2221
renamed 'active' in Student Batch to 'enabled'
2016-12-01 14:30:47 +05:30
Neil Trini Lasrado
c6e74680ee
Added Instructor as a Role
2016-12-01 13:00:14 +05:30
Neil Trini Lasrado
2607898cde
Added Student Batch-Wise Attendance report
2016-12-01 12:53:40 +05:30
robert schouten
81a5467c8f
[fix] Project wise Stock Tracking is script report
2016-12-01 09:02:17 +08:00
robert schouten
0beb5bdea6
calc timesheet dates on validate not just submit
2016-12-01 08:51:03 +08:00
pratu16x7
9dd34427ef
Change alt text and German page image link
2016-11-30 15:48:14 +05:30
pratu16x7
d849093dff
CRM: Customer page fixes
2016-11-30 15:41:30 +05:30
bhupen
3c7e70ffb3
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-11-30 14:32:11 +05:30
Ishan Loya
a40cefeaeb
Update merging-documents.md
...
Fixed some typos
2016-11-29 16:07:33 +05:30
Faris Ansari
a2ea2ca990
Update sales-order.md
2016-11-29 11:32:11 +05:30
Faris Ansari
8da43fe074
add selling-flow
2016-11-29 11:22:57 +05:30
Faris Ansari
d0654912c4
Update quotation.md
2016-11-29 11:21:40 +05:30
Neil Trini Lasrado
87edfef0bb
Added ability to mark student batch in-active
2016-11-28 18:09:50 +05:30
Neil Trini Lasrado
331361d03b
Added Absent Student Report
2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
14b27c5b42
New Doctype - Student Leave Application
2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
d3a410b0f3
Added Student Monthly Attendence Sheet Report
2016-11-28 16:57:30 +05:30
Rohit Waghchaure
59844a12aa
[fix] documentation
2016-11-28 15:51:05 +05:30
Nabin Hait
7f3da5dbb1
Fixed merge conflict
2016-11-28 14:23:51 +05:30
Nabin Hait
edfca16931
bumped to version 7.1.20
2016-11-28 14:52:54 +06:00
Faris Ansari
834a3c990e
fix image link
2016-11-28 13:16:57 +05:30
Faris Ansari
64d1c95afe
add taxes gif
2016-11-28 13:15:29 +05:30
Faris Ansari
a9b34edef0
Update quotation.md
2016-11-28 13:08:49 +05:30
Nabin Hait
ac3ad62164
Merge pull request #7052 from saurabh6790/integration_service_document
...
[documentaion] Documentaion for setting up Integration Service
2016-11-28 12:43:21 +05:30
Nabin Hait
50a240e758
Merge pull request #7061 from rohitwaghchaure/cost_center_issue
...
[Fix] Cost center group not showing data in the P&L report
2016-11-28 12:42:48 +05:30
Nabin Hait
b6c7420a34
Merge pull request #7068 from frappe/MaxMorais-patch-1
...
Bug due Translation support in Support Analytics
2016-11-28 12:41:52 +05:30
Nabin Hait
8020b5ceb7
Merge pull request #7063 from umairsy/conf
...
[Fixed] Documentation #6892
2016-11-28 12:40:55 +05:30
Nabin Hait
fe10780878
Merge pull request #7076 from yashodhank/manual-fixes
...
[Docs] Fixed type and renamed file
2016-11-28 12:39:57 +05:30
Nabin Hait
96be3dd4f4
Merge pull request #7082 from rohitwaghchaure/pos_qty_issues
...
[Fix] Wrong actual qty showing in POS
2016-11-28 12:39:09 +05:30
Nabin Hait
a78c463e97
Multiple minor fixes
2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c
[Fix] Wrong actual qty showing in POS
2016-11-27 12:04:12 +05:30
Yashodhan K
7b090312d5
[Docs] Fixed type and renamed file
...
Fixed typo and renamed file to correct url link.
2016-11-26 20:08:02 +05:30
Kanchan Chauhan
50593317d9
Added account types to Add Child option of COA
2016-11-26 18:49:32 +05:30
Nabin Hait
d0839799c1
Update workstation.py
2016-11-26 09:54:00 +05:30
Rohit Waghchaure
bca0d73e1c
[Fix] Cost center group not showing data in the P&L report
2016-11-25 14:54:34 +05:30
Rohit Waghchaure
9a36083095
[fix] Barcode and special character issue in the search box of the POS
2016-11-25 11:17:48 +05:30
Nabin Hait
672ffc0ff4
Update patches.txt
2016-11-25 11:15:20 +05:30
Maxwell Morais
2f948530cb
Bug due Translation support in Support Analytics
...
I think no one that don't speak english use this!
But today talking about this report, I discovered that it dont work!
For my surprise, it don't work have 2 years, if you aren't a english speaker!
2016-11-24 20:36:40 -06:00
