suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Kanchan Chauhan
1cd5e583ba
[Fix] Apply Now button redirect fixed for Job Opening
2017-02-10 17:58:41 +05:30
KanchanChauhan
cc2c7649a8
[Minor] Stock Entry Fix ( #7715 )
2017-02-10 17:47:49 +05:30
Nabin Hait
bdd470a6d1
Update item.py
2017-02-10 17:12:48 +05:30
Rohit Waghchaure
2f09dc0e62
[Fix] Valuation method changing issue in the item
2017-02-10 15:29:45 +05:30
Nabin Hait
29dfb9479b
Merge pull request #7710 from joolsr/patch-1
...
Update customer.md
2017-02-10 13:23:06 +05:30
Ben Cornwell-Mott
67a13972fb
Added warehouse to BOM Stock Report, fixed bugs with buildable qty
2017-02-09 23:21:52 -08:00
Nabin Hait
5a69f24dfe
Merge pull request #7705 from rmehta/stock-entry-fix
...
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-10 12:51:09 +05:30
Nabin Hait
b41b10976f
Merge pull request #7644 from mbauskar/develop
...
[docs] Feedback triggers
2017-02-10 12:13:31 +05:30
mbauskar
edaa43d9b8
[docs] manual feedback request and minor fixes
2017-02-10 11:28:45 +05:30
bcornwellmott
630882787a
Added buildable qty
...
The field indicates how many can be built.
2017-02-09 20:41:12 -08:00
bcornwellmott
fc41bb6afd
Fixed code issues
...
Also changed qty to Quantity left to build
2017-02-09 20:37:11 -08:00
joolsr
f9fdbe2853
Update customer.md
2017-02-09 23:10:39 +00:00
Rushabh Mehta
cf99dc0e77
[fix] for setup wizard tests and demo;
2017-02-09 18:06:11 +05:30
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
mbauskar
d487bf77e1
[minor] payment entry company trigger
2017-02-09 12:57:25 +05:30
Nabin Hait
2b5fa7647a
Merge pull request #7662 from nick9822/patch-2
...
Sales analytics error after upgrade
2017-02-09 11:45:30 +05:30
Nabin Hait
e27a0d25bc
Merge pull request #7654 from rohitwaghchaure/lead_tax_issue
...
[Fix] Set default tax on quotation when it's making from the lead
2017-02-09 11:43:22 +05:30
khatrijitendra
d262eb1a1c
issue in type and rate
...
1. there is not such field, "type" it is "margin_type"
2. there is not such field, "rate" it is "margin_rate_or_amount"
2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
57e97c06e6
bumped to version 7.2.19
2017-02-08 12:02:47 +06:00
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b
Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center
...
[Fix] Allow data import tool for cost center
2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Ben Cornwell-Mott
05dca985e6
Fixed stock query and corrected with suggestions from rohit
2017-02-07 09:15:33 -08:00
mbauskar
1df0b9bfed
[minor] minor fixes in feedback index.md
2017-02-07 15:20:08 +05:30
mbauskar
298acd3d1a
[docs] Feedback triggers
2017-02-07 15:20:08 +05:30
Nabin Hait
70fd8546ce
Merge pull request #7677 from KanchanChauhan/serial-no-in-return
...
[Fix] Serial No if is_return
2017-02-07 13:28:30 +05:30
Nabin Hait
555279b6e6
Merge pull request #7680 from bcornwellmott/patch-7
...
Duplicate "title" field
2017-02-07 13:27:46 +05:30
Nabin Hait
ddcb514b65
Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview
...
[Fix] Employee Details in Salary Slip preview
2017-02-07 13:27:24 +05:30
Nabin Hait
0a6aaf4257
Get standard/historical valuation rate where missing: some minor fixes
2017-02-07 12:50:22 +05:30
mbauskar
9c0bf73d25
[minor] auto close issue using ORM (document save method)
2017-02-07 12:50:05 +05:30
Kanchan Chauhan
842ad55235
[Fix] Employee Details in Salary Slip preview
2017-02-07 12:07:55 +05:30
Kanchan Chauhan
4f3b0aa249
[Fix]Serial No if is_return
2017-02-07 11:28:34 +05:30
Ben Cornwell-Mott
02c02bc572
Fixed counting to correctly reflect all status at each month
2017-02-06 20:58:25 -08:00
Nabin Hait
ea8fab52c6
Get standard/historical valuation rate where missing, if item is not a sample item
2017-02-07 01:24:32 +05:30
bcornwellmott
92b6ceec41
Duplicate "title" field
...
The title field was duplicated - removed first one.
2017-02-06 10:51:02 -08:00
Neil Trini Lasrado
2160638f36
Merge pull request #7679 from neilLasrado/stud-group
...
Added validation to check if Student in a student group exists in the…
2017-02-07 00:17:24 +05:30
Neil Trini Lasrado
c28598ae8b
Merge pull request #7678 from neilLasrado/stud-att
...
Added validations to Student Attendance
2017-02-07 00:17:14 +05:30
Neil Trini Lasrado
3ade874f9e
Added validations to Student Attendance
2017-02-06 20:07:02 +05:30
Neil Trini Lasrado
05dec9a880
Added validation to check if Studnet in a student group exists in the student batch specified
2017-02-06 20:05:16 +05:30
mbauskar
c874a82559
[minor] index out of range fixes for JE
2017-02-06 15:41:34 +05:30
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Rushabh Mehta
50862039dc
[minor] fixes to schools
2017-02-06 14:28:52 +05:30
Rohit Waghchaure
ade06f940c
[Fix] Set default tax on quotation when it's making from the lead
2017-02-06 12:14:09 +05:30
Nabin Hait
259489572d
Merge pull request #7657 from rmehta/po-from-so
...
[enhance] production order from sales order
2017-02-06 11:41:56 +05:30
Nabin Hait
101aaed643
Merge pull request #7614 from KanchanChauhan/account-filters-payroll
...
[Fix] Account filter in Process Payroll and Salary Component
2017-02-06 11:36:48 +05:30
Nabin Hait
20d2d7548a
Update salary_component.js
2017-02-06 11:36:38 +05:30
Ben Cornwell-Mott
28945438f2
Created button to link buying items to material requests
2017-02-05 18:55:57 -08:00
Ben Cornwell-Mott
36d04fda37
Fixed filter dates and date comparisons
2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott
b4a2c2f047
Got proper cumulative data working
2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott
943124275d
Production Analytics
2017-02-04 14:25:53 -08:00
rohitwaghchaure
ac65e956e8
Merge pull request #7659 from saurabh6790/demo_user_perm_fix
...
[minor][fix] demo user perm fix
2017-02-03 16:51:33 +05:30
Rushabh Mehta
e92a740b53
[minor] school patch fix
2017-02-03 16:05:53 +05:30
nick9822
acb5e9a11b
Sales analytics error after upgrade
...
Hi Team,
We were getting errors in sales analytics report after the upgrade.
https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6
With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item.
Please see whether its good or there is better solution for it.
Thanks,
Nick
2017-02-03 12:31:54 +05:30
Saurabh
9ca3f2847a
a[minor][fix] demo user perm fix
2017-02-02 19:22:36 +05:30
Rushabh Mehta
6ede4a3809
[enhance] production order from sales order
2017-02-02 17:42:01 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
rohitwaghchaure
3f10c7f4fc
Merge pull request #7609 from rmehta/remove-party-status
...
Remove Party Status
2017-02-02 16:10:26 +05:30
KanchanChauhan
6575a0a7e2
[Minor]ROI fix in Employee Loan ( #7643 )
2017-02-02 16:01:43 +05:30
Rushabh Mehta
a3d0bea375
Merge branch 'develop' into remove-party-status
2017-02-02 15:42:04 +05:30
Kanchan Chauhan
3e2ecc3423
[Fix] Account filter in Process Payroll and Salary Component
2017-02-02 14:41:48 +05:30
Nabin Hait
6b9902627d
Merge pull request #7638 from rohitwaghchaure/gross_profit_report_issue
...
[Fix] Buying rate in gross profit report
2017-02-02 13:41:32 +05:30
Nabin Hait
c62362f064
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
...
[Fix] Employee name fixes in Salary Structure
2017-02-02 13:30:05 +05:30
Kanchan Chauhan
a0314f19ca
[Fix] Employee name fixes in Salary Structure
2017-02-02 12:56:56 +05:30
Neil Trini Lasrado
4aabe61197
Patch for renaming evaluation criteria
2017-02-01 19:32:28 +05:30
Rohit Waghchaure
69060a8177
Minor fix
2017-02-01 19:14:53 +05:30
Neil Trini Lasrado
749516c22d
Renamed Evaluation Criteria to Assessment Criteria
2017-02-01 18:47:36 +05:30
Rushabh Mehta
3714626dd0
[minor] enhance BOM view
2017-02-01 18:35:53 +05:30
KanchanChauhan
b499fe91fa
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:16:35 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
KanchanChauhan
929c3890a4
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
...
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44
Salary Structure Employee custom field can be used in Formula and Condition ( #7615 )
2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d
[Fix] Rate of Interest Fix
2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e
Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
...
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:41:36 +05:30
Rohit Waghchaure
38f808cfae
[Fix] Buying rate in gross profit report
2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
587dd90182
[minor] removed customer status
2017-02-01 12:01:24 +05:30
Rushabh Mehta
99ce531beb
[minor] css for team updates
2017-02-01 11:46:47 +05:30
Neil Trini Lasrado
d408553b93
Merge pull request #7623 from neilLasrado/guardian
...
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 18:18:50 +05:30
Neil Trini Lasrado
ebfb7ff027
Merge pull request #7625 from neilLasrado/student-batch
...
Added Mark Assessment Result Button in assessment plan
2017-01-31 18:18:32 +05:30
Neil Trini Lasrado
879a2d84dc
Added Evaluation Criteria Group
2017-01-31 17:03:37 +05:30
Neil Trini Lasrado
477c88450f
UI fixes for Guardian Doctype
2017-01-31 16:49:39 +05:30
Neil Trini Lasrado
9071bcbfa8
Added Student table in Guardian (Only rendered for display purpose)
2017-01-31 16:36:29 +05:30
Rushabh Mehta
7ec4b717ed
[feature] added team updates page
2017-01-31 11:42:58 +05:30
Rohit Waghchaure
d9a265fab1
Merge branch 'develop' of github.com:frappe/erpnext into develop
2017-01-31 11:34:07 +05:30
Neil Trini Lasrado
1947aca2a8
Added Mark Assessment Result Button in assessment plan
2017-01-30 18:34:25 +05:30
Neil Trini Lasrado
ba96ce7dd5
Merge pull request #7616 from neilLasrado/assessment-validations
...
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:37 +05:30
Neil Trini Lasrado
fd1767d2ea
Patch fix for Update Assessment Module Patch
2017-01-30 17:50:05 +05:30
Rushabh Mehta
4500f7b4d6
[cleanup] remove unused LMS ( #7612 )
2017-01-30 17:04:38 +05:30
Neil Trini Lasrado
ab1ee1e6fc
Patch fix for Update Assessment Module Patch
2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
80ca65c166
Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.
2017-01-30 15:28:41 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Rushabh Mehta
364f48aad2
[minor] fix patch
2017-01-30 13:23:09 +05:30
Rushabh Mehta
87037bdd56
[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568
2017-01-30 13:22:51 +05:30
Makarand Bauskar
d893efd0a9
[minor] replace object values in translations ( #7602 )
2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738
Merge pull request #7571 from RicardoJohann/projectfilter
...
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
Rohit Waghchaure
b327429db7
[Fix] Allow data import tool for cost center
2017-01-30 11:34:29 +05:30
mbauskar
16ce3623bc
[fixes] set lead to Null on delete company transaction & other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
7fa039f15c
[fixes] delete company transaction and other minor fixes
2017-01-30 10:45:28 +05:30
mbauskar
83f4780f74
[Fixes] Address and Contact fixes
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
rohitwaghchaure
531b49f6c7
Merge pull request #7590 from KanchanChauhan/rename-task
...
[Minor]Task rename now possible
2017-01-30 09:29:10 +05:30
KanchanChauhan
2dfb90a922
Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
...
[Fix] Permissions to view Leave Balance Report
2017-01-29 21:07:02 +05:30
Rohit Waghchaure
92c9ad8c72
Merge branch 'master' into develop
2017-01-28 14:14:33 +05:30
Rohit Waghchaure
ce4a0b20ab
bumped to version 7.2.18
2017-01-28 14:44:32 +06:00
Kanchan Chauhan
b77eaf7053
[URGENT][FIX]Stock Controller fix
2017-01-28 13:26:46 +05:30
Neil Trini Lasrado
6d0da98a78
Fixes to update student guardian name patch
2017-01-27 17:44:28 +05:30
Neil Trini Lasrado
7ff5682193
Merge branch 'develop' into guarding-name
2017-01-27 16:54:50 +05:30
Neil Trini Lasrado
f36ff488c0
Added Guardian Name to Student Master
2017-01-27 16:53:55 +05:30
Rushabh Mehta
e239d4dfe9
Merge branch 'master' into develop
2017-01-27 16:18:26 +05:30
Rushabh Mehta
098bd34f00
bumped to version 7.2.17
2017-01-27 16:48:25 +06:00
Rushabh Mehta
063e86a1bf
[fix] remove on_update in Item
2017-01-27 16:16:08 +05:30
Rushabh Mehta
b5eaf324b3
Merge branch 'master' into develop
2017-01-27 16:03:30 +05:30
Rushabh Mehta
5f0027a2d0
bumped to version 7.2.16
2017-01-27 16:33:29 +06:00
Rushabh Mehta
fd82f4b0d4
[minor] fix for item_group.py
2017-01-27 16:00:47 +05:30
Rushabh Mehta
710dc5392f
[merge]
2017-01-27 15:48:31 +05:30
Rushabh Mehta
149c033c8f
bumped to version 7.2.15
2017-01-27 16:16:07 +06:00
Neil Trini Lasrado
7326217ab5
Added 'Active' checkbox in list view for Student Batch and Student Group
2017-01-27 14:50:48 +05:30
Neil Trini Lasrado
8c3fb43d8a
Fix- Student batch strength in Batch Wise attendance report
2017-01-27 14:13:25 +05:30
Kanchan Chauhan
3dd85a0e9e
Task rename now possible
2017-01-27 12:34:06 +05:30
Kanchan Chauhan
e877ecfb7b
[Fix] Permissions to view Leave Balance Report
2017-01-27 11:53:56 +05:30
noussh
425d7adcdd
Update recurring-orders-and-invoices.md
2017-01-26 15:38:57 +04:00
noussh
0350db6a4e
added next link
2017-01-26 15:35:01 +04:00
noussh
1e86546e2c
added the link
2017-01-26 12:53:45 +04:00
noussh
6396c90956
Update multi-currency-accounting.md
2017-01-26 12:52:29 +04:00
noussh
47fbc7efa5
adde the next page link
2017-01-26 12:50:34 +04:00
noussh
8b62626cec
Wrong path updated
2017-01-25 19:44:32 +04:00
Nabin Hait
355b4110c9
Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
...
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 19:21:04 +05:30
Nabin Hait
cb19f52985
Update stock_controller.py
2017-01-25 19:20:35 +05:30
Rohit Waghchaure
3899d74f15
[Fix] Get valuation rate from item master and update stock value difference
2017-01-25 18:47:53 +05:30
Nabin Hait
57e4ab70be
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
...
New screenshots for Calendar user manual
2017-01-25 17:35:01 +05:30
Nabin Hait
d288909310
Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
...
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-25 17:23:43 +05:30
Kanchan Chauhan
ce116417e1
New screenshots for Calendar user manual
2017-01-25 15:38:35 +05:30
robert schouten
67eff49516
[fix] compact print format not longer ignores format builder
2017-01-25 08:20:43 +08:00
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
vrms
1f1f56225c
Update warehouse.md ( #7544 )
...
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
2017-01-24 11:29:27 +05:30
KanchanChauhan
4333ce0fd8
Merge pull request #7569 from neilLasrado/assessment
...
Fix for update assessment modules patch
2017-01-24 10:52:50 +05:30
Neil Trini Lasrado
15c5ae0918
Fix for update assessment modules patch
2017-01-24 10:28:49 +05:30
Kanchan Chauhan
679cc23abb
[Fix] Naming series issue fix
2017-01-23 17:20:55 +05:30
Kanchan Chauhan
c948a4fc92
Patch to update Salary Detail where Salary Component Abbr is null
2017-01-23 16:12:45 +05:30
rohitwaghchaure
ab65f6d8b1
Merge pull request #7547 from mnatalia/develop
...
Added translations to the web page and item dashboard.
2017-01-23 15:57:33 +05:30
Neil Trini Lasrado
d471ad2c45
Fix for update assessment modules patch
2017-01-23 14:59:19 +05:30
Makarand Bauskar
01eefafad5
[minor] minor fixes in opportunity form ( #7549 )
2017-01-23 12:15:36 +05:30
Rushabh Mehta
397e508fc0
[fix] sales_partner.js, fixes #7553
2017-01-21 16:58:57 +05:30
Nabin Hait
1f9d1bb877
Merge branch 'develop' into assessment
2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3
Added ability to disable a student in student group/studnet batch
2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Nabin Hait
a1d3d84415
bumped to version 7.2.14
2017-01-20 16:10:35 +06:00
Nabin Hait
c1cc7b68c4
Merge pull request #7522 from nabinhait/hotfix
...
Get valuation rate from Item while not found based on SLE
2017-01-20 15:39:24 +05:30
mnatalia
e09407571c
Added translations to the web page and item dashboard.
2017-01-20 12:00:25 +02:00
Nabin Hait
4c952f48f8
Some minor fixes
2017-01-20 15:15:31 +05:30
Nabin Hait
bd1a628c55
Merge pull request #7545 from rohitwaghchaure/minor_issue
...
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f
[Fix] Account user not able to access the report
2017-01-20 14:18:17 +05:30
Nabin Hait
548cf183ea
Merge pull request #7543 from RobertSchouten/leave_allocation_fix
...
[fix] remove invalid parameter from leave allocation
2017-01-20 12:54:55 +05:30
Nabin Hait
153156e31a
Merge pull request #7529 from rohitwaghchaure/budget_issue
...
[Fix] Budget not working properly
2017-01-20 12:54:29 +05:30
Nabin Hait
a0b967f2cd
Get valuation rate from Item while not found based on SLE
2017-01-20 12:50:40 +05:30
Nabin Hait
f356e539bb
Update set_null_value_to_fields.py
2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd
[Fix] Budget not working properly
2017-01-20 12:33:50 +05:30
robert schouten
e14e042f2f
[fix] remove invalid parameter from leave allocation
2017-01-20 15:02:00 +08:00
Nabin Hait
bfcacbf2ca
Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue
...
[Fix] Minor issue in landed cost voucher
2017-01-20 12:12:17 +05:30
Rohit Waghchaure
a3a977d02a
[Fix] Minor issue in landed cost voucher
2017-01-19 18:38:53 +05:30
Kanchan Chauhan
03dc695c77
[Minor] Set website warehouse as default warehouse
2017-01-19 14:57:05 +05:30
Rushabh Mehta
c81621d3ce
[minor] add progress bar in patch
2017-01-19 14:32:36 +05:30
Rushabh Mehta
00d3cd6d64
[fix] contact address link patch
2017-01-19 14:27:02 +05:30
Rushabh Mehta
818af75575
[patch] add patch for contact_address_update
2017-01-19 13:08:46 +05:30
Rushabh Mehta
d69fd1b8c0
[fix] update_salary_slip.py
2017-01-19 12:51:37 +05:30
Rushabh Mehta
683d98fd54
[fix] update_salary_slip.py
2017-01-19 12:48:03 +05:30
Rushabh Mehta
35e4d8b152
[fix] update_salary_slip.py
2017-01-19 12:47:27 +05:30
Rushabh Mehta
60908f4a08
[fix] update_salary_slip.py
2017-01-19 12:46:11 +05:30
Rushabh Mehta
26fdb113a8
[fix] update_salary_slip.py
2017-01-19 12:44:54 +05:30
Kanchan Chauhan
45c14ed41c
[Minor] Date fix in Production Order
2017-01-19 12:22:04 +05:30
Nabin Hait
eb80fdef82
Merge pull request #7520 from RobertSchouten/heatmap_limit_dev
...
[fix] accounts heatmaps now covering 366 days not 20
2017-01-19 09:15:20 +05:30
Nabin Hait
6b3670848e
Merge pull request #7477 from rmehta/custom-perms
...
[minor] fix for custom perms
2017-01-18 17:03:58 +05:30
Rohit Waghchaure
56cc542eb7
[Fix] sales return discount issue
2017-01-18 14:50:24 +05:30
Rushabh Mehta
a0c41b70c4
[fix] tax rule test
2017-01-18 14:14:20 +05:30
Rohit Waghchaure
2b97cee32c
[Fix] POS print issue
2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc
[fix] accounts heatmaps now covering 366 days not 20
2017-01-18 15:25:58 +08:00
Rushabh Mehta
8f55d6bf3a
[fix] test_shopping_cart.py
2017-01-17 22:15:17 +05:30
Rushabh Mehta
d14a6c058a
[fix] stop recursion while adding role
2017-01-17 18:46:37 +05:30
Rushabh Mehta
982be9f11b
[tests] fixed for shopping cart
2017-01-17 17:57:38 +05:30
Rushabh Mehta
7385b73449
[fix] test
2017-01-17 17:57:38 +05:30
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Nabin Hait
aff2b9479d
bumped to version 7.2.13
2017-01-17 16:22:25 +06:00
Nabin Hait
f8676b2058
Create Material Requests considering projected qty of items
2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830
Fixes counting of in stock parent assemblies and formatting of csv
2017-01-17 14:11:43 +05:30
Kanchan Chauhan
653303180a
[Minor] Payroll Fix
2017-01-17 13:54:55 +05:30
Nabin Hait
1c91dc4589
Merge pull request #7475 from RobertSchouten/profitability_order
...
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
Nabin Hait
d9e216878f
Merge pull request #7513 from rohitwaghchaure/paid_amount_copy_issue
...
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:38:09 +05:30
Nabin Hait
9e294ee454
Merge branch 'rfq_supplier_pull' into develop
2017-01-17 12:26:09 +05:30
Nabin Hait
2ad62c2892
In RFQ, get items from material requests based on possible supplier
2017-01-17 12:25:33 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Rushabh Mehta
592104ef68
[fix] tests
2017-01-17 12:06:53 +05:30
Nabin Hait
7c7b3c0ab4
Merge pull request #7465 from KanchanChauhan/attendance-enhancement
...
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Nabin Hait
0681c77f6a
Merge pull request #7506 from mntechnique/hotfix
...
[Fix] Project: Enabled autocomplete for project users
2017-01-17 11:27:37 +05:30
Nabin Hait
2dab8809e7
Merge pull request #7509 from kickapoo/develop
...
Add Full Name as option in HR Setting Employee creation option
2017-01-17 11:26:25 +05:30
Dhaifallah Alwadani
9eb830ac4f
fix string translation
2017-01-17 11:13:57 +05:30
Nabin Hait
bf01958b85
Merge pull request #7510 from dalwadani/develop
...
fix string translation
2017-01-17 11:12:15 +05:30
Nabin Hait
b064cf39c2
Merge branch 'develop' into fleet-moved-to-hr
2017-01-17 11:05:39 +05:30
Nabin Hait
03f82240fa
Merge pull request #7222 from neilLasrado/assessment
...
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Dhaifallah Alwadani
9375d1dfeb
fix string translation
2017-01-16 04:05:40 -08:00
Stavros Anastasiadis
241e478dc0
Add Full Name as option in HR Setting Employee creation option
2017-01-16 14:02:28 +02:00
Rushabh Mehta
ffd80a6061
[fix] warehouse test cases
2017-01-16 17:23:20 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Gaurav Naik
d9b4c52046
[Fix] Project: Enabled autocomplete for project users
2017-01-16 16:01:25 +05:30
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Nabin Hait
120461efef
Merge branch 'master' into develop
2017-01-16 13:04:54 +05:30
Nabin Hait
71a730a36f
bumped to version 7.2.12
2017-01-16 13:34:53 +06:00
KanchanChauhan
b89be1e193
[Minor] Demo fixes ( #7499 )
2017-01-16 12:57:14 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
4ad121e1a4
[minor] fixes for Contact
2017-01-16 12:19:21 +05:30
ci2014
820abd3ba4
Fix missing comma ( #7495 )
...
Fixed missing comma after method set_contact_link
2017-01-16 11:57:34 +05:30
Nabin Hait
47bdf8b659
Merge pull request #7490 from rohitwaghchaure/pos_discount_issue
...
[Fix] Discount not working in the POS
2017-01-16 11:44:50 +05:30
Rohit Waghchaure
685f89f2b7
[Fix] Discount not working in the POS
2017-01-14 20:47:56 +05:30
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
Ben Cornwell-Mott
3d491f90cc
Created 2 reports for stock details
2017-01-10 14:14:18 -08:00
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
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
Umair Sayyed
829e00c2e6
[Fixed] Documentation #6892
2016-11-24 17:41:29 +05:30
Nabin Hait
3247db4827
Merge pull request #7050 from nabinhait/coa_based_on_existing_company
...
Create Chart of Accounts based on existing company
2016-11-24 13:28:11 +05:30
Nabin Hait
926d72424d
Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue
...
[Enhancement] Currency added in the BOM
2016-11-24 13:27:17 +05:30
Nabin Hait
a8333be6ad
Merge pull request #7023 from frappe/revert-7012-remove-count-star
...
Revert "[optimize] remove count(*) from queries"
2016-11-24 13:26:38 +05:30
Saurabh
8cd1918a3c
[documentaion] Documentaion for setting up Integration Service
2016-11-23 19:09:43 +05:30
Rohit Waghchaure
8c4e45ab3d
cleanup timesheet
2016-11-23 17:54:47 +05:30
Nabin Hait
e0089184e6
Create Chart of Accounts based on existing company
2016-11-23 17:34:16 +05:30
bhupen
c097a4fe68
Changes in company doctype for chart of accounts
2016-11-23 17:34:16 +05:30
Nabin Hait
f89f17cdde
Merge branch 'master' into develop
2016-11-23 16:00:22 +05:30
Nabin Hait
580534a22a
bumped to version 7.1.19
2016-11-23 16:30:22 +06:00
Nabin Hait
297d74a997
Unlink payment entries on cancellation of invoice
2016-11-23 15:59:00 +05:30
Nabin Hait
d194cce35c
fixed merge conflict
2016-11-23 14:55:23 +05:30
Nabin Hait
7f540af7a6
bumped to version 7.1.18
2016-11-23 15:23:42 +06:00
Nabin Hait
b18ad55e2b
minor fixes
2016-11-23 14:51:30 +05:30
Nabin Hait
cf895c220c
Update account_tree.js
2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0
[fix] remove root type selection while created new node and hooks call to initialize payment gateway
2016-11-23 14:06:14 +05:30
Nabin Hait
ae8df2b01c
Merge pull request #7033 from strixaluco/develop
...
[docs] URL fixes
2016-11-23 13:27:01 +05:30
Nabin Hait
4059fb3961
delivery note dashboard fix for quality inspection
2016-11-23 11:45:19 +05:30
robert schouten
085706bcbf
[fix] naming series only show non disabled role doctypes
2016-11-23 13:57:21 +08:00
Rushabh Mehta
5dd12cb4f0
Merge branch 'master' into develop
2016-11-22 23:18:29 +05:30
Rushabh Mehta
6557e37d5c
bumped to version 7.1.17
2016-11-22 23:48:28 +06:00
Rushabh Mehta
698c040d21
[hot] fix quotation ( #7039 )
2016-11-22 23:16:40 +05:30
Kanchan Chauhan
2c1f399479
Apply Pricing Rule in Shopping Cart
2016-11-22 22:23:31 +05:30
Rushabh Mehta
4e61564f73
[minor] fixes to daily work summary formatting
2016-11-22 21:59:20 +05:30
strixaluco
fc6a3aa42c
[docs] URL fixes
2016-11-22 16:25:20 +08:00
Rohit Waghchaure
334f032780
fix patch
2016-11-22 13:30:13 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
ee874a2a36
Update student_admission.py
2016-11-22 12:42:24 +05:30
Rushabh Mehta
9872d8cdb5
Revert "[optimize] remove count(*) from queries"
2016-11-21 21:04:47 +05:30
Nabin Hait
d3344ebcd1
Merge pull request #7021 from neilLasrado/develop
...
Added Instructors table to Student Batch
2016-11-21 19:36:11 +05:30
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
