Rushabh Mehta
|
24f658d633
|
[fix] [minor] accounts receivable not translated (#6943)
|
2016-11-16 11:13:46 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
0075c7e659
|
Purchase Order and Receipt links in Purchase Invoice dashboard
|
2016-11-14 12:32:16 +05:30 |
|
Nabin Hait
|
7017dc029a
|
Editable grid columns for payment entry
|
2016-11-14 12:32:16 +05:30 |
|
Rohit Waghchaure
|
387c2846aa
|
[Report] Company not found in the filter for making auto email report
|
2016-11-10 19:13:20 +05:30 |
|
Nabin Hait
|
ceca1b97c3
|
Fixed merge conflict
|
2016-11-09 14:58:36 +05:30 |
|
Rohit Waghchaure
|
2285f90b64
|
added debit and credit note status
|
2016-11-09 14:47:24 +05:30 |
|
Nabin Hait
|
5ccead5df0
|
Merge pull request #6850 from nabinhait/clear_jv_table
Clear rows from Journal Entry if no debit/credit
|
2016-11-09 11:40:42 +05:30 |
|
Nabin Hait
|
d4e59aa54f
|
Update journal_entry.py
|
2016-11-09 11:38:39 +05:30 |
|
Nabin Hait
|
a0a8cc58ae
|
Merge pull request #6865 from frappe/typo-fix
[fix] minor typo
|
2016-11-09 11:20:34 +05:30 |
|
Rohit Waghchaure
|
2f1db57fe1
|
Added status field in sales invoice and purchase invoice
|
2016-11-08 18:49:58 +05:30 |
|
Nabin Hait
|
a469e659c5
|
Fixed merge conflict
|
2016-11-08 15:26:27 +05:30 |
|
Valmik
|
38cc16a806
|
[fix] minor typo
|
2016-11-08 14:11:12 +05:30 |
|
Nabin Hait
|
be06cde5f5
|
Update gl_entry.py
|
2016-11-08 13:13:57 +05:30 |
|
Nabin Hait
|
cdc895734f
|
Merge pull request #6819 from rohitwaghchaure/hotfix_issues
cleanup and fixes
|
2016-11-08 12:05:47 +05:30 |
|
Rohit Waghchaure
|
619c40b04a
|
[POS] Pricing rule discount issue
|
2016-11-07 19:41:10 +05:30 |
|
Rushabh Mehta
|
13fc52d713
|
[minor] added default standard filters (#6854)
|
2016-11-07 17:19:19 +05:30 |
|
Nabin Hait
|
43eeddfaf6
|
Clear rows from Journal Entry if no debit/credit
|
2016-11-07 15:25:40 +05:30 |
|
Rohit Waghchaure
|
0ecad33642
|
cleanup and fixes
|
2016-11-05 08:09:21 +05:30 |
|
Nabin Hait
|
f5d8dd3b18
|
Fixed merge conflict
|
2016-11-04 16:54:53 +05:30 |
|
Nabin Hait
|
81f7a265bc
|
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
Remember last selected value for link field
|
2016-11-04 16:13:49 +05:30 |
|
Rohit Waghchaure
|
0d2f7e62c0
|
set remember last selected value as true for company field
|
2016-11-03 16:19:34 +05:30 |
|
Nabin Hait
|
eab38cd4eb
|
Merge branch 'master' into develop
|
2016-11-03 15:17:39 +05:30 |
|
Nabin Hait
|
ceca7fbc87
|
Merge pull request #6780 from rohitwaghchaure/float_issue
Change fieldtype from float to currency
|
2016-11-03 10:49:05 +05:30 |
|
Nabin Hait
|
c3b29f6a5b
|
Merge pull request #6738 from KanchanChauhan/name-on-check
Different name on Check
|
2016-11-01 17:29:04 +05:30 |
|
Rohit Waghchaure
|
60e5e4ac2d
|
change fieldtype from float to currency
|
2016-11-01 16:32:33 +05:30 |
|
Nabin Hait
|
f4068fd6f1
|
Fixed merge conflict
|
2016-11-01 15:06:55 +05:30 |
|
Rohit Waghchaure
|
53bb687009
|
hotfix issues
|
2016-11-01 13:21:43 +05:30 |
|
Kanchan Chauhan
|
6b162386ca
|
Different name on Check
|
2016-10-31 17:36:43 +05:30 |
|
Nabin Hait
|
551360ae30
|
Fixed merge conflict
|
2016-10-31 16:38:09 +05:30 |
|
Nabin Hait
|
f5f3ef1bae
|
repost gle for Purchase Invoice with update stock
|
2016-10-31 16:17:10 +05:30 |
|
Nabin Hait
|
bb5e333c1a
|
Update ae_uae_chart_template_standard.json
|
2016-10-28 15:20:31 +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 |
|
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 |
|