Rohit Waghchaure
|
53bb687009
|
hotfix issues
|
2016-11-01 13:21:43 +05:30 |
|
Nabin Hait
|
f5f3ef1bae
|
repost gle for Purchase Invoice with update stock
|
2016-10-31 16:17:10 +05:30 |
|
Saurabh
|
468e41f24f
|
[enhance] introduce ignore_fields param for _tree and get_query
|
2016-10-27 15:23:19 +05:30 |
|
Nabin Hait
|
622c05cc60
|
Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue
[Fix] No permission to read report Bank Clearance Summary for account user
|
2016-10-27 13:48:19 +05:30 |
|
Rohit Waghchaure
|
53a28eb39d
|
[Fix] No permission to read report Bank Clearance Summary for account user
|
2016-10-27 11:46:10 +05:30 |
|
Nabin Hait
|
72a1943c8e
|
Fixed version conflict
|
2016-10-26 16:41:21 +05:30 |
|
Kanchan Chauhan
|
dc3198a11c
|
[Fix] Error in Balance Sheet Report
|
2016-10-26 13:05:08 +05:30 |
|
Nabin Hait
|
ffd2fc5101
|
[fix] Validate if warehouse is not linked to any account
|
2016-10-24 18:54:07 +05:30 |
|
Rohit Waghchaure
|
43b508089e
|
[Fix] Pricing rule discount issue
|
2016-10-24 16:16:24 +05:30 |
|
Neil Trini Lasrado
|
5ddd7acdbd
|
Typo fix
|
2016-10-24 15:25:47 +05:30 |
|
Rohit Waghchaure
|
18fa0d8691
|
patch to set default value as 1
|
2016-10-20 16:16:28 +05:30 |
|
Rohit Waghchaure
|
7917ff6936
|
Test cases
|
2016-10-20 16:11:22 +05:30 |
|
Rohit Waghchaure
|
8055bd39ba
|
[Feature] Provision to allow unlink the payment against the invoice
|
2016-10-20 16:11:22 +05:30 |
|
Rohit Waghchaure
|
d23835be84
|
[Feature] Countrywise sales tax template
|
2016-10-20 15:56:07 +05:30 |
|
Kanchan Chauhan
|
025fbd8f14
|
Customer group added to Gross Profit report
|
2016-10-20 12:54:06 +05:30 |
|
Nabin Hait
|
0702fa2fc6
|
Fixed version conflict
|
2016-10-19 16:49:36 +05:30 |
|
Saurabh
|
afceac620c
|
[fix] calculate variance only for submitted budgets
|
2016-10-19 12:49:48 +05:30 |
|
Nabin Hait
|
fa1cdd5bf0
|
Fixed merge conflict
|
2016-10-18 15:37:33 +05:30 |
|
Nabin Hait
|
f32547a414
|
Merge pull request #6637 from nabinhait/cost_center_fix
Set cost center while creating invoice from SO/PO
|
2016-10-18 15:18:16 +05:30 |
|
Rushabh Mehta
|
17f6874450
|
[minor] [fix] doctype_dasboard.py files, move data to get_data
|
2016-10-18 14:54:39 +05:30 |
|
Nabin Hait
|
55a8797919
|
Set cost center while creating invoice from SO/PO
|
2016-10-18 14:54:17 +05:30 |
|
Nabin Hait
|
437b32d32c
|
Added filter to show unclosed fiscal year's P&L balances in trail balance
|
2016-10-17 16:57:52 +05:30 |
|
Nabin Hait
|
425bdee0ec
|
Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1
|
2016-10-17 16:46:54 +05:30 |
|
Nabin Hait
|
395d757c5a
|
Fixed merge conflict
|
2016-10-17 16:42:49 +05:30 |
|
Saurabh
|
afa14fc402
|
[fix][minor] (#6449)
|
2016-10-10 17:17:17 +05:30 |
|
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 |
|
Nabin Hait
|
cd9c45f816
|
Fixed merge conflict
|
2016-10-07 16:53:07 +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 |
|
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 |
|
Nabin Hait
|
558f526a68
|
Fixed version conflict
|
2016-10-05 17:18:36 +05:30 |
|
Nabin Hait
|
cccc45edc5
|
Don't throw expense account validation on fetching item details
|
2016-10-05 17:15:53 +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 |
|
Rohit Waghchaure
|
712b871f06
|
Change project location in sales invoice
|
2016-10-05 12:45:56 +05:30 |
|
Nabin Hait
|
efa68fb6b8
|
Fixed version conflict
|
2016-10-04 17:27:02 +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
|
82be020ae9
|
sync offline sales invoices from the POS
|
2016-10-04 12:58:48 +05:30 |
|
Rohit Waghchaure
|
6f1d012b65
|
[Fix] Multi company issue for POS
|
2016-10-04 12:18:59 +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
|
d114aca20d
|
GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items
|
2016-10-03 17:36:28 +05:30 |
|
Nabin Hait
|
5fd5a77750
|
Fixed version conflict
|
2016-10-03 14:13:50 +05:30 |
|
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 |
|
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 |
|
Rohit Waghchaure
|
c1a3e379d8
|
[Fixed] Accounts receivable concat issue
|
2016-09-30 13:18:06 +05:30 |
|
Nabin Hait
|
80499bb657
|
Fixed merge conflict
|
2016-09-29 14:18:53 +05:30 |
|
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
|
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
|
f1d2fd2436
|
[fix] Accounts Receivable report if negative write off in invoice
|
2016-09-29 13:03:10 +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 |
|
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 |
|
Nabin Hait
|
ba03ef775d
|
Fixed merge conflict
|
2016-09-28 10:47:41 +05:30 |
|
Nabin Hait
|
45f05d2c9b
|
Merge pull request #6465 from saurabh6790/hotfix
[fix] ledger view from coa
|
2016-09-28 10:44:40 +05:30 |
|
Nabin Hait
|
706612bcd4
|
Fixed version conflict
|
2016-09-26 18:11:56 +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 |
|
Saurabh
|
5874a76eac
|
[fix] ledger view from coa
|
2016-09-26 16:14:15 +05:30 |
|
Rushabh Mehta
|
fc800b3f2f
|
[enhance] added roles for portal users frappe/frappe#2091 (#6452)
|
2016-09-23 21:51:51 +05:30 |
|
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 |
|
pawan
|
09f1ee637e
|
[fix] #6371
|
2016-09-23 17:19:54 +05:30 |
|
Nabin Hait
|
6b4eb7f77f
|
Fixed version conflict
|
2016-09-23 12:16:31 +05:30 |
|
Nabin Hait
|
d03087d3ab
|
Patch fixed for legacy migration
|
2016-09-23 11:08:02 +05:30 |
|
Rohit Waghchaure
|
b2382c0b8e
|
[fix] Supplier status stuck at Open forever
|
2016-09-22 18:45:24 +05:30 |
|
Rohit Waghchaure
|
481ca832b0
|
minor fix
|
2016-09-22 17:21:37 +05:30 |
|
Nabin Hait
|
d64454b1c1
|
Merge pull request #6433 from RobertSchouten/validate_sale_ware
[fix] si validate warehouse if is_stock item
|
2016-09-22 11:41:36 +05:30 |
|
Nabin Hait
|
e5c7d4b987
|
Fixed version conflict
|
2016-09-22 11:33:51 +05:30 |
|
Nabin Hait
|
a58a65457f
|
Sales Register report minor fix
|
2016-09-22 11:31:42 +05:30 |
|
robert schouten
|
f91ca3a450
|
[fix] si validate warehouse if is_stock item
|
2016-09-22 13:07:00 +08:00 |
|
Nabin Hait
|
0be6073f10
|
Fixed version conflict
|
2016-09-21 13:06:19 +05:30 |
|
Nabin Hait
|
aac32d644d
|
Fix in Sales Register for multiple mode of payments
|
2016-09-21 11:46:07 +05:30 |
|
Nabin Hait
|
a36325c6e5
|
Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-20 18:06:49 +05:30 |
|
Nabin Hait
|
b015f1b647
|
Fixed version conflict
|
2016-09-20 16:53:02 +05:30 |
|
RobertSchouten
|
8d43b32c2c
|
improvements to email digest (#6323)
|
2016-09-20 11:11:39 +05:30 |
|
Nabin Hait
|
383cb43135
|
Merge pull request #6393 from KanchanChauhan/gl-fix
Against Voucher Type and Against Voucher added to GL
|
2016-09-19 19:35:55 +05:30 |
|
Saurabh
|
9aacf46c51
|
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-19 16:45:35 +05:30 |
|
Kanchan Chauhan
|
006a0e68bf
|
Against Voucher Type and Against Voucher added to GL
|
2016-09-19 13:44:52 +05:30 |
|
Rohit Waghchaure
|
3c4cdd2a94
|
[Fix] Added base_url, print_css in pos
|
2016-09-19 00:17:32 +05:30 |
|
Nabin Hait
|
5bab04fead
|
Merge pull request #6381 from rmehta/lead-source
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 16:58:40 +05:30 |
|
Saurabh
|
9919a0a9db
|
[fix] #5992
|
2016-09-16 16:47:03 +05:30 |
|
Rushabh Mehta
|
39b5d39df6
|
[fix] remove campaign depends on
|
2016-09-16 15:55:34 +05:30 |
|
Rushabh Mehta
|
59dc0ece9f
|
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 11:44:49 +05:30 |
|
Nabin Hait
|
759ef4c00d
|
Allowed past dates in next depreciation date
|
2016-09-15 12:24:33 +05:30 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Nabin Hait
|
e9fa81c286
|
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
[Enhancement] Timesheet billing based on project
|
2016-09-14 15:31:54 +05:30 |
|
Rohit Waghchaure
|
b78eb2b6f2
|
[Fix] Financial Statements reports are running very slow
|
2016-09-14 13:33:27 +05:30 |
|
Rohit Waghchaure
|
0568238786
|
rename total_billing_hours to total_billable_hours in timesheet doctype
|
2016-09-12 23:00:24 +05:30 |
|
Rohit Waghchaure
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
Rohit Waghchaure
|
97a82714de
|
[Fix] so_dn_required for pos and stock update invoice
|
2016-09-12 18:04:17 +05:30 |
|
Nabin Hait
|
97b661f995
|
Merge pull request #6334 from RobertSchouten/patch-27
[fix] itemwise sales register add sales invoice to delivery note when…
|
2016-09-12 17:53:10 +05:30 |
|