Anand Doshi
09fc4a456e
Merge pull request #4582 from nabinhait/develop
...
Chart of accounts added for Singapore and some other fixes
2016-01-06 15:01:49 +05:30
Anand Doshi
4774c41958
[fix] validate_multi_currency
2016-01-06 14:16:10 +05:30
Anand Doshi
e88ffe032e
[fix] show fields like sales_order, against_sales_order, schedule_date in item grid if In List View is checked
2016-01-06 12:54:59 +05:30
Nabin Hait
ea8bc8ecb0
Chart of accounts added for Singapore and some other fixes
2016-01-06 12:32:48 +05:30
Anand Doshi
06a82d4e1f
Merge pull request #4574 from rmehta/translations
...
Translation fixes
2016-01-05 18:41:18 +05:30
Rushabh Mehta
e64fbd6d3c
[minor] fixes for chart_of_accounts_builder app
2016-01-04 18:11:21 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Anand Doshi
f7980927a1
[fix] Payment Reconciliation: use the date and amount filters only for Invoice
2016-01-04 13:00:14 +05:30
Anand Doshi
c1e1026486
[fix] validate 'cannot change fiscal year dates' only if not new
2016-01-04 12:20:25 +05:30
Nabin Hait
0e2d1bd4ed
[fix] Ignore permissions while creating fiscal year automatically
2015-12-28 13:04:19 +05:30
Nabin Hait
b6b56453e1
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:37:06 +05:30
Nabin Hait
6f8dafbb5e
[fix] Validate advance entry based on party
2015-12-23 13:03:31 +05:30
Nabin Hait
d37cef7f60
[fix] Set debit/credit in company currency
2015-12-22 15:13:01 +05:30
Anand Doshi
ee2129ce1c
Merge pull request #4513 from nabinhait/discount_percentage
...
Additional Discount amount based on percentage
2015-12-21 16:13:17 +05:30
Nabin Hait
3769d87240
Additional Discount amount based on percentage
2015-12-18 13:12:08 +05:30
Nabin Hait
adab5d308c
[fix] Group account merging with sub-ordinate group
2015-12-17 12:53:25 +05:30
Nabin Hait
afda26e4f3
Fixed conflict
2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3
By: nabinhait
...
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0
Cleanup in cash flow
2015-12-16 16:09:43 +05:30
Nabin Hait
5e173c7106
Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop
2015-12-15 17:39:55 +05:30
Nabin Hait
8bdf8e675f
[fix][report] General Ledger
2015-12-15 15:02:04 +05:30
Rushabh Mehta
e8ab320028
[fix] rename tree item fixes #2524
2015-12-15 12:06:37 +05:30
Chris Ian Fiel
c80796cdd5
Cash Flow Report
2015-12-12 11:26:54 +08:00
Chris Ian Fiel
fde03453e4
Cash Flow Report
2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f
Cash Flow Report
2015-12-12 10:33:01 +08:00
Nabin Hait
c119cbcb50
Merge pull request #4449 from nabinhait/coa_fix
...
[fix] Stock account identified in COA of Guatamala
2015-12-09 13:58:09 +05:30
Giovanni Lion
5de53eb0eb
Voucher dynamic link fix to allow links to work if user language is not english
2015-12-09 15:45:40 +08:00
Nabin Hait
49fe7af6de
[fix] Stock account identified in COA of Guatamala
2015-12-09 11:27:10 +05:30
Nabin Hait
4372ac559a
Merge pull request #4443 from nabinhait/bank_reco_print
...
[fix] Print format for bank reco statement
2015-12-08 15:17:24 +05:30
Nabin Hait
7af5c4aefc
[fix] Print format for bank reco statement
2015-12-08 14:25:10 +05:30
Rushabh Mehta
441b2c7657
[minor] limit pos search to 24 items at a time
2015-12-08 12:16:53 +05:30
Nabin Hait
92bb480fc3
Merge pull request #4432 from bohlian/develop
...
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
2015-12-07 11:12:11 +05:30
bohlian
5e4c8a52ee
Payment To Be Shown When Outstanding Amount != 0
...
Payment button should be shown when outstanding amount != 0.
2015-12-07 12:06:08 +08:00
Saurabh
4f39fd243e
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
2015-12-06 10:09:06 +05:30
Nabin Hait
9547b774f7
[fix] Fixed amounts not reflected in bank
2015-12-04 11:05:25 +05:30
Rushabh Mehta
39e603a154
Merge pull request #4413 from nabinhait/bank_transfer_exchange_rate
...
Bank transfer exchange rate and account balance in COA
2015-12-03 17:56:03 +05:30
Nabin Hait
4c7a32e446
[fix] Toggle required for sales and purchase tax template based on tax type
2015-12-03 11:47:38 +05:30
Rushabh Mehta
f7911687a0
[minor] fixes to patch
2015-12-03 08:09:42 +05:30
Nabin Hait
f58a3726a7
Balance in chart of accounts in both company and account currency
2015-12-02 12:28:06 +05:30
Nabin Hait
1c77506e80
[fix] Don't overwrite exchange rate on saving for bank transfer
2015-12-02 12:28:06 +05:30
Rushabh Mehta
29cca2352c
[hot] [fix] trial balance report
2015-12-01 18:17:33 +05:30
Rushabh Mehta
29f9f6c147
[fixes] [ux] get product bundle items only on po, mr and button on toolbar
2015-12-01 11:36:22 +05:30
Rushabh Mehta
37d9d6fdea
Merge pull request #4402 from nabinhait/allow_root_accounts
...
[feature] Allowed custom root accounts in Chart of Accounts
2015-12-01 10:59:44 +05:30
Rushabh Mehta
0cc177f73c
Merge pull request #4400 from nabinhait/total_amount_in_jv
...
[fix] Total Amount in Journal Entry in bank currency
2015-12-01 10:58:34 +05:30
Nabin Hait
8c4e043747
[feature] Allowed custom root accounts in Chart of Accounts
2015-12-01 10:34:43 +05:30
Nabin Hait
621f4cd7c9
[fix] Invoicing against drop-ship Purchase Order
2015-11-30 18:40:28 +05:30
Nabin Hait
6c173e9730
[fix] Total Amount in Journal Entry in bank currency
2015-11-30 16:13:42 +05:30
Nabin Hait
ec1695dbe3
[fix] Bank Reconciliation in account currency
2015-11-30 15:23:46 +05:30
Rushabh Mehta
32e55e174d
[minor] fix error message
2015-11-30 10:51:29 +05:30