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 |
|
Chude Osiegbu
|
3c6a937a7c
|
Merge branch 'develop' into exchange_rate_modifications
|
2016-09-18 21:47:55 +01:00 |
|
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 |
|
Nabin Hait
|
1d8d93d9ad
|
Update balance_sheet.py
|
2016-09-12 17:43:14 +05:30 |
|
Nabin Hait
|
0a7c0f4418
|
Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
|
2016-09-12 17:36:46 +05:30 |
|
Nabin Hait
|
014c30c90d
|
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
[Enhancement] POS changes and fixes
|
2016-09-12 17:35:40 +05:30 |
|
Nabin Hait
|
33a20bdb13
|
Merge pull request #6340 from nabinhait/se_difference_account
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 17:34:59 +05:30 |
|
Rushabh Mehta
|
daee449063
|
[fix] for print format draft (#6346)
|
2016-09-12 16:42:36 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Rohit Waghchaure
|
e1d59d6dde
|
test cases and minor changes
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
1d0e8ea9c6
|
minor changes
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
3815ebff8a
|
Added %billed in timesheet
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
a6927e05ba
|
set project wise timesheet data
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
cc8644f86e
|
[Timesheet] Field rearrange
|
2016-09-12 13:27:27 +05:30 |
|
Nabin Hait
|
a36a88b6de
|
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 13:15:59 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
robert schouten
|
ea3b342dde
|
fix display unclosed values for trial/balance/sheet
|
2016-09-12 14:37:58 +08:00 |
|
RobertSchouten
|
bd979ec1ed
|
[fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
|
2016-09-12 09:46:10 +08:00 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
c16c0ca944
|
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:59:32 +05:30 |
|
Rohit Waghchaure
|
525900c5c1
|
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:01:08 +05:30 |
|
Chude Osiegbu
|
fbf27b5031
|
Further corrections to Currency Exchange table
|
2016-09-07 03:06:08 +01:00 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
RobertSchouten
|
5ae21053bd
|
fix for closing balance typo
|
2016-09-06 15:44:09 +08:00 |
|
Rohit Waghchaure
|
377c7acd53
|
[POS] Added offline_pos_name in print format
|
2016-09-05 17:59:01 +05:30 |
|
Nabin Hait
|
406f0a38de
|
Fixed merge conflicts
|
2016-09-05 15:44:18 +05:30 |
|
Nabin Hait
|
8693b5c93a
|
Minor fixes
|
2016-09-05 11:51:45 +05:30 |
|
pawan
|
bd9a275d5f
|
[fix] #6254
|
2016-09-02 16:51:22 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Nabin Hait
|
f8e374643c
|
Merge pull request #6257 from nabinhait/letter_head_in_report
Default letter head in report printing based on selected company
|
2016-09-02 14:17:12 +05:30 |
|
Saurabh
|
ff910f4c72
|
[fixes] set filter for warehouse
|
2016-09-02 13:39:05 +05:30 |
|
Nabin Hait
|
13b37c6346
|
Default letter head in report printing based on selected company
|
2016-09-02 11:25:42 +05:30 |
|
Rushabh Mehta
|
b2f0920346
|
[minor] new global for query report filters
|
2016-09-01 17:53:42 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Rohit Waghchaure
|
879cb6ebee
|
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-08-31 14:41:48 +05:30 |
|
Nabin Hait
|
566759acae
|
Merge pull request #6211 from rohitwaghchaure/v7.1_fixes
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-31 12:12:48 +05:30 |
|
Rohit Waghchaure
|
a2bf16bfaa
|
[Fix] Billing Hours showing blank on sales invoice
|
2016-08-29 13:37:13 +05:30 |
|
Nabin Hait
|
338e63c448
|
Fixed version conflict
|
2016-08-29 11:47:50 +05:30 |
|
Rohit Waghchaure
|
63bdd679d0
|
[POS] Fixes and cleanup
|
2016-08-27 02:53:36 +05:30 |
|
Kanchan Chauhan
|
dd96cbd012
|
Coded column deleted, column added from UI
|
2016-08-26 14:32:38 +05:30 |
|
Nabin Hait
|
4403cf71b5
|
Merge pull request #6152 from rohitwaghchaure/profitability_report
[Report] Profitability Analysis
|
2016-08-26 13:21:01 +05:30 |
|
Rohit Waghchaure
|
0cb171feb2
|
[Enhancement] Added billing hours for account user in timesheet
|
2016-08-26 13:17:46 +05:30 |
|
Nabin Hait
|
e334813daf
|
Merge pull request #6166 from neilLasrado/demo
Merged Schools Demo into ERPNext
|
2016-08-26 13:05:43 +05:30 |
|
Rohit Waghchaure
|
6462ba4e0b
|
minor changes
|
2016-08-26 12:42:52 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Nabin Hait
|
06b27757ab
|
Merge pull request #6179 from rohitwaghchaure/minor_fix_patch
[Sales Return] Minor fix in patch
|
2016-08-26 12:33:33 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
0a99b4347b
|
Party mandatory message
|
2016-08-26 12:30:45 +05:30 |
|
Nabin Hait
|
a26bb96d2d
|
Merge pull request #6178 from nabinhait/status_updater_fix
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 12:09:39 +05:30 |
|
Nabin Hait
|
47a3f639ed
|
Ignore validating billed amount against order if order item amount is zero
|
2016-08-26 11:39:39 +05:30 |
|
Neil Trini Lasrado
|
067245933e
|
Fixed Demo
|
2016-08-25 18:31:42 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rohit Waghchaure
|
1e8732abc2
|
removed old report
|
2016-08-24 19:20:58 +05:30 |
|
Rohit Waghchaure
|
5794ffd43d
|
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
|
2016-08-24 19:12:14 +05:30 |
|
Rohit Waghchaure
|
1255a6627e
|
project based profitability Analysis
|
2016-08-24 18:01:39 +05:30 |
|
Rohit Waghchaure
|
78e08b8af5
|
[Report] Profitability Analysis
|
2016-08-24 18:00:22 +05:30 |
|
Rohit Waghchaure
|
fb432821bf
|
[Report] Cost center wise profitability
|
2016-08-24 18:00:22 +05:30 |
|
Nabin Hait
|
cfbd0199eb
|
Merge branch 'master' into develop
|
2016-08-23 12:10:56 +05:30 |
|
Nabin Hait
|
26f9673ad9
|
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
[Enhancement] Multi year financial statements
|
2016-08-23 11:32:08 +05:30 |
|
Rohit Waghchaure
|
ca4d9b54cd
|
fixed accumulated values for cash flow
|
2016-08-22 17:51:58 +05:30 |
|
Pawan Mehta
|
bee3b40725
|
Update gross_profit.py
|
2016-08-22 17:47:13 +05:30 |
|
pawan
|
18bb431baa
|
[fix] #6089
|
2016-08-22 17:27:22 +05:30 |
|
pawan
|
851e05672c
|
[fix] #6089
|
2016-08-22 14:25:17 +05:30 |
|
Rohit Waghchaure
|
26b646f8a3
|
Added validation for fiscal year
|
2016-08-21 17:14:12 +05:30 |
|
Rohit Waghchaure
|
713e2b7b62
|
[POS] Fixed issue of paid amount, write off account
|
2016-08-19 19:27:16 +05:30 |
|
Rohit Waghchaure
|
4275c30059
|
[Enhancement] Multi year financial statements
|
2016-08-19 18:04:32 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Nabin Hait
|
f04ce3c5a6
|
[fix] check expense agaist budget
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
50f8262ac7
|
Currency fix in reports
|
2016-08-18 16:14:23 +05:30 |
|
Rohit Waghchaure
|
9d5a07d101
|
[POS] Fixed stock update issue
|
2016-08-18 13:27:06 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Rushabh Mehta
|
b969c2cb60
|
[minor] budget link in cost center, fixes #6093
|
2016-08-18 12:36:20 +05:30 |
|
Nabin Hait
|
6fe3ac49cf
|
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
Allow to edit change amount
|
2016-08-17 17:08:54 +05:30 |
|
Rohit Waghchaure
|
e4e69ec027
|
changed field name, validation for change amount account, validation for serial no qty
|
2016-08-17 16:20:13 +05:30 |
|
Nabin Hait
|
95c998109d
|
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
Validate on changing from Total to Valuation/Valuation&Total when add…
|
2016-08-17 12:12:14 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|
Rushabh Mehta
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Rohit Waghchaure
|
9cd356c7f0
|
[POS] Fixed print qty decimal issue
|
2016-08-16 10:44:21 +05:30 |
|
Rohit Waghchaure
|
033ed00c56
|
[POS] fixed issue of negative stock
|
2016-08-11 16:37:29 +05:30 |
|
Rushabh Mehta
|
6c0d9579d2
|
Merge pull request #6055 from rohitwaghchaure/bank_reconciliation_statement_report_issue
[Fix] No permission to read DocType for account user in bank reconciliation statement report
|
2016-08-11 10:55:10 +05:30 |
|
Rohit Waghchaure
|
e78ef5f8c8
|
[Fix] No permission to read DocType for account user in bank reconciliation statement report
|
2016-08-11 00:46:15 +05:30 |
|
Rohit Waghchaure
|
315a5e1b4d
|
[Fix] Debit and credit not equal for purchase invoice, if update stock is yes and taxes is defined
|
2016-08-11 00:35:00 +05:30 |
|
Rushabh Mehta
|
a7d92bc8f6
|
Merge pull request #6050 from rohitwaghchaure/pos_serial_no_search_issue
[Fix] Serial no search issue, if serial no is similar with item code.
|
2016-08-10 18:52:17 +05:30 |
|
Rohit Waghchaure
|
ea5a32d304
|
[Fix] Searial no search issue, if serial no is similar with item code
|
2016-08-10 17:18:52 +05:30 |
|
Rushabh Mehta
|
185c247286
|
Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 14:25:42 +05:30 |
|
pawan mehta
|
399a4bf201
|
[fix] #5723
|
2016-08-10 13:20:16 +05:30 |
|
Rohit Waghchaure
|
70be24d6f0
|
[Fix] Get account of the mode of payment on sales invoice and pos profile
|
2016-08-10 13:16:39 +05:30 |
|
aruizramon
|
8bd2487533
|
semicolon
|
2016-08-09 16:04:45 -04:00 |
|
Alec Ruiz-Ramon
|
08fb39f1ba
|
Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct'
|
2016-08-09 15:38:34 -04:00 |
|
Rohit Waghchaure
|
baef2624a2
|
Given provision to enter write off and change amount on POS
|
2016-08-10 00:50:53 +05:30 |
|
Rushabh Mehta
|
ec2d09c557
|
[minor] setting up website optional in setup wizard
|
2016-08-09 16:44:37 +05:30 |
|
Rohit Waghchaure
|
c41ab8d15b
|
Added change amount account
|
2016-08-08 23:19:18 +05:30 |
|
Rohit Waghchaure
|
7127a8f522
|
Allow user to edit change amount from sales invoice form for is pos
|
2016-08-08 23:19:18 +05:30 |
|
Nabin Hait
|
ae65172dca
|
Added 'Ledger' button to show accounting entries against PCV
|
2016-08-08 15:44:45 +05:30 |
|
Nabin Hait
|
d261d40c7e
|
Fixed test cases for period closing voucher
|
2016-08-08 15:44:45 +05:30 |
|
Nabin Hait
|
99d4ff4a29
|
Repost gle for future transactions if update stock checked in back dated purchase invoice
|
2016-08-08 14:12:58 +05:30 |
|
Nabin Hait
|
3ef6e7847e
|
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
[Fix] pos ambiguous issue
|
2016-08-08 12:40:28 +05:30 |
|
Nabin Hait
|
2cb8c6a867
|
Merge pull request #6015 from nabinhait/ar_ap_cols
[fix] Label for ageing cols in AR/AP report
|
2016-08-08 12:37:19 +05:30 |
|
Nabin Hait
|
c30c342bdf
|
[fix] Label for ageing cols in AR/AP report
|
2016-08-08 11:47:13 +05:30 |
|
Rohit Waghchaure
|
cd6c00d505
|
[Fix] pos ambiguous issue
|
2016-08-07 14:29:21 +05:30 |
|
Saurabh
|
ec14c81ebd
|
[minor][fix] return if account details not found
|
2016-08-07 08:52:45 +05:30 |
|
Rohit Waghchaure
|
b77a1057ce
|
fixes and cleanups.
|
2016-08-06 12:45:02 +05:30 |
|
Nabin Hait
|
e1d85f2467
|
Payment Entry fix: Unallocated amount in payment entry considering deductions
|
2016-08-05 14:51:36 +05:30 |
|
Nabin Hait
|
f43e49f378
|
Set received amount based on paid amount if currency is same
|
2016-08-03 14:17:05 +05:30 |
|
Nabin Hait
|
6620e2a494
|
Test case fixed for pos gl entry
|
2016-08-02 17:14:28 +05:30 |
|
Nabin Hait
|
3bb1a421f0
|
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
|
2016-08-02 16:41:15 +05:30 |
|
Rohit Waghchaure
|
7f031d1bfd
|
minor fix in payment entry
|
2016-08-02 11:07:40 +05:30 |
|
Rohit Waghchaure
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Rushabh Mehta
|
9421a109cf
|
[fix] reports template
|
2016-07-29 18:52:00 +05:30 |
|
Nabin Hait
|
e7d0639edc
|
Set difference amount in Payment Entry as per field precision
|
2016-07-28 16:56:59 +05:30 |
|
Nabin Hait
|
2a2346422d
|
[fix] Set amounts only if party and bank account exists
|
2016-07-27 13:08:00 +05:30 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Neil Trini Lasrado
|
d69d961f2a
|
Removed Administrator role from Doctypes
|
2016-07-25 11:39:23 +05:30 |
|
Saurabh
|
6e0a00b537
|
[minor][fix] flag fix for payment entry creation via payment request
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
90c0b7fbea
|
[fix] payment request demo
|
2016-07-22 15:43:27 +05:30 |
|
Saurabh
|
e4e8954a19
|
[fix] make payment request without payment gateway
|
2016-07-22 15:43:26 +05:30 |
|
Nabin Hait
|
13e248af8d
|
Merge pull request #5833 from nabinhait/fix_108
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 13:21:43 +05:30 |
|
Nabin Hait
|
2b12a74fef
|
Merge pull request #5822 from nabinhait/fix_106
Unlink payment entries on cancellation of Invoice
|
2016-07-22 13:17:04 +05:30 |
|
Nabin Hait
|
8ecb78ba39
|
Validate warehouse if update stock checked in Purchase Invoice
|
2016-07-22 12:25:16 +05:30 |
|
Rohit Waghchaure
|
ea278b5971
|
[Fix]POS and timesheet issues
|
2016-07-22 01:22:56 +05:30 |
|
Nabin Hait
|
e0cc87d2d8
|
Unlink payment entries on cancellation of Invoice
|
2016-07-21 18:30:18 +05:30 |
|
Nabin Hait
|
89d0b1b9a5
|
Merge pull request #5804 from nabinhait/demo1
Demo data for fixed asset depreciation
|
2016-07-21 10:05:00 +05:30 |
|
Nabin Hait
|
ba33026a6b
|
Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-21 09:39:57 +05:30 |
|
Rushabh Mehta
|
5a39d41a0c
|
[redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792
|
2016-07-20 22:53:23 +05:30 |
|
Rohit Waghchaure
|
61b4a43d84
|
[Fix] POS auto set paid amount with outstanding amount issue
|
2016-07-20 17:01:29 +05:30 |
|
Nabin Hait
|
3edefb19b9
|
Demo data for fixed asset depreciation
|
2016-07-20 16:14:30 +05:30 |
|
Rushabh Mehta
|
2f0dbd9bd8
|
[fix] test
|
2016-07-20 15:28:39 +05:30 |
|
Faris Ansari
|
8908d19bc9
|
[mobile ui] fix buttons
|
2016-07-20 14:00:08 +05:30 |
|
Nabin Hait
|
e2d0d7c5db
|
Merge pull request #5799 from nabinhait/fix104
Fixes
|
2016-07-20 12:38:49 +05:30 |
|
Rushabh Mehta
|
fc8e589295
|
[fix] party status updating bug, fixes #5794, #5796
|
2016-07-20 12:09:27 +05:30 |
|
Nabin Hait
|
85648d9bd6
|
payment entry fixes
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
b1234fa5e8
|
Set missing values in asset
|
2016-07-20 11:28:50 +05:30 |
|
Nabin Hait
|
df2a75ad1d
|
Updated standard chart of accounts
|
2016-07-20 11:27:58 +05:30 |
|
Rushabh Mehta
|
c0cc9902d9
|
Merge pull request #5776 from saurabh6790/warehouse_accounting_fix
[fix] for setting warehouse in account head
|
2016-07-19 21:35:09 +05:30 |
|
Rohit Waghchaure
|
88514a246b
|
set paid amount with grand amount on invoice form
|
2016-07-19 20:04:44 +05:30 |
|
Rushabh Mehta
|
02ba94784b
|
Merge pull request #5785 from rohitwaghchaure/batch_added_in_pos
[POS] Added batch and fixed issue of searching serial no #5779
|
2016-07-19 10:19:52 +05:30 |
|
Rushabh Mehta
|
6ecc0888ab
|
[minor] dont make tax template default, by default. #5695
|
2016-07-19 10:17:30 +05:30 |
|
Rohit Waghchaure
|
03da40ba4c
|
[Fix] Added batch in POS
|
2016-07-18 17:50:50 +05:30 |
|
Rushabh Mehta
|
5f9566f3af
|
[fix] text field for sales, purchase invoice advance fixes #5773
|
2016-07-18 14:44:12 +05:30 |
|
Rushabh Mehta
|
76b134192f
|
[fix] grid columns now restricted to 10
|
2016-07-18 14:30:27 +05:30 |
|
Nabin Hait
|
94105b04b8
|
Asset category mandatory validation while fetching item details
|
2016-07-16 11:20:50 +05:30 |
|
Saurabh
|
dcb41da02a
|
[fix] for setting warehouse in account head
|
2016-07-16 11:17:43 +05:30 |
|
Nabin Hait
|
96376b2345
|
Trigger receive/paid amount on change of paid from/to
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
6831b9422b
|
payment entry improvements and deletion of payment tool
|
2016-07-16 11:00:29 +05:30 |
|
Nabin Hait
|
4f5f8d7806
|
Set target exchange rate from source if currency is same
|
2016-07-16 10:59:48 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|
Rushabh Mehta
|
528e145a54
|
[docs] fixes #5697
|
2016-07-14 17:00:05 +05:30 |
|
Rushabh Mehta
|
8cfe18eccd
|
[demo] help
|
2016-07-13 11:30:10 +05:30 |
|
Nabin Hait
|
cc2083ebd0
|
[fix] Advance payment adjustment in sales/purchase invoice
|
2016-07-11 16:12:18 +05:30 |
|
Rushabh Mehta
|
3ce24d64c2
|
[cleanup] payment entry form view
|
2016-07-11 16:08:46 +05:30 |
|
Rohit Waghchaure
|
3e012b7e16
|
[Fix] Time sheet rename issues
|
2016-07-11 15:00:38 +05:30 |
|
Rushabh Mehta
|
391c0efcee
|
[fix] make grids editable
|
2016-07-11 13:01:58 +05:30 |
|
Rohit Waghchaure
|
89ee3091af
|
[Fix] POS minor fixes.
|
2016-07-08 15:17:04 +05:30 |
|
Rushabh Mehta
|
408d2c5db3
|
Merge pull request #5683 from rohitwaghchaure/v7_pos_issue_and_enhancement
[Fix] Access is pos from sales invoice form.
|
2016-07-07 16:46:32 +05:30 |
|
Rohit Waghchaure
|
539e913b46
|
[Fix] Access is pos from sales invoice form.
|
2016-07-07 16:44:40 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Rohit Waghchaure
|
2b590fd804
|
[Fix] Pricing rule issue
|
2016-07-07 12:22:22 +05:30 |
|
Nabin Hait
|
6a66138764
|
Merge pull request #5675 from rohitwaghchaure/rename_time_sheet_doctype
Rename Time Sheet doctype
|
2016-07-07 10:38:55 +05:30 |
|
Nabin Hait
|
378f5c48e5
|
[fix] Test cases
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
c19691632e
|
Button to make Depreciation Entry manually
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
e417000bbb
|
Fetch Fixed Asset property from item in Sales / Purchase Invoice
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
cea353a638
|
Validate expected value after useful life
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
e3e1b80fcc
|
Editable grid and query in asset category
|
2016-07-06 23:38:05 +05:30 |
|
Nabin Hait
|
b30acc7ddb
|
Fixes in Account
|
2016-07-06 23:38:04 +05:30 |
|
Nabin Hait
|
668d090eed
|
Fetch deatils from Item and Asset Category
|
2016-07-06 23:38:04 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Nabin Hait
|
70a1ddb6a1
|
Merge pull request #5671 from nabinhait/fixes90
Multiple fixes
|
2016-07-06 16:53:31 +05:30 |
|
Rohit Waghchaure
|
53bea82514
|
[Fixes] POS amount calculation issue
|
2016-07-06 16:15:10 +05:30 |
|
Nabin Hait
|
4671038211
|
Item Name added in Stock Reconciliation
|
2016-07-06 16:05:15 +05:30 |
|
Saurabh
|
c03a3bf580
|
[minor][fix] fix base_grand_total
|
2016-07-05 15:58:14 +05:30 |
|
Saurabh
|
066ae8e4c4
|
[fix] make cheque print compatible with payment entry
|
2016-07-05 12:46:38 +05:30 |
|
Nabin Hait
|
f6a0d789d0
|
Payment entry fixes
|
2016-07-04 17:26:02 +05:30 |
|
Nabin Hait
|
e4bbb696ab
|
Payment Entry minor improvements
|
2016-07-04 17:26:02 +05:30 |
|
Nabin Hait
|
ff2f3ef1b1
|
Test Case Fixes
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
e196190d10
|
minor fix
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
56548cbfa2
|
Payment against negative invoice, negative outstanding allocation and much more
|
2016-07-04 11:42:25 +05:30 |
|
Nabin Hait
|
9db1b223da
|
Payment Entry: Test cases and default remarks
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
05aefbbf5d
|
Payment Entry from invoice
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
221fa98b51
|
Payment Entry: Payment period based on invoice date
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
16d6959d01
|
Payment Entry included in Bank Reconciliation and related reports
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
1991c7b17d
|
Payment Reconciliation changes for Payment Entry
|
2016-07-04 11:42:24 +05:30 |
|
Nabin Hait
|
28a0528ae4
|
Advance Payment Entry adjustment against Invoice
|
2016-07-04 11:42:04 +05:30 |
|
Nabin Hait
|
e3a10170f7
|
Payment Entry submission and more
|
2016-07-04 11:41:24 +05:30 |
|
Nabin Hait
|
12e2a51519
|
[new][feature] Payment Entry
|
2016-07-04 11:41:24 +05:30 |
|
Rushabh Mehta
|
2be94f7675
|
Merge pull request #5615 from rohitwaghchaure/v7_rfq_fixes
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
|
2016-07-04 10:58:33 +05:30 |
|
Rohit Waghchaure
|
ad884b9fa9
|
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
|
2016-07-02 22:28:29 +05:30 |
|
Rohit Waghchaure
|
fc1fa9a774
|
[RFQ Enhancement] Added button on supplier row to download PDF for particular supplier
|
2016-07-01 14:53:11 +05:30 |
|
Saurabh
|
621247807a
|
[fix] BOM tree as default view
|
2016-06-30 15:05:06 +05:30 |
|
Rushabh Mehta
|
a11839307f
|
Merge pull request #5553 from saurabh6790/pos_fixes
[minor][fix] throw if payment modes are not set
|
2016-06-29 21:56:20 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Rushabh Mehta
|
da43539c53
|
Merge pull request #5558 from saurabh6790/doc_flow_fix
[minor][fix] fix filter in previous link mapper
|
2016-06-29 12:19:54 +05:30 |
|
Saurabh
|
52c2affc9c
|
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
|
2016-06-28 14:41:48 +05:30 |
|
Saurabh
|
9a6c6663c1
|
[minor][fix] throw if payment modes are not set
|
2016-06-27 18:16:07 +05:30 |
|
Saurabh
|
82b8b38b3d
|
[fix] fix filter in previous link mapper
|
2016-06-27 17:51:29 +05:30 |
|
Rushabh Mehta
|
d362b734a2
|
Merge pull request #5529 from saurabh6790/module_flow
[fix] previous document links
|
2016-06-27 17:23:46 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +05:30 |
|
Saurabh
|
99892c7ce7
|
[fix] provision to convert group to ledger and vice versa
|
2016-06-27 17:16:56 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Saurabh
|
b6d6b8420d
|
[fix] add filters and child doc name in previous link mapper
|
2016-06-27 14:48:26 +05:30 |
|
Saurabh
|
2a0b111726
|
[fix] mark completed docuemts on document flow
|
2016-06-27 12:28:55 +05:30 |
|
Saurabh
|
8f24ecb173
|
[fix] set previous doc links for document flow
|
2016-06-27 12:28:55 +05:30 |
|
Saurabh
|
78333c7e07
|
[fixes] check group condition
|
2016-06-26 14:27:46 +05:30 |
|
Saurabh
|
7fecb50360
|
[enhance] rename warehouse account type to stock
|
2016-06-26 14:27:46 +05:30 |
|
Rushabh Mehta
|
723cd64249
|
[fix] tree view hooks and patch fix
|
2016-06-25 18:30:03 +05:30 |
|
Nabin Hait
|
7b6cdf4a63
|
Merge pull request #5518 from saurabh6790/warehouse_tree
Warehouse tree
|
2016-06-25 13:49:15 +05:30 |
|
Saurabh
|
dc2fa86222
|
[fixes] rename ctype to doctype
|
2016-06-25 11:16:55 +05:30 |
|
Saurabh
|
3a0f96bd00
|
[patch] patch to move all warehouses under all warehouse group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
4d02949814
|
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ec8babe7ac
|
[minor][fix]
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
1702273968
|
[fix] rename account browser and sales browser to tree/doctype for view
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
ac53357f53
|
[fixes] renamed _treeview to _tree
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
a9ba7343c4
|
[fix] deprecate browser pages for accounts, cost_center, sales , bom, item group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
554f6f70aa
|
[fixes] nested set fix for warehouse, tree for accounts and cost center
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
0e47bfeb16
|
[enhance] treeview to BOM, sales person, Cost Center and Chart of acounts
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
777f556b14
|
[fixes] set default values to cheque print and set background image only if attachment exist
|
2016-06-23 20:25:37 +05:30 |
|
Nabin Hait
|
a531ebea8a
|
Merge branch 'master' into develop
|
2016-06-21 16:44:05 +05:30 |
|
Rohit Waghchaure
|
c65c38d293
|
[POS] Minor fixes
|
2016-06-16 11:49:37 +05:30 |
|
Rushabh Mehta
|
2cb7a9f235
|
[ux] taxes table editable
|
2016-06-15 16:45:03 +05:30 |
|
Rohit Waghchaure
|
9fe40d557f
|
[POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes.
|
2016-06-14 01:11:09 +05:30 |
|
Rushabh Mehta
|
e0686b32f3
|
[minor] cleanups
|
2016-06-10 12:38:52 +05:30 |
|
Rohit Waghchaure
|
28c02fe51d
|
[Fix] POS page loading issue, if system has only one item
|
2016-06-10 00:48:03 +05:30 |
|
Anand Doshi
|
51ad436e16
|
[fix] sales and accounts browser name
|
2016-06-09 19:37:35 +05:30 |
|
Rushabh Mehta
|
cb29d9886c
|
[minor] fixes #5252
|
2016-06-08 17:31:11 +05:30 |
|
Rushabh Mehta
|
6e837599b1
|
[minor] added cost center to item wise sales register, fixes #5301
|
2016-06-08 16:35:10 +05:30 |
|
Anand Doshi
|
16e2442278
|
[cleanup] document flow
|
2016-06-07 18:55:23 +05:30 |
|
Saurabh
|
7d0e78d399
|
[fixes] this.frm instead of cur_frm
|
2016-06-07 17:19:36 +05:30 |
|
Saurabh
|
9df3d0fb8a
|
[enhance] show module flow on top of document
|
2016-06-07 17:19:36 +05:30 |
|
Rohit Waghchaure
|
690a0805f6
|
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
|
2016-06-07 10:46:59 +05:30 |
|
Rushabh Mehta
|
eb1e0673e2
|
Merge pull request #5354 from saurabh6790/cheque_print
Cheque print
|
2016-06-02 17:48:58 +05:30 |
|
Rushabh Mehta
|
c5c0d96064
|
Merge pull request #5395 from saurabh6790/payment_request_ux
[enhance] ux fixes for payment request, added jinja for payment reque…
|
2016-06-02 17:48:36 +05:30 |
|
Nabin Hait
|
8e4ec8d84a
|
Merge pull request #5416 from nabinhait/tax_rule_based_on_county
Tax Rule based on County
|
2016-06-01 13:09:53 +05:30 |
|
Nabin Hait
|
cc07148336
|
Merge pull request #5428 from ShashaQin/patch-21
Update fiscal_year.py
|
2016-06-01 12:58:13 +05:30 |
|
Nabin Hait
|
9a5cf6000e
|
[fix] Test cases and editable fields settings for request for quotation
|
2016-06-01 12:54:26 +05:30 |
|
Nabin Hait
|
4eaeda710d
|
Tax Rule based on County
|
2016-06-01 12:54:26 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
ShashaQin
|
5dd72fe196
|
Update fiscal_year.py
|
2016-06-01 11:39:53 +08:00 |
|
Nabin Hait
|
919b1b9d5b
|
Merge pull request #5408 from neilLasrado/hotfix-2
Fixed error in Gross Profit report
|
2016-05-31 17:41:19 +05:30 |
|
Nabin Hait
|
7ab088ed3f
|
Merge pull request #5414 from nabinhait/journal_entry_ux
Fetch party info in Journal Entry on selection of reference Invoice
|
2016-05-31 17:38:22 +05:30 |
|
Nabin Hait
|
6a110331e8
|
Merge pull request #5415 from nabinhait/company_permissions_fix
Ignore permissions for account/warehouse creation from Company
|
2016-05-31 17:38:08 +05:30 |
|
Nabin Hait
|
bb502f8588
|
Merge pull request #5417 from nabinhait/grid_editable_fields
[fix] Enabled editable fields in Budget
|
2016-05-31 17:37:36 +05:30 |
|
shreyas
|
2bb845e53f
|
[Fix] User allowed to delete the root account in Chart of Accounts
|
2016-05-31 17:15:28 +05:30 |
|
Rushabh Mehta
|
0dcb861b56
|
[minor]
|
2016-05-31 07:22:51 +05:30 |
|
Nabin Hait
|
37c53f0a04
|
[fix] Enabled editable fields in Budget
|
2016-05-30 18:20:31 +05:30 |
|
Nabin Hait
|
f169e5c04d
|
Ignore permissions for account/warehouse creation from Company
|
2016-05-30 12:15:36 +05:30 |
|
Nabin Hait
|
9fdd37e1ad
|
Fetch party info in Journal Entry on selection of reference Invoice
|
2016-05-30 11:49:16 +05:30 |
|
Neil Trini Lasrado
|
efccb8a704
|
Fixed error in Gross Profit report
|
2016-05-27 13:24:02 +05:30 |
|
Nabin Hait
|
0014aa9c26
|
[fix] Charts in report
|
2016-05-27 12:21:36 +05:30 |
|
Nabin Hait
|
591a5aba56
|
Added Project in GL Entry and General Ledger report
|
2016-05-26 17:51:20 +05:30 |
|
Nabin Hait
|
b46d021f2a
|
Charts on reports / activity page, deprecated financial analytics report
|
2016-05-26 15:26:01 +05:30 |
|
Nabin Hait
|
44c1b8e63b
|
Line/Bar chart in Balance Sheet / Profit and Loss statement
|
2016-05-26 15:26:01 +05:30 |
|
Nabin Hait
|
28bdff5a55
|
Pie chart for ageing analysis in accounts receivale/payable
|
2016-05-26 15:26:01 +05:30 |
|
Rohit Waghchaure
|
f2aa1764cc
|
[POS] enhancement and minor fixes
|
2016-05-25 15:04:46 +05:30 |
|
Saurabh
|
ed0816832d
|
[enhance] ux fixes for payment request, added jinja for payment request message
|
2016-05-25 11:55:30 +05:30 |
|
Rushabh Mehta
|
1885645d6d
|
[fix] [patch]
|
2016-05-24 16:10:21 +05:30 |
|
Saurabh
|
81501ddc6d
|
[fixes] add setting to mark cheque account pay only
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
2fc0ffad34
|
[fixes] js templating to get cheque print view
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
9ca9f2d551
|
[Fixes] UX fixes
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
bb95d36218
|
[fixes] field re-structuring
|
2016-05-24 10:28:14 +05:30 |
|
Saurabh
|
1b62ecea44
|
[enhancement] cheque print
|
2016-05-24 10:28:14 +05:30 |
|
Nabin Hait
|
79ddf67289
|
Merge pull request #5362 from nabinhait/budget
Budgeting
|
2016-05-23 17:56:42 +05:30 |
|
Nabin Hait
|
8f70370457
|
Chart of accounts fixed for Spain
|
2016-05-23 17:41:51 +05:30 |
|
Nabin Hait
|
03b08e7a91
|
[fix] Period closing voucher
|
2016-05-23 16:28:39 +05:30 |
|
Nabin Hait
|
832988e2fd
|
test case fixed
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
ca90963d5b
|
Redesigned budgets
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
b9bc7d6df3
|
[feature] New document for Budget
|
2016-05-23 13:04:26 +05:30 |
|
Rushabh Mehta
|
d0cee1b61b
|
[fix] minor fixes to pos
|
2016-05-20 12:54:59 +05:30 |
|
Rushabh Mehta
|
40b3a5bcc4
|
[optimize] communication query for heatmap
|
2016-05-20 12:54:59 +05:30 |
|
Nabin Hait
|
563bd056d7
|
Merge branch 'master' into develop
|
2016-05-20 12:18:28 +05:30 |
|
Nabin Hait
|
3956c94bbb
|
Merge pull request #5340 from rohitwaghchaure/support_week_new
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-20 12:06:22 +05:30 |
|
Nabin Hait
|
5dfcfc5606
|
Merge pull request #5366 from saurabh6790/set_default_bank_acc_in_bank_reco
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-20 11:36:44 +05:30 |
|
Rushabh Mehta
|
532eedf411
|
[enhance] more editable grids
|
2016-05-19 18:22:49 +05:30 |
|
Rohit Waghchaure
|
d818bcd888
|
[Fixes] tax rule, tax rule working even if tax template inside the rule is disabled.
|
2016-05-19 16:53:01 +05:30 |
|
Saurabh
|
c0c8af06da
|
[fixes] set default bank account in bank reconciliation statement report
|
2016-05-19 12:32:08 +05:30 |
|
Nabin Hait
|
1daebc04d0
|
Merge pull request #5360 from neilLasrado/hotfix
Fixed reports
|
2016-05-18 10:39:19 +05:30 |
|
Neil Trini Lasrado
|
4668a69cf5
|
Fixed reports
|
2016-05-17 19:04:08 +05:30 |
|
Rohit Waghchaure
|
5d97d89a03
|
[Fix] Sales Invoice shows default date while no default mentioned
|
2016-05-17 15:13:17 +05:30 |
|
Nabin Hait
|
a09285122f
|
Added root type for Income. Fixes #5356
|
2016-05-17 10:37:31 +05:30 |
|
Rushabh Mehta
|
72615977d7
|
Merge pull request #5337 from rohitwaghchaure/pos
[WIP] [POS] Some changes and fixes
|
2016-05-16 12:06:42 +05:30 |
|
Rohit Waghchaure
|
e0934d118f
|
[Fixes] Some changes and fixes
|
2016-05-16 12:01:16 +05:30 |
|
Nabin Hait
|
665568d87e
|
ignore permissions while creating records from charts builder portal
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
a21f49dd94
|
Tax rate in chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
e4670a9a45
|
Cleaned up chart of accounts
|
2016-05-13 15:56:11 +05:30 |
|
Nabin Hait
|
825070e504
|
Merge pull request #5331 from nabinhait/multi-fix-55
Multiple fixes
|
2016-05-12 12:27:42 +05:30 |
|
Anand Doshi
|
19fec06366
|
[fix] Validate Company in Account autoname
|
2016-05-11 13:27:18 +05:30 |
|
Nabin Hait
|
b81ed45b2b
|
fixed conflict
|
2016-05-11 12:52:31 +05:30 |
|
Nabin Hait
|
b3a0e05bae
|
included path fixed in report print formats
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
a1ec7f1eed
|
Add root account
|
2016-05-11 12:38:11 +05:30 |
|
Nabin Hait
|
3323d06be0
|
Mode of Payment columns and filters added in sales/purchase register
|
2016-05-10 13:17:02 +05:30 |
|
Rohit Waghchaure
|
6087fe178e
|
[Enhancement] POS
|
2016-05-09 23:36:15 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
shreyas
|
c2a49211a5
|
[Fix] Payment Tool, Fetch due date when user does 'Get Outstanding Vouchers'
|
2016-05-05 15:56:48 +05:30 |
|
shreyas
|
622fe3f1e3
|
[Fix] Fetch due date for Sales/Purchase invoice in payment tool
|
2016-05-05 15:11:04 +05:30 |
|
Rushabh Mehta
|
c711b82889
|
Merge pull request #5296 from KanchanChauhan/websitemakeover
New look to the website
|
2016-05-02 15:54:41 +05:30 |
|
Nabin Hait
|
863cb12426
|
minor fix
|
2016-05-02 13:48:27 +05:30 |
|
Kanchan Chauhan
|
239b351367
|
New look to the website
|
2016-05-02 11:43:44 +05:30 |
|
Nabin Hait
|
b78adcf279
|
Merge branch 'master' into develop
|
2016-04-29 18:26:46 +05:30 |
|
Neil Trini Lasrado
|
c33b5b74c6
|
Itemwise purchase and Itemwise sales
|
2016-04-29 18:21:51 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Nabin Hait
|
6146cc1e33
|
Merge branch 'master' into develop
|
2016-04-29 11:44:55 +05:30 |
|
Nabin Hait
|
48577c15a2
|
Show all scheduled depreciation in dotted line
|
2016-04-28 18:12:41 +05:30 |
|
Nabin Hait
|
70f05df075
|
Asset Movement
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
ce35c56cd3
|
Added line graph in asset dashboard
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
92426f5e56
|
Added Image field in Asset
|
2016-04-28 18:01:32 +05:30 |
|
Nabin Hait
|
314246939f
|
[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice
|
2016-04-28 17:32:36 +05:30 |
|
Nabin Hait
|
b7b7f0062d
|
[report][fix] Consider taxes only the tax contributed in invoice total
|
2016-04-28 17:31:27 +05:30 |
|
Anand Doshi
|
79c536acb5
|
Merge branch 'master' into develop
|
2016-04-27 15:44:11 +05:30 |
|
Anand Doshi
|
b5e700f3af
|
Merge pull request #5248 from saurabh6790/hotfix
[fixes] raise exception on deletion of fiscal year if fiscal year is set as Default
|
2016-04-27 14:25:58 +05:30 |
|
Neil Trini Lasrado
|
4c95ed49ed
|
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
|
2016-04-27 13:09:17 +05:30 |
|
Saurabh
|
9be40ee7c3
|
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
|
2016-04-27 12:58:40 +05:30 |
|
Anand Doshi
|
c6479bcbb6
|
Merge pull request #5264 from neilLasrado/hotfix
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
|
2016-04-27 12:32:05 +05:30 |
|
Neil Trini Lasrado
|
b93d525c96
|
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
|
2016-04-25 17:18:52 +05:30 |
|
Rushabh Mehta
|
621283c5c5
|
[enhancement] stock balance page
|
2016-04-21 19:00:34 +05:30 |
|
Rushabh Mehta
|
202cb7cdf1
|
Merge pull request #5249 from nabinhait/fixed_asset
Fixed asset
|
2016-04-21 11:41:11 +05:30 |
|
Nabin Hait
|
595d3c03ef
|
updated docs for fixed asset
|
2016-04-20 18:17:05 +05:30 |
|
Nabin Hait
|
85a2776e91
|
Depreciation Schedule considering already booked depreciations for existing asset and testcases
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
318fa287df
|
[report] Asset Depreciations and Balances
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
e58c26edca
|
[report] Added asset depreciation ledger report
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
cd0e8ce8ad
|
Fixes and modification in fixed asset
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
3d9c5c0c20
|
Fixed Asset module cleanup and fixes
|
2016-04-20 17:57:11 +05:30 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +05:30 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Nabin Hait
|
c46c1f0288
|
[fix] Rejected serial nos in purchase invoice
|
2016-04-18 17:46:36 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +05:30 |
|
Saurabh
|
7fee1b8343
|
[fixes] set expence account to item on sales invoice
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
224737b9ed
|
[fixes] split make gl entry function into chuncks as per SI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
fbb342c1ac
|
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
130c57b201
|
[fixes] code clean-up
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
e29248bcb3
|
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
d697f3d6a3
|
[minor][fix] reset is_paid if company not selected
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
43520f93a1
|
[fixes] test cases, code cleanup.
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
2a0e2fe95c
|
[test-case] test update stock and payment
|
2016-04-18 15:57:56 +05:30 |
|
Saurabh
|
4bd34a58ba
|
[fixes] fix perpetual inventory
|
2016-04-18 15:57:55 +05:30 |
|
Saurabh
|
bd5fc8ecbe
|
[fixes] add posting time
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
c204775fe2
|
Added posting_time in purchase invoice
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
821f571640
|
added payments, make receipt field
|
2016-04-18 15:57:55 +05:30 |
|
jof2jc
|
524ebbcbb9
|
Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice
|
2016-04-18 15:57:55 +05:30 |
|
Umair Sayyed
|
72534deea2
|
removed Is Sales Item and Is Purchase Item
|
2016-04-15 12:57:00 +05:30 |
|
Nabin Hait
|
bd07ea43e8
|
fixed conflict
|
2016-04-15 11:06:41 +05:30 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Nabin Hait
|
e393c62086
|
[fix] Set debit / credit as per field precision
|
2016-04-14 18:15:42 +05:30 |
|
Rushabh Mehta
|
15a7f215b9
|
[enhancement] heatmaps on item and notifications for item
|
2016-04-14 17:30:53 +05:30 |
|
Umair Sayyed
|
6269f1e3d0
|
address and contact related fields re-arranged in the sales transactions fixes #5192
|
2016-04-14 13:07:41 +05:30 |
|
Rushabh Mehta
|
8c9c57c8f3
|
[minor] update party timestamp after transaction
|
2016-04-13 18:22:06 +05:30 |
|
Nabin Hait
|
c2ae1a7375
|
fixed merge conflict
|
2016-04-13 11:55:15 +05:30 |
|
Rushabh Mehta
|
8bbca6fa2e
|
[enhancement] links menu in customer, supplier, item
|
2016-04-12 19:16:33 +05:30 |
|
Nabin Hait
|
471908ab9f
|
Merge pull request #5194 from nabinhait/gross_profit_fix
Gross profit fix
|
2016-04-12 18:57:45 +05:30 |
|
Nabin Hait
|
8a686ba982
|
[fix] Prevent from directly creating payment request
|
2016-04-12 17:02:15 +05:30 |
|
Nabin Hait
|
f509d13d28
|
[fix] Get average selling rate based on group by
|
2016-04-12 17:01:39 +05:30 |
|
Rushabh Mehta
|
5d0e8dee11
|
[fix] dashboard for customer, supplier
|
2016-04-11 17:34:49 +05:30 |
|
Nabin Hait
|
3912a31a6f
|
Merge pull request #5176 from nabinhait/ar_ap_print_currency
Currency column in AR/AP and Sales/Purchase register report
|
2016-04-11 17:13:04 +05:30 |
|
Nabin Hait
|
f945e10cce
|
Currency column in AR/AP and sales/purchase register report
|
2016-04-11 11:56:57 +05:30 |
|
Rushabh Mehta
|
2dff9275f3
|
[test] fixed circular dependencies
|
2016-04-08 18:05:12 +05:30 |
|
Anand Doshi
|
2f957f27b0
|
[fix] apply Tax Rule for lead
|
2016-04-08 17:43:08 +05:30 |
|
Rushabh Mehta
|
f16f9c569b
|
[enhancement] add status in customer, supplier
|
2016-04-08 17:21:00 +05:30 |
|
Rushabh Mehta
|
203cc962f5
|
[enhancement] Item Selector
|
2016-04-08 17:21:00 +05:30 |
|
Anand Doshi
|
79a415e3b8
|
[fix] Use for shopping cart validation in Tax Rule
|
2016-04-08 17:08:26 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Anand Doshi
|
a32b3ea3e8
|
Merge pull request #5115 from nabinhait/test_fix
[fix] Test cases
|
2016-04-04 17:43:02 +05:30 |
|
Nabin Hait
|
94360cca20
|
[fix] received and delivered items to be billed report based on percentage billed
|
2016-04-04 17:40:33 +05:30 |
|
Anand Doshi
|
f1b276122e
|
Merge pull request #5117 from nabinhait/report_modified_change
[fix] Modified date changed in query report due to project field renaming
|
2016-04-04 17:04:14 +05:30 |
|
Anand Doshi
|
62be8dfd21
|
Merge pull request #5131 from shreyasp/creditnote-print-format
[Fix] Correct amount shown in credit note print format
|
2016-04-04 15:37:31 +05:30 |
|
shreyas
|
c6b47bcdda
|
[Fix] Show amount in credit note print format
|
2016-04-04 15:13:03 +05:30 |
|
Anand Doshi
|
15f7b1ee1a
|
[fix] POS paid amount validation using grand total
|
2016-04-04 15:03:28 +05:30 |
|
sudip
|
0e55417f81
|
Add User Remarks to Quick Entry Form in Journal Entry
|
2016-04-02 08:42:42 +05:45 |
|
Nabin Hait
|
4f10f15686
|
[fix] Modified date changed in query report due to project field renaming
|
2016-04-01 17:59:06 +05:30 |
|
Nabin Hait
|
adddf6f471
|
[fix] Test cases
|
2016-04-01 16:47:46 +05:30 |
|
Rushabh Mehta
|
8ca426d94a
|
Merge pull request #5095 from rohitwaghchaure/new_rfq
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-04-01 11:41:15 +05:30 |
|
Rushabh Mehta
|
fff8e6c733
|
Merge pull request #5080 from nabinhait/fy_overlap
[fix] Added overlap validation in fiscal year
|
2016-04-01 11:37:03 +05:30 |
|
rohitwaghchaure
|
62fea0374b
|
[Enhancement] Added currency symbol on RFQ form of supplier portal, currency validation for party
|
2016-03-31 21:49:07 +05:30 |
|
Rushabh Mehta
|
45c6b550f0
|
[cleanup] assets and made items mandatory in transactions
|
2016-03-31 15:37:51 +05:30 |
|
Rushabh Mehta
|
acf28af19c
|
[fix] set default depreciation accounts and test fix
|
2016-03-31 15:04:06 +05:30 |
|
Nabin Hait
|
2ed0b59747
|
[fix] Added overlap validation in fiscal year
|
2016-03-31 12:40:37 +05:30 |
|
Nabin Hait
|
91a58808c0
|
[fix] Allowed deletion of root account
|
2016-03-31 11:59:10 +05:30 |
|
Nabin Hait
|
684052e978
|
[fix] Permissions added in asset and asset category
|
2016-03-30 15:06:25 +05:30 |
|
Nabin Hait
|
7fcec4118b
|
[fix] Test case
|
2016-03-30 15:06:25 +05:30 |
|
Rushabh Mehta
|
3fc6fdeba0
|
[cleanup] for quick-entry
|
2016-03-30 13:18:30 +05:30 |
|
Rushabh Mehta
|
652dee45a6
|
[minor] make margin collapsible
|
2016-03-29 16:42:13 +05:30 |
|
Rushabh Mehta
|
1d05ada5e9
|
Merge pull request #4950 from nabinhait/fixed_asset_depreciation
Fixed asset depreciation
|
2016-03-29 16:39:31 +05:30 |
|
Rushabh Mehta
|
22fe3a8b7e
|
Merge pull request #5081 from nabinhait/trans_fix
[fix] Translations
|
2016-03-29 15:16:07 +05:30 |
|
Rushabh Mehta
|
b5aa50de06
|
[fix] select default company in chart of accounts
|
2016-03-29 14:41:20 +05:30 |
|
Nabin Hait
|
d9449e396f
|
[fix] Translations
|
2016-03-29 13:22:31 +05:30 |
|
Rushabh Mehta
|
c9850f9e04
|
Merge pull request #5077 from frappe/master
Master
|
2016-03-29 11:59:32 +05:30 |
|
Nabin Hait
|
fb03b96992
|
fixed asset fixes
|
2016-03-29 11:54:38 +05:30 |
|
Nabin Hait
|
7de15321c9
|
[docs] Managing fixed assets
|
2016-03-29 11:54:38 +05:30 |
|
Nabin Hait
|
06a41aca13
|
fixed asset: related accounts added in default chart of accounts
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
7536349f17
|
Fixed asset: status, restore, testcase and much more
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
4d668dbaa3
|
[tests] creation of asset and asset category
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
4fdb05228d
|
fixed asset depreciation
|
2016-03-29 11:54:37 +05:30 |
|
Nabin Hait
|
3a15c92c5e
|
Fixed Asset Depreciation first commit
|
2016-03-29 11:54:37 +05:30 |
|
Rushabh Mehta
|
9904c5acf4
|
Merge pull request #5050 from neilLasrado/develop
Fixes Translations
|
2016-03-29 10:51:44 +05:30 |
|
Rushabh Mehta
|
e1b20a0b29
|
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
|
2016-03-28 18:27:05 +05:30 |
|
rohitwaghchaure
|
a1064a6149
|
[enhancement] request for quotation
|
2016-03-28 17:28:45 +05:30 |
|
Neil Trini Lasrado
|
b176dea74e
|
Fixed issues in Pricing Rule if multiple pricing rules existed with same priority
|
2016-03-28 13:23:47 +05:30 |
|
Neil Trini Lasrado
|
b6d9946854
|
Fixes Translations
|
2016-03-28 12:44:05 +05:30 |
|
Rushabh Mehta
|
c20c536f28
|
[fix] [wip] cleanup for collaborative pm
|
2016-03-25 17:22:17 +05:30 |
|