RobertSchouten
bb7308bbc1
[fix] email digest date range starting with opening balance of day one not closing ( #6524 )
...
ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august
2016-10-10 17:17:39 +05:30
Saurabh
afa14fc402
[fix][minor] ( #6449 )
2016-10-10 17:17:17 +05:30
Nabin Hait
1765259043
Merge pull request #6591 from vrms/patch-4
...
Update managing-fixed-assets.md
2016-10-10 17:12:58 +05:30
Rushabh Mehta
2757d8ef03
[minor] [perm] allow owner to read student applicant
2016-10-10 16:46:24 +05:30
Rohit Waghchaure
8e881cc7b9
[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order
2016-10-10 14:58:33 +05:30
Faris Ansari
a0608d463a
[gantt] Gantt fixes ( #6490 )
...
* [gantt] fix Gantt Chart link in Modules
* [gantt] added field for Task dependent
2016-10-10 14:32:35 +05:30
vrms
e4e8bfae9f
Update managing-fixed-assets.md
...
Sale an asset > Sell and Asset
2016-10-10 15:33:27 +08:00
Nabin Hait
fc90758932
Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue
...
[Fix] Purchase invoice validation issue
2016-10-10 11:51:00 +05:30
Rohit Waghchaure
3485d2467a
[Fix] Purchase invoice validation issue
2016-10-09 18:05:17 +05:30
Rohit Waghchaure
6f33dfbc56
[Fix] wildcard search for pos not working
2016-10-09 15:32:56 +05:30
Rushabh Mehta
ac5b193100
[minor] direct student admission to the list page
2016-10-09 15:19:23 +05:30
Pawan Mehta
8d62af627a
Update fiscal-year.md
2016-10-09 09:20:12 +05:30
pawan
1c0ecede06
[fix] #6567
2016-10-09 09:06:49 +05:30
pawan
896c731a46
[fix] #6566
2016-10-09 08:44:40 +05:30
pawan
05790d1b38
[fix] #6566
2016-10-09 08:30:29 +05:30
pawan
5655ce936b
[fix] #6567
2016-10-08 08:02:08 +05:30
pawan
361739ffb6
[ fix #6566 ]
2016-10-07 19:00:30 +05:30
Nabin Hait
fc2a9e64fc
Fixed version conflict
2016-10-07 17:09:28 +05:30
Nabin Hait
89326b366d
bumped to version 7.0.58
2016-10-07 17:38:57 +06:00
Nabin Hait
6aaa7d7742
Added missing file extension
2016-10-07 17:08:03 +05:30
Nabin Hait
df61513037
Fixed merge conflict
2016-10-07 17:05:00 +05:30
Nabin Hait
d17bbdeb4d
bumped to version 7.0.57
2016-10-07 17:34:35 +06:00
Nabin Hait
2f3a68b8d6
Added missing file extension
2016-10-07 17:03:37 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Nabin Hait
06195de812
bumped to version 7.0.56
2016-10-07 17:17:17 +06:00
Nabin Hait
ad8218e5ac
minor fix
2016-10-07 16:39:30 +05:30
Nabin Hait
9bfef84545
Merge branch 'notification-center' of https://github.com/shreyasp/erpnext into shreyasp-notification-center
2016-10-07 16:37:10 +05:30
Nabin Hait
81754954cb
Update update_timesheet_communications
2016-10-07 16:08:44 +05:30
Nabin Hait
2907881dfb
Update update_timesheet_communications
2016-10-07 16:07:11 +05:30
Nabin Hait
0799969063
Update set_portal_settings.py
2016-10-07 14:55:17 +05:30
Nabin Hait
20e96b77bd
Update set_portal_settings.py
2016-10-07 14:54:28 +05:30
shreyas
c1b7104126
[Fix] Minor changes to logic
2016-10-07 14:20:51 +05:30
Nabin Hait
2f75b7b42e
Fixed merge conflict
2016-10-07 14:16:17 +05:30
Rohit Waghchaure
770d04e633
[Fix] sales order status showing completed, while it's status was to bill
2016-10-07 13:55:48 +05:30
Rohit Waghchaure
022d87969d
[Fix] Issue in merging duplicate item
2016-10-07 13:40:45 +05:30
shreyas
a1d7646e70
[Fix] Allow user to save Notification Control without selecting transaction
2016-10-07 12:58:58 +05:30
Nabin Hait
16f3f378f6
Update patches.txt
2016-10-07 12:54:27 +05:30
Nabin Hait
1885207eca
Update and rename update_timesheet_modified_created to update_timesheet_communications
2016-10-07 12:54:04 +05:30
RobertSchouten
e0a636c081
[fix] update timestamps and relink communication for timesheet
2016-10-07 11:03:04 +08:00
RobertSchouten
ef4e41380b
[fix] update timestamps and relink communication for timesheet
2016-10-07 11:01:12 +08:00
Saurabh
a2a25abfa5
[fix] warehouse account rename fix #6526
2016-10-06 18:20:53 +05:30
Nabin Hait
77ede941b0
Merge pull request #6550 from rohitwaghchaure/make_payment_using_journal_entry
...
[Enhancement] Option to make payment via Journal Entry
2016-10-06 17:07:11 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Nabin Hait
1397159bc1
Merge pull request #6561 from rohitwaghchaure/remove_sales_invoice_from_scheduler_log
...
removed sales invoice from scheduler log
2016-10-06 15:32:55 +05:30
Nabin Hait
ec08a50af1
Merge pull request #6564 from rohitwaghchaure/expense_claim_issue
...
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:32:37 +05:30
Rohit Waghchaure
370e711f48
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:19:53 +05:30
Saurabh
3ae5672e27
[fix] sales order translation for language code: fr
2016-10-06 12:57:21 +05:30
Rohit Waghchaure
297fbcd388
removed sales invoice from scheduler log
2016-10-06 12:40:09 +05:30
Rohit Waghchaure
b7a5502b97
[Enhancement] Option to make payment via Journal Entry
2016-10-06 12:04:52 +05:30
vrms
bbe7a1062e
Update product-bundle.md
...
tried to work out the mechanics of Parent and Child items a little clearer
2016-10-06 07:40:21 +08:00
Rushabh Mehta
4dacaa103c
[minor] do not submit after accpeting payment
2016-10-05 19:20:37 +05:30
Rushabh Mehta
a47652624a
[minor] student applicant fixes
2016-10-05 18:04:35 +05:30
Nabin Hait
558f526a68
Fixed version conflict
2016-10-05 17:18:36 +05:30
Nabin Hait
7dcab89321
Merge branch 'hotfix'
2016-10-05 17:18:11 +05:30
Nabin Hait
a162b3f0cd
bumped to version 7.0.55
2016-10-05 17:48:11 +06:00
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Nabin Hait
33fafb7728
Set warranty claim resolution date as today only if it is not set
2016-10-05 16:43:20 +05:30
Nabin Hait
2704a4a8fc
Update production_order.py
2016-10-05 16:14:42 +05:30
Nabin Hait
7c0fe7d9d3
Merge pull request #6534 from rohitwaghchaure/rfq_added_links_of_quotations
...
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:44:51 +05:30
Rohit Waghchaure
a26f685b9f
[Enhancement] Added supplier quotation link on rfq
2016-10-05 15:04:50 +05:30
Rohit Waghchaure
e86eaf543c
removed sync master data onload of the pos page
2016-10-05 14:45:15 +05:30
Rohit Waghchaure
163e3598c7
[Fix] POS wildcard search for customers, items
2016-10-05 13:52:17 +05:30
Nabin Hait
babafb8d01
Merge pull request #6531 from saurabh6790/je_currency_symbol_fix
...
[fix] currency symbol for total amount in JE
2016-10-05 13:12:59 +05:30
Nabin Hait
7229b64128
Merge pull request #6516 from bcornwellmott/patch-6
...
Update request_for_quotation.html
2016-10-05 13:12:09 +05:30
Nabin Hait
8db8a91d2e
Minor fixes
2016-10-05 13:11:19 +05:30
Kanchan Chauhan
f6f8ec68ad
Total and difference added for amount and qty
2016-10-05 13:11:19 +05:30
Rohit Waghchaure
712b871f06
Change project location in sales invoice
2016-10-05 12:45:56 +05:30
Neil Trini Lasrado
d5035e05b3
Field rearrange in student applicant
2016-10-05 12:35:55 +05:30
Nabin Hait
9501b38e8b
Update remove_doctypes_and_reports.py
2016-10-05 12:35:11 +05:30
Nabin Hait
219148d23d
Sales Personwise transaction summary - total row
2016-10-05 12:26:51 +05:30
Nabin Hait
9ac2fc932d
Validate dates, fixes #6542
2016-10-05 12:20:25 +05:30
Nabin Hait
6c49fa20b5
Fixed precision of rate field
2016-10-05 11:28:02 +05:30
Rushabh Mehta
bb89f6e151
[minor] student applications to be submitted after payment
2016-10-05 09:24:52 +05:30
Nabin Hait
efa68fb6b8
Fixed version conflict
2016-10-04 17:27:02 +05:30
Nabin Hait
d5cebd7bb4
bumped to version 7.0.54
2016-10-04 17:56:33 +06:00
Rushabh Mehta
6a1742abc8
[minor] status for student applicant
2016-10-04 16:26:32 +05:30
Nabin Hait
80de91776d
Merge pull request #6539 from rohitwaghchaure/stock_entry_grid_issue
...
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
2016-10-04 16:20:47 +05:30
Nabin Hait
cf87027422
Merge pull request #6537 from rohitwaghchaure/pos_multi_company_issue
...
[Fix] Multi company issue for POS
2016-10-04 16:20:24 +05:30
Rohit Waghchaure
661db8ba71
[Fix] Source / Target warehouse does not toggle properly, if we change the purpose after saving a stock entry record
2016-10-04 14:46:34 +05:30
Rohit Waghchaure
82be020ae9
sync offline sales invoices from the POS
2016-10-04 12:58:48 +05:30
Nabin Hait
66d49565d2
Merge pull request #6536 from frappe/umairsy-patch-4
...
Update supplier.md
2016-10-04 12:25:45 +05:30
Rushabh Mehta
3af3d7abe3
[fixes] admission-applicant link and student applicant fixes
2016-10-04 12:20:47 +05:30
Rohit Waghchaure
6f1d012b65
[Fix] Multi company issue for POS
2016-10-04 12:18:59 +05:30
Umair Sayed
06b88a464d
Update supplier.md
2016-10-04 12:10:08 +05:30
Rushabh Mehta
aedad64445
[minor] fixes
2016-10-04 11:41:42 +05:30
Saurabh
f24d523fc9
[fix] currency symbol for total amount in JE
2016-10-04 11:29:26 +05:30
Nabin Hait
7fb79d175f
Fixed version conflict
2016-10-03 18:05:34 +05:30
Nabin Hait
e2b8ae56e1
bumped to version 7.0.53
2016-10-03 18:35:10 +06:00
Nabin Hait
d114aca20d
GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items
2016-10-03 17:36:28 +05:30
Faris Ansari
69ca382529
[fix] image size fix in print format
2016-10-03 17:15:42 +05:30
Neil Trini Lasrado
93d314c573
Merged introduction and eligibility into a single text field in Student Admission. ( #6529 )
2016-10-03 15:50:47 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +05:30
Nabin Hait
e7e920b487
bumped to version 7.0.52
2016-10-03 14:42:53 +06:00
Nabin Hait
e8519938e0
Merge pull request #6525 from rohitwaghchaure/minor_pos
...
[Fix] disable apply discount on pos
2016-10-03 14:10:44 +05:30
Nabin Hait
10a48ea5e9
Merge pull request #6527 from rohitwaghchaure/budget_issue
...
[Fix] company key error during cancellation of stock entry
2016-10-03 14:05:10 +05:30
Saurabh
4f62c4cf2d
[minor][fix] for condition maker
2016-10-03 12:48:25 +05:30
Rohit Waghchaure
b1391ca635
[Fix] company key error during cancellation of stock entry
2016-10-03 12:25:04 +05:30
Rohit Waghchaure
6f3d04caf7
[Fix] Disable apply discount on
2016-10-03 11:46:04 +05:30
Nabin Hait
b498eb5f9e
Minor fix AR/AP
2016-10-01 15:51:59 +05:30
bcornwellmott
47863a3049
Update request_for_quotation.html
...
Fixing spelling mistakes
2016-09-30 15:45:20 -07:00
Nabin Hait
e1aee56e85
Merge pull request #6515 from rohitwaghchaure/purchase_receipt_title_issue
...
[Fix] Purchase receipt title issue
2016-09-30 21:24:03 +05:30
Rohit Waghchaure
74bf022273
[Fix] Purchase receipt title issue
2016-09-30 18:35:48 +05:30
Rohit Waghchaure
c1a3e379d8
[Fixed] Accounts receivable concat issue
2016-09-30 13:18:06 +05:30
Nabin Hait
6870e45276
Merge pull request #6495 from frappe/umairsy-patch-2
...
Update sales_partner.js
2016-09-29 20:44:59 +05:30
Nabin Hait
7652d5db93
Merge pull request #6501 from rohitwaghchaure/minor_fix_warranty_claim
...
[Fix] Minor changes in warranty claim
2016-09-29 20:44:03 +05:30
Rohit Waghchaure
1d0b18661e
[Fix] Minor changes in warranty claim
2016-09-29 18:55:45 +05:30
Umair Sayed
6c1c03efe7
Update data-import-tool.md
2016-09-29 16:34:39 +05:30
Umair Sayed
29a0b31ca6
Update sales_partner.js
2016-09-29 16:25:04 +05:30
Nabin Hait
2ad07f4912
Merge pull request #6491 from neilLasrado/develop
...
Removed Website Roles from Install Fixtures
2016-09-29 15:39:15 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
626fcd5199
bumped to version 7.0.51
2016-09-29 14:46:42 +06:00
Nabin Hait
2c452a6881
Merge pull request #6485 from rohitwaghchaure/enhancement_payment_entry
...
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-29 13:57:48 +05:30
Nabin Hait
d0a25f72c7
Merge pull request #6488 from rohitwaghchaure/timesheet_delete_transaction_issue
...
[Fix] Timesheet detail records not deleted with company transactions deletion
2016-09-29 13:55:38 +05:30
Nabin Hait
424bffc98b
Merge pull request #6486 from nabinhait/stock_trans_repost
...
Reposting of GLE and SLE for all stock transactions
2016-09-29 13:51:51 +05:30
Nabin Hait
473ccc410b
Merge pull request #6489 from nabinhait/leave_application_fix
...
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 13:49:31 +05:30
Nabin Hait
b81a7538b9
Merge pull request #6492 from rohitwaghchaure/patch_for_change_amount_account
...
[Fix] added account for missing change amount account in the sales invoice
2016-09-29 13:41:50 +05:30
Nabin Hait
f1d2fd2436
[fix] Accounts Receivable report if negative write off in invoice
2016-09-29 13:03:10 +05:30
Rohit Waghchaure
4b24683c27
[Fix] added account for missing change amount account in the sales invoice
2016-09-29 12:55:48 +05:30
Neil Trini Lasrado
3da7354ba4
removed supplier role from Request for Quotation
2016-09-29 11:57:23 +05:30
Neil Trini Lasrado
84154f546a
Removed Website Roles from Install Fixtures
2016-09-29 11:36:55 +05:30
Nabin Hait
2e31d7c7bf
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 10:59:46 +05:30
Rohit Waghchaure
17adb970f1
[Fix] Timesheet detail records not deleted with company transactions deletion
2016-09-29 01:07:28 +05:30
Rohit Waghchaure
f21f1af0c9
[Enhancement] Added allocate payment amount checkbox in Payment Entry
2016-09-28 18:24:17 +05:30
Nabin Hait
b3bc41131e
Reposting of GLE and SLE for all stock transactions
2016-09-28 18:17:52 +05:30
Nabin Hait
f1ad32059f
Merge pull request #6481 from rohitwaghchaure/fix_homepage
...
Fixed view button functionality in homepage
2016-09-28 16:57:21 +05:30
Nabin Hait
443ac7bf30
Test case fix
2016-09-28 16:54:23 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Rohit Waghchaure
7441a93a10
[Fix] sub-heading is missing in the excel sheet of the cash flow
2016-09-28 14:57:57 +05:30
Rohit Waghchaure
d63bfaa5f2
Fixed view button functionality in homepage
2016-09-28 14:08:47 +05:30
Rohit Waghchaure
0a6529a643
Remove time log, time log batch from Doc Field.
2016-09-28 13:03:42 +05:30
Nabin Hait
1e97fc8687
Merge pull request #6460 from KanchanChauhan/salary-slip-fixes
...
[Fix]Salary Slip can be created without salary structure
2016-09-28 12:55:04 +05:30
Nabin Hait
ba03ef775d
Fixed merge conflict
2016-09-28 10:47:41 +05:30
Nabin Hait
147ecab6b0
bumped to version 7.0.50
2016-09-28 11:16:36 +06:00
Nabin Hait
45f05d2c9b
Merge pull request #6465 from saurabh6790/hotfix
...
[fix] ledger view from coa
2016-09-28 10:44:40 +05:30
paurosello
a4d19b4c03
change to link of gantt in project ( #6469 )
2016-09-27 09:56:17 +05:30
Faris Ansari
70b7d3280b
added required fields in doctypes for gantt ( #6466 )
2016-09-26 18:20:14 +05:30
Nabin Hait
706612bcd4
Fixed version conflict
2016-09-26 18:11:56 +05:30
Nabin Hait
577aa9cb33
bumped to version 7.0.49
2016-09-26 18:32:19 +06:00
Nabin Hait
ad3e213b41
minor patch fixes
2016-09-26 18:00:13 +05:30
Nabin Hait
7faa4b5fdf
Merge pull request #6455 from rohitwaghchaure/retun_field_duplicate_issue
...
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-26 17:57:28 +05:30
Nabin Hait
f04721ee79
Update naming_series.py
2016-09-26 17:55:34 +05:30
Saurabh
5874a76eac
[fix] ledger view from coa
2016-09-26 16:14:15 +05:30
Kanchan Chauhan
273c5e71fd
[Fix]Salary Slip can be created without salary structure
2016-09-24 18:56:56 +05:30
Rushabh Mehta
1f53aaf093
[minor] [patch] ignore_validate in update_portal_role
2016-09-24 00:21:53 +05:30
Rushabh Mehta
63cdbf08f9
[minor] [patch] ignore_validate in update_portal_role
2016-09-24 00:07:31 +05:30
Rushabh Mehta
82921f7d65
[minor] add paid field in Student Applicant
2016-09-23 23:50:55 +05:30
Pawan Mehta
4f72480045
Merge pull request #6453 from PawanMeh/hotfix
...
[fix]-Ageing buckets should not have amounts if due date is not reached
2016-09-23 22:52:00 +05:30
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
Felipe Orellana
51082006a9
[FIX] Issue with customer doctype not allowing name series past 10
...
Query used to fetch mast number in series breaks due to sql MAX function handing string and number ordering differently. This causes the last "[name] - 9" series to be picked up as last in the series instead of "[name] - 10". Fix is to cast value to unsigned to MAX handles ordering correctly.
2016-09-23 11:58:11 -04:00
Rohit Waghchaure
d728f5a429
[Fix] Allow renaming for UOM, When Duplicate Is Return field should not be copied #5510 #6288
2016-09-23 18:06:24 +05:30
