patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
saurabh
8e49951821
fetch customer or supplier language and set on sales and purchase flow's form
2016-02-23 02:17:03 +05:30
saurabh
65820ed013
added new field language for users
2016-02-23 02:17:03 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Nabin Hait
db746f5bc7
[fix] Condition for Payment and Return button visibility
2016-02-22 16:17:10 +05:30
Roland
ed2849adf9
Create at_austria_chart_Einheitskontenrahmen.json
...
Austrian Chart of Accounts compiled by fairkom.eu from various sources, among them the official "Österreichishcer Kontenrahmen" published by ÖPWZ - Fachsenat für Betriebswirtschaft und Organisation der Kammer der Wirtschaftstreuhänder Version May 2014. Numbering scheme has been slightly adapted to fit best with ERPnext setup of a company, where the most important accounts are automatically assigned. When using this chart of accounts, feel free to reduce / adapt the accounts - it is not legally binding.
2016-02-22 09:26:54 +01:00
Anand Doshi
52780cb937
Merge pull request #4841 from nabinhait/escape
...
[fix] Escaping strings with percentage
2016-02-19 13:01:00 +05:30
Nabin Hait
1a99cb8bfe
[fix] Escaping strings with percentage
2016-02-19 12:45:57 +05:30
Nabin Hait
fb24a27201
[fix] GLE for Rounding loss allowed upto 1 for all transactions except JE
2016-02-18 19:18:07 +05:30
Anand Doshi
828d5ffaab
[fix] Show Debit/Credit in Bank Reconciliation table
2016-02-17 18:31:58 +05:30
Anand Doshi
620252cadb
[fix] validate Fiscal Year in Trial Balance
2016-02-15 12:03:04 +05:30
Rushabh Mehta
6f574cd60f
[minor] do not commit pay-to-recd from in journal entry
2016-02-11 14:27:28 +05:30
Nabin Hait
7e02831897
[fix] Test case fixed
2016-02-10 15:54:52 +05:30
Nabin Hait
e1f6e60cea
[fix] Payment Request Fixes
2016-02-10 13:07:42 +05:30
Rushabh Mehta
7f3983a3d6
Merge pull request #4769 from rmehta/pricing-rule-on-variant
...
[fix] pricing rule for variant, if rule for template available, use it
2016-02-09 11:20:00 +05:30
Rushabh Mehta
faf9b589c4
[fix] pricing rule for variant, if rule for template available, use it
2016-02-08 18:49:27 +05:30
Nabin Hait
4c6af87ad0
[fix] Read permission to All for permlevel 1 fields
2016-02-08 16:56:19 +05:30
Anand Doshi
17d4fc4fa7
[enhancement] Merge Comment and Feed into Communication 💥
...
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Nabin Hait
2b8472fe54
Merge pull request #4744 from ccfiel/develop
...
undo bank recon.
2016-02-08 10:45:55 +05:30
Chris Ian Fiel
af667f77e6
Update bank_reconciliation.py
...
set to null if clearance_date is blank because if not it will set it just 0000-00-00.
2016-02-04 22:10:36 +08:00
ShashaQin
bcc56a4557
Update gross_profit.py
...
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac
Update financial_statements.py
2016-02-02 19:05:42 +05:30
ShashaQin
15d7224335
Update balance_sheet.py
2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827
Update profit_and_loss_statement.py
2016-02-02 19:05:42 +05:30
Nabin Hait
d5fda57297
[fix] Ignore permissions and made Customer warehouse field hidden in selling cycle
2016-02-01 15:55:09 +05:30
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
shreyas
eba9ca4d66
[Minor]Change to maintain args ordering convention
2016-01-26 16:29:26 +05:30
shreyas
79872bf62c
[Refactor]Changed variable name to avoid conflict between args and local variable
2016-01-26 13:57:06 +05:30
shreyas
c8ac3b042b
[Minor]Refactored code for better readability
2016-01-26 13:23:38 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
323dc96c99
[Travis] Fixed reference failure in party.py
2016-01-25 18:19:14 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
2ea5c6913d
Merge pull request #4685 from shreyasp/supplier-credit-fix
...
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 17:58:21 +05:30
Anand Doshi
5dcb40bc96
Merge pull request #4687 from anandpdoshi/fix/recurring-docs-no-copy
...
[fix] obey no_copy while creating recurring documents
2016-01-25 17:27:04 +05:30
Anand Doshi
c07489a096
[fix] Journal Entry: init debit/credit in account currency
2016-01-25 17:23:36 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
shreyas
28a6578ba2
Added the credit_days_based_on field to Supplier and Supplier Type doctype
2016-01-25 12:44:14 +05:30
Nabin Hait
568054ab96
[fix] Make Delivery Note from Sales Invoice
2016-01-21 18:50:28 +05:30
Nabin Hait
bb7e499cbd
Merge pull request #4662 from ccfiel/develop
...
undo reconciled journal entry record
2016-01-21 15:32:33 +05:30
Chris Ian Fiel
cb66d3a8c9
undo reconciled journal entry record
...
https://github.com/frappe/erpnext/issues/4661
2016-01-21 16:26:22 +08:00
Chris Ian Fiel
43a62ad0f0
undo reconciled journal entry record
2016-01-21 06:50:13 +08:00
Nabin Hait
002fa6c1d9
Merge pull request #4650 from RicardoJohann/patch-2
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
Nabin Hait
dbbc3eb8a6
Merge pull request #4656 from nabinhait/gle_rounding
...
[fix] Round off gle due to currency conversion
2016-01-20 16:48:42 +05:30
Nabin Hait
dd2f0330a6
Merge pull request #4641 from nabinhait/report-currency
...
[fix] Currency in Gross Profit report
2016-01-20 16:45:57 +05:30
Nabin Hait
d4507ac6a0
[fix] Round off gle due to currency conversion
2016-01-20 16:14:27 +05:30
RicardoJohann
05aa3b391e
Update bank_reconciliation.py
2016-01-20 13:38:20 +08:00
RicardoJohann
e095eeb084
Update bank_reconciliation_statement.py
2016-01-20 13:36:36 +08:00
RicardoJohann
6f9afffd8a
Update bank_reconciliation_statement.html
2016-01-20 12:15:20 +08:00
RicardoJohann
7425af6968
Update bank_reconciliation_detail.json
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 12:02:20 +08:00
Nabin Hait
6d8688f8b4
[fix] Currency in Gross Profit report
2016-01-19 17:27:06 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Nabin Hait
77532cc8db
[fix] Total Amount in Journal Entry
2016-01-19 16:48:31 +05:30
Maxwell
4da17348fd
Add localization in the on_submit event
2016-01-18 23:29:21 -02:00
Rushabh Mehta
6bf3c7453b
[fix] payment request
2016-01-18 14:29:26 +05:30
Rushabh Mehta
681c9dde84
[ui] payment request cleanup
2016-01-18 14:21:45 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Rushabh Mehta
2e3d2b8426
Merge pull request #4613 from nabinhait/fixes
...
[fix] Item query and exchange rate
2016-01-15 11:19:44 +05:30
Rushabh Mehta
66eaf7e1c3
Merge pull request #4607 from saurabh6790/group_custom_buttons
...
[enhance] merge customize buttons under groups
2016-01-15 11:15:23 +05:30
Nabin Hait
ad42d2f67a
Minor fixes
2016-01-15 11:09:41 +05:30
Saurabh
f7caad8ecb
[fixes] redirect uri fixes
2016-01-14 11:30:47 +05:30
Nabin Hait
a88912a2f5
[fix] Item query and exchange rate
2016-01-14 10:43:17 +05:30
Saurabh
e23e99f4bd
[enhance] merge customize buttons under groups
2016-01-13 09:18:31 +05:30
Saurabh
cbebb4b8ba
[fixes] code cleanup
2016-01-12 14:13:35 +05:30
Saurabh
3ade883fd9
[fixes] place cart button via js
2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0
[enhance] i. facility to send PR email; ii. update cart, item view and order view;
2016-01-12 14:09:52 +05:30
Saurabh
a940b6d149
[fixes] handle cancled payment requests
2016-01-12 14:09:51 +05:30
Saurabh
0a0c78729f
[enhace] display payment status on order
2016-01-12 14:09:51 +05:30
Saurabh
276d3e60bd
[enhance] pay via cart
2016-01-12 14:09:51 +05:30
Saurabh
c22e525a14
[Fixes] payment request url fixes
2016-01-12 14:09:51 +05:30
Saurabh
2ffea6ba94
[document & fixes] document and test case rewrite
2016-01-12 14:09:51 +05:30
Saurabh
6fc408e974
[fixes] conmify account details and validate gateway currency
2016-01-12 14:09:51 +05:30
Saurabh
ed0723c6fe
[fixes] Create payment gateway account
2016-01-12 14:09:50 +05:30
Saurabh
766f6a43d5
[fixes] test case for Payment request
2016-01-12 14:09:50 +05:30
Saurabh
1664668b0e
[fixes] multi-currency fixes
2016-01-12 14:09:50 +05:30
Saurabh
3ba22676bf
[fixes] Create and manage payment request
2016-01-12 14:09:50 +05:30
Saurabh
db7a56b453
[fixes] fieldtype, message fixes on Payment Request
2016-01-12 14:09:50 +05:30
Saurabh
cb98d9ec5f
[fixes] print format listing
2016-01-12 14:09:50 +05:30
Saurabh
b109ee96de
[fixes] Base structure for Payment Request
2016-01-12 14:09:49 +05:30
Saurabh
eba7aa496c
[enhace] basic structure for payment gateway
2016-01-12 14:09:49 +05:30
Rushabh Mehta
4a3140102c
Merge pull request #4606 from nabinhait/report_currency
...
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 12:12:43 +05:30
Rushabh Mehta
659bc1aca4
[minor] fixes reported on support
2016-01-12 11:57:25 +05:30
Nabin Hait
226a101119
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 11:56:40 +05:30
Nabin Hait
af2bf7541f
Merge pull request #4603 from ccfiel/develop
...
note added equity
2016-01-11 13:13:15 +05:30
Chris Ian Fiel
d070d56f72
note added equity
2016-01-11 15:34:24 +08:00
Rushabh Mehta
7be0b47778
[minor] [fix] validate fiscal year in trial balance
2016-01-11 11:59:08 +05:30
Anand Doshi
6b71ef5843
[refactor] changed set_modified, change_modified to update_modified like in the framework
2016-01-06 16:32:06 +05:30
Nabin Hait
c040075bd4
[patch] Update billing status in Delivery Note and Purchase Receipt
2016-01-06 15:42:44 +05:30
Nabin Hait
bdab0eea0f
Billing status in Purchase Receipt
2016-01-06 15:42:43 +05:30
Nabin Hait
5b13b99441
Update billing status in Delivery Note if directly invoiced against SO
2016-01-06 15:42:27 +05:30
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
Anand Doshi
563c243ec6
Revert "[hotfix] total amount in journal entry"
...
This reverts commit 5b03a75970
.
2015-11-27 17:38:17 +05:30
Anand Doshi
5b03a75970
[hotfix] total amount in journal entry
2015-11-27 17:24:06 +05:30
Anand Doshi
e38a53443a
Merge pull request #4386 from rmehta/bank-reco-bulk-edit
...
[enhancement] bulk edit in bank reconciliation, #4356
2015-11-27 14:46:58 +05:30
Rushabh Mehta
2d70887aaf
[enhancement] bulk edit in bank reconciliation, #4356
2015-11-27 11:37:18 +05:30
Rushabh Mehta
b82bdd6f1f
[fix] total amount in journal entry
2015-11-26 09:08:07 +05:30
Anand Doshi
5c968abcef
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
2015-11-25 16:33:00 +05:30
Nabin Hait
c4f4c09e42
Get Items from Product Bundle button in purchase cycle
2015-11-23 12:51:37 +05:30
Nabin Hait
072c540ae3
[fix] Period closing account should be of type Liability / Equity
2015-11-23 09:52:08 +05:30
Nabin Hait
f649013079
Merge pull request #4329 from anandpdoshi/int-float-not-null
...
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 14:30:58 +05:30