Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,401 Commits 3 Branches 0 Tags 1 GiB
21f443e37c
Commit Graph

2083 Commits

Author SHA1 Message Date
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
Anand Doshi
120ea62acc [fix] get_balance_on: convert date to string 2015-11-19 14:24:39 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
5284b22c53 [fix] Mapping from negative outstanding invoice 2015-11-19 11:42:23 +05:30
Nabin Hait
343c1a5cbd [fix] Mapping from Payment Tool 2015-11-19 11:42:22 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +05:30
Nabin Hait
b73f3da02c Merge pull request #4332 from nabinhait/pi_fix 
[fix] Check Purchase Receipt mandatory only for stock items
 2015-11-18 17:30:29 +05:30
Nabin Hait
f0607b45c5 Merge pull request #4334 from revant/patch-1 
Mode of Payment validate
 2015-11-18 17:29:54 +05:30
Nabin Hait
b45ca3ada0 Merge pull request #4331 from nabinhait/pcv_fix 
[fix] Allowed Equity accounts in closing account in Period Closing Voucher
 2015-11-18 17:15:57 +05:30
Revant Nandgaonkar
27c266b081 improve mode_of_payment validate_accounts 
using frappe.db.get_value instead of frappe.get_list
 2015-11-18 13:28:09 +05:30
Revant Nandgaonkar
11f8a0033a Mode of Payment validate 
Error when Same Company is entered multiple times in accounts
Error when Company of Ledger account doesn't match with Company Selected
 2015-11-17 21:15:00 +05:30
Anand Doshi
da79740cdf [fix] injection 2015-11-17 18:27:50 +05:30
Nabin Hait
2cf1699937 [fix] Check Purchase Receipt mandatory only for stock items 2015-11-17 17:32:07 +05:30
Nabin Hait
1a3413875f [fix] Allowed Equity accounts in closing account in Period Closing Voucher 2015-11-17 17:12:44 +05:30
Anand Doshi
d40d1e9a59 [optimize] Payment Reconciliation and Payment Tool 2015-11-12 17:42:05 +05:30
Anand Doshi
c5c6c0669f [fix] gross profit 2015-11-12 11:07:32 +05:30
Rushabh Mehta
739aa4d51a [minor] allow pricing rule to have negative discount 2015-11-09 17:05:12 +05:30
Rushabh Mehta
64e31e9a4e [fix] process payroll 2015-11-06 14:47:12 +05:30
Nabin Hait
c3ced9a0b5 [fix][report] Buying amount for product bundle in Gross Profit report 2015-11-05 13:13:31 +05:30
Rushabh Mehta
58101e9e6c Merge pull request #4272 from nabinhait/report-fix1 
[report] Added delay in payment column
 2015-11-04 13:18:42 +05:30
Rushabh Mehta
666131d2fe Merge pull request #4271 from saurabh6790/drop-shipping 
Exclude warehouse from drop ship and re-open status for DN / PR
 2015-11-04 13:18:20 +05:30
Nabin Hait
b4a51ec80b [report] Added delay in payment column 2015-11-04 13:09:48 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship 
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
 2015-11-04 12:03:54 +05:30
Rushabh Mehta
bd4814fbb7 [fix] email digest periods for weekly and monthly 2015-11-03 16:55:33 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Rushabh Mehta
ec2d0030b7 Merge pull request #4265 from nabinhait/jv_fix 
[cleanup] Make Payment Entry from Order/Invoice
 2015-11-02 15:23:01 +05:30
Saurabh
7cd0ba70d9 [fixes] typo error 2015-11-02 15:18:23 +05:30
Nabin Hait
66340f9894 [cleanup] Make Payment Entry from Order/Invoice 2015-11-02 14:40:47 +05:30
Saurabh
a8a91cca16 [feature] Close feature for Purchase Receipt and Delivery Note 2015-11-02 12:57:08 +05:30
Saurabh
381385d19a [fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO 2015-11-02 11:30:51 +05:30
Saurabh
653cffec1e [change_log and fixes] set print hide, add change_log 2015-10-29 19:43:35 +05:30
Saurabh
2f702dcb32 [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier 2015-10-29 19:43:35 +05:30
Saurabh
f857d81f35 [fixes]test case to check updated delivered qty 2015-10-29 19:43:34 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
5e0b0b4b97 [enhance] make PO from SO if supplier is specified 2015-10-29 19:43:33 +05:30
Saurabh
a4efbf0db7 [fixes] check for close status 2015-10-29 19:43:33 +05:30
Saurabh
e930f0f74e [fixes] filter on supplier list for DropShip, checking closed status 2015-10-29 19:43:33 +05:30
Saurabh
c6dbe70256 [Fixes] Drop Shipping 2015-10-29 19:43:32 +05:30
Nabin Hait
8372c44262 [fix] Default cost center as per company 2015-10-29 11:50:36 +05:30
Nabin Hait
6c6f3789d0 [fix] Is POS trigger 2015-10-26 18:01:12 +05:30
Nabin Hait
415df04834 [fix] Account Type in Chart of Accounts 2015-10-26 16:43:09 +05:30
Nabin Hait
6485d4a749 [fix] account currency is not mandatory in get exchange rate 2015-10-26 14:31:17 +05:30
Nabin Hait
8e3ea32d6d Merge pull request #4222 from nabinhait/tax_rule 
Set tax rule based on date
 2015-10-26 13:02:21 +05:30
Nabin Hait
00818bfa90 Set tax rule based on date 2015-10-23 16:26:09 +05:30
Nabin Hait
7a9f46d9d1 [fix] Value mapping while making bank entry from Expense Claim 2015-10-23 13:19:01 +05:30
Anand Doshi
0b93bdcf40 [fix] get_party_gle_currency caching 2015-10-22 19:33:08 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Nabin Hait
fbe08ec7d0 Period Closing Voucher Test Cases 2015-10-22 16:21:37 +05:30
Nabin Hait
0045c305ac Period Closing Voucher as per multi currency 2015-10-22 16:21:37 +05:30
Nabin Hait
31c51ef914 [fix] test case for purchase invoice gle 2015-10-21 17:40:06 +05:30
Nabin Hait
be464696cc [fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account 2015-10-21 17:40:06 +05:30
Anand Doshi
87da662703 [enhancement] Quick Entry in Journal Entry, remember Posting Date 2015-10-21 16:27:13 +05:30
Nabin Hait
c35b35abca [fix] Set higher precision for exchange rate field 2015-10-20 12:11:51 +05:30
Anand Doshi
9dad86c189 Merge pull request #4190 from nabinhait/income_expense_account_query 
[fix] Allowed accounts with account type='Income Account' for default income account in item
 2015-10-19 15:43:32 +05:30
Nabin Hait
afd14f6f0e [fix] Allowed accounts with account type='Income Account' for default income account in item 2015-10-19 15:27:58 +05:30
Nabin Hait
aa015902d5 Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Nabin Hait
2873f2e7de Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Anand Doshi
1d093a4039 [fix] change attach fields to small text 2015-10-19 12:56:29 +05:30
Anand Doshi
d665a07621 [fix] remove label 'Column Break' 2015-10-16 15:44:28 +05:30
Rushabh Mehta
2e7f9d2b8f [fixes] email digest 2015-10-15 16:31:16 +05:30
Anand Doshi
1d23ebb51d [fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339 2015-10-15 12:54:40 +05:30
Rushabh Mehta
f861856ed9 [fix] do not check purchase invoice uniqueness for cancelled documents 2015-10-15 11:37:34 +05:30
Rushabh Mehta
ee6862b277 [fix] VARCHAR lengths as 140 2015-10-14 17:28:35 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Rushabh Mehta
c27748b2b3 Merge pull request #4040 from nabinhait/dn_target_warehouse 
Delivery to target warehouse
 2015-10-14 15:29:54 +05:30
Nabin Hait
b445be3552 Test case for delivery to target warehouse 2015-10-13 15:46:42 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Neil Trini Lasrado
f49b085625 Allowed Income account to be added to Cost Center 2015-10-13 14:54:39 +05:30
Rushabh Mehta
60f1739ca5 Merge pull request #4158 from rmehta/journal-entry-title-fix 
[fix] set title in Journal Entry only if not set
 2015-10-12 18:35:49 +05:30
Rushabh Mehta
cefa106a06 Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead 
[fix] Added Letter Head field to Purchase Invoice
 2015-10-12 18:30:25 +05:30
Rushabh Mehta
67ecfcf52c Merge pull request #4148 from saurabh6790/erp_support 
[minor fix], escape % char
 2015-10-12 18:30:13 +05:30
Rushabh Mehta
bc5ecfff06 Merge pull request #4146 from nabinhait/fix10 
[fix] Multiple minor fixes
 2015-10-12 18:27:02 +05:30
Rushabh Mehta
8fa4845d00 [fix] set title in Journal Entry only if not set 2015-10-12 16:59:52 +05:30
Anand Doshi
4b72d05793 [fix] get allocated_percentage from party's sales team 2015-10-12 16:15:52 +05:30
Anand Doshi
4fa69780a8 [fix] Added Letter Head field to Purchase Invoice 2015-10-12 15:55:24 +05:30
Nabin Hait
fc9031924e [fix] Field type of Age field converted to Int 2015-10-12 15:47:07 +05:30
Saurabh
e14124198d minor fix, escape % char 2015-10-12 15:08:09 +05:30
Nabin Hait
bcd655a985 Merge pull request #4109 from rmehta/fix-sales-purchase-order-status 
[fix] sales & purchase order status
 2015-10-07 11:34:30 +05:30
Nabin Hait
c5a25f44e1 Merge pull request #4119 from nabinhait/fix3 
[fix] Return account currency only if account provided
 2015-10-07 11:25:19 +05:30
Nabin Hait
ebbd163903 [fix] allowed more than 2 currencies in Journal Entry 2015-10-05 13:21:38 +05:30
Nabin Hait
8954b24b22 [fix] Return account currency only if account provided 2015-10-04 12:27:46 +05:30
Rushabh Mehta
d10ba853e6 [fix] sales & purchase order status 2015-10-02 17:16:51 +05:30
Anand Doshi
1a1f790150 [fix] test case 2015-10-02 12:34:18 +05:30
Rushabh Mehta
3c54e9779b Merge pull request #4108 from nabinhait/payment_reco 
[fix] Payment Reconciliation in multi-currency
 2015-10-02 12:32:54 +05:30
Nabin Hait
db48b7d764 [fix] Payment Reconciliation in multi-currency 2015-10-02 12:05:55 +05:30
Rushabh Mehta
83c0899c83 [fix] [minor] default ranges for demo 2015-10-02 11:31:37 +05:30
Anand Doshi
d9ab725be4 [fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked 2015-10-01 19:17:02 +05:30
Nabin Hait
5c623dae4d [fix] General Ledger report fixed 2015-10-01 11:22:15 +05:30
Anand Doshi
e2c3d40b57 [hotfix] Payment Reconciliation Invoice Type 2015-10-01 11:21:26 +05:30
Nabin Hait
72d2d682ae Repost GL Entries for Journal Entries where reference name is missing 2015-09-30 18:50:54 +05:30
Anand Doshi
21f6ea6f7e [hotfix] remove allow on submit from item tables 2015-09-30 18:45:29 +05:30
Anand Doshi
15d2c89939 Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	erpnext/accounts/report/general_ledger/general_ledger.py
 2015-09-30 17:13:58 +05:30
Anand Doshi
4945b94950 [fix] added validation to match account currency with existing gle and test case 2015-09-30 16:41:15 +05:30
Anand Doshi
248c867a2c [minor] removed test case for party multi-currency validation, since party multi-currency is now based on account 2015-09-30 15:11:13 +05:30
Anand Doshi
da98ab6f3c [fix] Only 1 account per company for a party 2015-09-30 15:11:12 +05:30
Anand Doshi
cd0989e051 Added method get_account_currency 2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Nabin Hait
d3cf4f1264 Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate 
return exchange rate as 1 if no account is specified
 2015-09-30 15:05:41 +05:30
Rushabh Mehta
89349d3ae3 [fix] [payment-reconciliation] ignore rows with blank invoice numbers 2015-09-29 16:39:53 +05:30
Anand Doshi
740a11263f [minor] validate invoice number is selected in Payment Reconciliation 2015-09-29 12:55:11 +05:30
Anand Doshi
d6cb55ad1a [fix] return exchange rate as 1 if no account is specified 2015-09-28 17:20:02 +05:30
Anand Doshi
6f39300d43 Merge pull request #4068 from anandpdoshi/due-date-validation 
if no party, don't validate due date based on credit days
 2015-09-25 17:31:33 +05:30
Anand Doshi
0ca587e018 [fix] if no party, don't validate due date based on credit days 2015-09-25 16:32:14 +05:30
Rushabh Mehta
8ffe12ebe4 [chart-of-accounts] added default for Guatemala 2015-09-25 15:40:33 +05:30
Anand Doshi
8579af371c Merge pull request #4057 from rmehta/gl-report-fix 
GL Report Fix
 2015-09-25 12:30:26 +05:30
Nabin Hait
44bd3b2601 [fix] Fetch gl entries in receivable/payable report only if party mentioned 2015-09-25 10:33:51 +05:30
Nabin Hait
1b6c00e2c7 [report] Trial Balance for Party 2015-09-25 09:18:03 +05:30
Anand Doshi
3297c43bdf [fix] Tax Rule permission to Account Manager 2015-09-24 17:29:28 +05:30
Anand Doshi
d37d4dfdec [fix] applicable territory patch and tax rule tests 2015-09-24 15:44:39 +05:30
Anand Doshi
bba0a5d38f [fix] [patch] tax rule 2015-09-24 15:11:24 +05:30
Rushabh Mehta
8f2b8afcb7 [fix] gl entry report if not filtered 2015-09-24 15:03:53 +05:30
Anand Doshi
e63da9813c Merge remote-tracking branch 'frappe/master' into develop 
Conflicts:
	erpnext/patches.txt
 2015-09-24 14:34:50 +05:30
Anand Doshi
361eca4cae Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit 
Sales Team editable after submit
 2015-09-24 11:30:31 +05:30
Anand Doshi
e2d46d0474 [fix] Allow Sales Team to be added/updated after submit 2015-09-23 19:26:29 +05:30
Rushabh Mehta
307978fea9 [test-fixes] 2015-09-23 15:43:09 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
3d76686b82 [shopping-cart] cart via Jinja WIP 2015-09-23 12:49:16 +05:30
Rushabh Mehta
abdfb4d3db [fixed] New button in POS Sales Invoice, reported via forum 2015-09-23 12:05:51 +05:30
Nabin Hait
5b649521d1 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 13:06:34 +05:30
Anand Doshi
798e75832c [fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability 2015-09-22 12:59:43 +05:30
Nabin Hait
c0c94aef44 [fix] Get outstanding invoices in Payment Reconciliation and Payment Tool 2015-09-22 08:37:37 +05:30
Anand Doshi
e4dfeb651f [optimization] get balance on 2015-09-21 19:31:43 +05:30
Anand Doshi
f7e6eb4fd7 [optimization] get balance on 2015-09-21 19:30:21 +05:30
Rushabh Mehta
97c858a5e3 [fix] pull sales team from customer 2015-09-21 10:03:38 +05:30
Rushabh Mehta
974892bf87 Merge pull request #4036 from rmehta/no-party-currency 
[fix] no default party currency
 2015-09-18 13:40:42 +05:30
Rushabh Mehta
361df8993f [fix] no default party currency 2015-09-18 12:59:51 +05:30
Nabin Hait
a48d754158 [fix] minor issue 2015-09-17 20:37:07 +05:30
Anand Doshi
26bcd89d10 [hotfix] journal entry - get balance 2015-09-17 20:36:44 +05:30
Anand Doshi
20fd360a63 [hotfix] journal entry - get balance 2015-09-17 20:36:19 +05:30
Nabin Hait
a8ef4c9220 [fix] minor issue 2015-09-17 19:38:11 +05:30
Nabin Hait
926ae17e5a Update journal_entry.py 2015-09-17 18:42:55 +05:30
Nabin Hait
8adb5f3e32 Update journal_entry.py 2015-09-17 18:40:35 +05:30
Rushabh Mehta
e3401182c8 Merge pull request #4012 from saurabh6790/cart 
Taxation for Shopping Cart based on Tax Rule template
 2015-09-17 16:26:35 +05:30
Anand Doshi
70fed64cd5 Merge pull request #4029 from nabinhait/mc2 
[fix] Account Currency and Balance fixed in chart of accounts #4019
 2015-09-17 14:37:00 +05:30
Nabin Hait
59f4fa9a8c [fix] Account Currency and Balance fixed in chart of accounts #4019 2015-09-17 13:57:42 +05:30
Nabin Hait
262ac09305 [fix] Currency symbol fixed in Accounts receivable/payable report #4020 2015-09-17 13:24:14 +05:30
Anand Doshi
12106725fb [fix] set Payment Amount in Payment Tool 2015-09-17 12:59:44 +05:30
Anand Doshi
0b031cdd6c [fix] ignore journal entry based invoice in payment tool and payment reconciliation tool 2015-09-16 12:46:54 +05:30
Saurabh
0bd145a608 [fixes] test cases and tax rule validation 2015-09-15 17:06:52 +05:30
Saurabh
c663f5c2bd [Test] test state based taxasion 2015-09-15 15:41:01 +05:30
Saurabh
adde1cff48 [Enhancement] add state ccriteria in tax rule 2015-09-15 15:41:01 +05:30
Saurabh
7c867ae9ad [Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation 2015-09-15 15:41:01 +05:30
Saurabh
8f7317175d [enhancement] bring taxes from tax rules and test cases 2015-09-15 15:41:01 +05:30
Saurabh
957e7a37be [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:01 +05:30
Saurabh
def71d4d5d [Shopping Cart][Fixes] tax calculation based on tax rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
ef511b160e Added Tax Rule under ERPNext > Accounts > Setup 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
09f9c96c53 Fixes in Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
1a2d121073 Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
949d7dbaba Added validations, test-cases to Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
72e6aa160c Added New Doctype Tax Rule 2015-09-15 15:41:00 +05:30
Anand Doshi
1fef2fad2d [minor] fixes in queries and payment tool 2015-09-14 18:27:21 +05:30
Anand Doshi
dbe623b167 [fix] Use User Permission value as default only if the document type is Setup 2015-09-14 13:08:53 +05:30
Anand Doshi
71e51c179c [fix] changed modified for multi-currency sync 2015-09-11 16:55:11 +05:30
Anand Doshi
4b8dbbdf98 [minor] Change modified of Sales Invoice.json 2015-09-11 16:39:03 +05:30
Anand Doshi
979326b0b1 minor fixes in multi-currency 2015-09-11 16:33:45 +05:30
Anand Doshi
5d9cfc76cd Don't copy title field in Duplicate 2015-09-11 15:35:26 +05:30
Nabin Hait
8db7bd2d8f [fix] Igonre permissions while saving Company and Warehouse from Accounts Settings 2015-09-11 15:34:42 +05:30
Nabin Hait
f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 
[fix][patch] delete item variant attributes if no variants exists against that item
 2015-09-10 19:26:02 +05:30
Nabin Hait
71ef6675ce [fix] Journal Entry client side minor fixes 2015-09-10 19:25:50 +05:30
Nabin Hait
5a803d76ad [fix] Bypass Root Not Editable validation from Setup Wizard 2015-09-10 13:20:35 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd Multi-currency: Exchange Rate in Journal Entry 2015-09-09 18:43:12 +05:30
Anand Doshi
9d5b84e78a Merge pull request #3996 from nabinhait/fix6 
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
 2015-09-09 15:11:12 +05:30
Nabin Hait
83dd3e14e5 [fix] Gross Profit report should not include return entries 2015-09-09 10:37:04 +05:30
Nabin Hait
cd103c05d6 Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order 2015-09-08 19:24:35 +05:30
Anand Doshi
bc1e8b4408 [minor] Unset Apply User Permissions in default permissions 2015-09-08 19:23:23 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Nabin Hait
96bb070781 Payment against invoices where party not specified 
Conflicts:
	erpnext/accounts/doctype/gl_entry/gl_entry.py
 2015-09-08 16:36:44 +05:30
Nabin Hait
d608363d7b [fix] Map amount in advance payment entry agaionst SO/PO based on party account currency 2015-09-08 12:53:59 +05:30
Nabin Hait
b2739cbb79 Get average exchange rate in case of bank transfer 2015-09-08 12:18:45 +05:30
Nabin Hait
bf9691ed39 Multiple fixes 2015-09-07 10:40:48 +05:30
Rushabh Mehta
be9edae961 [fixes] to task test case and fix tree ui for mobile 2015-09-04 16:18:17 +05:30
Nabin Hait
3a53d49b7e [fix] Set account and party balance in Journal Entry 2015-09-04 15:46:47 +05:30
Nabin Hait
4d62d7867e [report] Bank Reconciliation Statement in account currency 2015-09-04 13:26:45 +05:30
Nabin Hait
c0e3b1a0c7 Removed account and party balance in company currency from Journal Entry 2015-09-04 13:26:23 +05:30
Nabin Hait
34fe81f7eb Patch fixed 2015-09-03 19:18:00 +05:30
Nabin Hait
1609933748 Test cases for multi currency 2015-09-03 16:03:07 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Nabin Hait
bac9b8eef6 Payment Tool changes due to multi currency 2015-08-31 19:01:11 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
699751c531 [report] Accounts Receivable / Payable in multi currency 2015-08-31 17:02:04 +05:30
Nabin Hait
06b15bfd63 [report] General Ledger in multi currency 2015-08-31 15:39:03 +05:30
Nabin Hait
1901ca5a45 [fix] Fixed gross profit report due to removal of designation field from Sales Team table 2015-08-31 12:02:50 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
8b66f2a691 Exported all doctypes 2015-08-27 16:45:52 +05:30
Nabin Hait
f6f38f2f2d [new fields] Exchange Rate in Journal Entry and some properties changes in Journal Entry Account 2015-08-27 16:27:33 +05:30
Nabin Hait
9a9a4293b3 [new fields] Party Account Currency, Paid Amount and Write Off Amount in Acompany Currency 2015-08-27 16:26:38 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Nabin Hait
2091f0c97e Checked out json files from upstream 2015-08-27 14:35:17 +05:30
Anand Doshi
282e4947fa [fix] Changed more section label to 'More Information' 2015-08-27 13:11:46 +05:30
Nabin Hait
54fe26dcfb [patch] Multi currency 2015-08-27 12:55:24 +05:30
Nabin Hait
a12d959729 GL Entries for Sales/Purchase Invoice in multi currency 2015-08-27 12:27:24 +05:30
Rushabh Mehta
cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note 2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929 Merge branch 'layout-cleanup' into develop 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json
 2015-08-27 11:01:39 +05:30
Rushabh Mehta
491df14426 [minor] catch invalid item code in pricing list (via support ticket) 2015-08-27 10:31:28 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +05:30
Anand Doshi
2b6bdc1edb [fix] filter and validation of Debit To and Credit To accounts 2015-08-26 17:42:40 +05:30
Anand Doshi
7fa8fb984e [fix] Show write off account 2015-08-26 16:48:41 +05:30
Anand Doshi
cb3a4caa44 [fix] removed validate due date in Journal Entry 2015-08-26 14:50:04 +05:30
Rushabh Mehta
f24f6044bd [layout] cleaned up Sales Invoice 2015-08-26 10:51:44 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Nabin Hait
1f94fa25a8 Update delivered / ordered qty in sales/purchase order from return entry 
Reserved Qty logic cleaned up
 2015-08-25 14:11:12 +05:30
Nabin Hait
3a990d946d [fix] In general ledger report, consider cost center in group by voucher 2015-08-24 17:21:01 +05:30
Rushabh Mehta
da24698cf7 [minor] in ap, ar renamed label for date as 'as on date' as it was confusing 2015-08-24 14:31:07 +05:30
Nabin Hait
c561a499d7 Multi currency GL entry fixes 2015-08-21 14:31:47 +05:30
Nabin Hait
50ba6faaf6 Currency input from Chart of Accounts page 2015-08-21 14:31:47 +05:30
Nabin Hait
46bcbaf97b GL Entry in account currency 2015-08-21 14:31:47 +05:30
Nabin Hait
0e46a9b86e Journal Entry: client side triggers 2015-08-21 14:31:46 +05:30
Nabin Hait
e459cb4d09 Journal Entry: validate and post gle in multi currency 2015-08-21 14:31:46 +05:30
Nabin Hait
7dbd395781 Toggle alternative currency fields 2015-08-21 14:31:46 +05:30
Nabin Hait
6aea1c0da5 Currency validation in gl entry 2015-08-21 14:31:46 +05:30
Rushabh Mehta
aeab6c559c [enhancement] multi-currency, added fields #1002 2015-08-21 14:31:46 +05:30
Nabin Hait
efc89f4395 [fix] payment amt against invoice outstanding 2015-08-20 11:30:44 +05:30
Anand Doshi
f3eeb601ad Merge pull request #3908 from rmehta/text-editor 
[fix] changed text > text editor for description fields in tables
 2015-08-19 16:48:06 +05:30
Nabin Hait
3922823bd6 [fix] Test case fixed for purchase cost against project 2015-08-19 14:23:13 +05:30
Rushabh Mehta
81e9d4e8f5 [fix] changed text > text editor for description fields in tables 2015-08-19 13:00:03 +05:30
Anand Doshi
4765d75b83 [minor] fix typo 2015-08-19 12:50:44 +05:30
Rushabh Mehta
ad9156a6ae [enhancement] POS print after save #385:wq:wq 2015-08-18 18:05:43 +05:30
Nabin Hait
dc76823a81 [fix] Get Balance only if account or party mentioned 2015-08-17 14:28:19 +05:30
Nabin Hait
cbfd387c0b Included Party and reference name in Journal Entry Account grid view 2015-08-17 11:42:48 +05:30
Anand Doshi
04dfd7b98f [fix] Journal Entry Reference Name query 2015-08-14 17:34:43 +05:30
Anand Doshi
e116cb596c [hotfix] [report] payment period based on invoice date 2015-08-13 17:25:20 +05:30
Anand Doshi
5eb84352ec Merge pull request #3868 from nabinhait/price_list_rate 
[fix] Reset price list rate based on Pricing Rule type
 2015-08-13 15:10:08 +05:30
Anand Doshi
1580bf9ca4 Merge pull request #3869 from rmehta/pricing-rule-layout 
[minor] pricing rule layout
 2015-08-13 15:08:54 +05:30
Rushabh Mehta
4c4c534dcd [minor] pricing rule layout 2015-08-13 15:00:54 +05:30
Nabin Hait
0da11f1b10 [fix] Reset price list rate based on Pricing Rule type 2015-08-13 14:58:19 +05:30
Nabin Hait
2e54da2ea5 [fix] fraction issue in gl entry 2015-08-13 12:19:27 +05:30
Rushabh Mehta
ed40542658 [fix] minor auto-select party type and add has_permission in whitelisted methods 2015-08-13 10:34:49 +05:30
Rushabh Mehta
207b3efed7 [fix] journal entry get_query 2015-08-12 15:18:35 +05:30
Rushabh Mehta
3131c732ff [fix] capacity planning error 2015-08-12 12:29:16 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Nabin Hait
3c3a3ecea8 Additional Costs in Stock Entry 2015-08-10 14:07:45 +05:30
Nabin Hait
fc155c7712 Added tax table in stock entry 2015-08-10 14:07:01 +05:30
Nabin Hait
ea925d26a8 [fix] Made expense account non-mandatory in POS Profile 2015-08-10 12:57:05 +05:30
Nabin Hait
7c5124140e [fix] Party / Account Validation message against Invoice 2015-08-06 12:58:53 +05:30
Nabin Hait
1648605950 [fix] Disabled OHADA system while fetching COA based on country 2015-08-05 15:56:05 +05:30
Nabin Hait
5bbe823106 [patch] Fix outstanding amount for original invoice for return entry 2015-08-03 19:19:11 +05:30
Nabin Hait
893db7a5c3 Allow payment against invoice with negative outstanding 2015-08-03 19:18:22 +05:30
Nabin Hait
433cdc960d Update outstanding in original invoice from return invoice 2015-08-03 19:18:22 +05:30
Nabin Hait
4f2832ecd2 [fix] Allow against purchase invoice against credit amount row 2015-08-03 19:18:22 +05:30
Nabin Hait
b3b059b0ea [fix] payment reconciliation 2015-08-03 19:18:21 +05:30
Nabin Hait
03bccb81d8 [test case] Test case for discount amount on net total 2015-08-03 19:11:44 +05:30
Nabin Hait
94f15fcec6 Propogate root type and report type into children based on parent 2015-08-03 11:17:07 +05:30
Anand Doshi
ba9dbb1b09 [minor] removed Link/DocType in Payment Period Based on Invoice Date 2015-08-03 11:05:45 +05:30
Nabin Hait
67079d292c Merge pull request #3725 from neilLasrado/test 
Fixed test cases related to Time Logs
 2015-07-30 11:51:26 +05:30
Neil Trini Lasrado
d851bd8d85 Fixed test cases related to Time Logs 2015-07-29 18:48:58 +05:30
Nabin Hait
fcc4021e44 minor fix in payment reconciliation 2015-07-29 17:41:51 +05:30
Nabin Hait
453cc374d4 - Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice 
- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate
 2015-07-29 15:59:57 +05:30
Nabin Hait
43e46a8506 Merge pull request #3733 from nabinhait/fix3 
POS Profile: removed income account, cost center, territory and bank/cash account from mandatory
 2015-07-29 15:57:05 +05:30
Nabin Hait
e95c18a42d Merge pull request #3744 from nabinhait/return 
Sales / Purchase Return Improvements
 2015-07-29 15:51:34 +05:30
Nabin Hait
746c162055 Return status in listview for return entry 2015-07-29 14:54:33 +05:30
Nabin Hait
9eb9ccd785 Make Debit / Credit Note button in Purchase / Sales Invoice 2015-07-29 13:23:37 +05:30
Nabin Hait
1e046aa49a Hide buttons for return entry 2015-07-29 13:16:37 +05:30
Nabin Hait
3ad26e4dd1 Fix Against Voucher in GL Entry for return against purchase invoice 2015-07-29 13:15:57 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Nabin Hait
26052df76e POS Profile: removed income account, cost center, territory and bank-cash account from mandatory 2015-07-28 15:12:54 +05:30
Neil Trini Lasrado
ff3b220c79 Fixed gl_entry Validation 2015-07-28 12:23:14 +05:30
Neil Trini Lasrado
cc7cb2a70a Allowed frozen_accounts_modifier to create records against frozen customer/supplier 2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
79bf233734 Test Cases added to check if customer is frozen 2015-07-28 12:17:03 +05:30
Neil Trini Lasrado
3fbbb71afc Added ability to freeze Customer/Supplier 2015-07-28 12:17:02 +05:30
Anand Doshi
14859faf17 [minor] Accounts Payable Report Type='Script Report' 2015-07-24 17:30:39 +05:30
Nabin Hait
2b7eda8135 Merge pull request #3683 from nabinhait/return 
Sales / Purchase Return Enhancement
 2015-07-24 16:53:01 +05:30
Anand Doshi
751d7ecd85 Merge pull request #3716 from tmimori/develop 
Removed HTML from messages
 2015-07-24 14:28:59 +05:30
Nabin Hait
21897e3c52 Merge pull request #3714 from nabinhait/fix4 
[fix] gross profit report
 2015-07-24 14:25:35 +05:30
Tsutomu Mimori
196a0bc675 Amend for frappe/erpnext/pull/3716 2015-07-24 17:06:00 +09:00
Nabin Hait
3cf67a462b Cleanup and test cases for serialized item 2015-07-24 13:26:54 +05:30
Nabin Hait
04d244a360 Credit Note print format 2015-07-24 13:26:54 +05:30
Nabin Hait
b74999da82 [testcase] Testcase for return purchase invoice 2015-07-24 13:26:53 +05:30
Nabin Hait
246ed3f122 Test cases for sales return 2015-07-24 13:26:53 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Tsutomu Mimori
c40b99be26 Merge remote-tracking branch 'frappe/develop' into develop 2015-07-23 22:10:40 +09:00
Tsutomu Mimori
982f4ae44d Removed HTML from messages 2015-07-23 22:09:35 +09:00
Nabin Hait
f666535223 [fix] gross profit report 2015-07-23 17:08:44 +05:30
Nabin Hait
08fb19ac8c Validation on Account for assigning budget 2015-07-23 16:59:43 +05:30
Anand Doshi
03ae61afce Merge pull request #3681 from rmehta/sample-data 
[enhancement] update to setup wizard, added users, employees, sample data
 2015-07-23 16:45:28 +05:30
Rushabh Mehta
fec61fe33e [minor] fix report type for Accounts Payable 2015-07-23 10:39:13 +05:30
Nabin Hait
e2b8ccf1bb [report] Letter Head option in General Ledger report 2015-07-21 12:02:36 +05:30
Anand Doshi
83694fd180 [minor] removed is_group from search fields of Account 2015-07-20 13:26:22 +05:30
Nabin Hait
1be94efcfa [fix] Fetch debit/credit from reference journal entry 2015-07-17 17:25:52 +05:30
Rushabh Mehta
856ee10dc4 [enhancement] update to setup wizard, added users, employees, sample data 2015-07-17 15:03:18 +05:30
Anand Doshi
9490c21b8a Merge pull request #3641 from rmehta/role-rename 
[rename] Material User > Stock User
 2015-07-14 12:10:48 +05:30
Anand Doshi
e8861e2871 Merge pull request #3649 from rmehta/purchase-invoice-fix 
[fix] supplier invoice number fix
 2015-07-14 11:50:07 +05:30
Rushabh Mehta
1956028ddc [fix] supplier invoice number fix 2015-07-14 10:26:50 +05:30
Rushabh Mehta
a87dc3b4e6 [minor] move position in accounts settings 2015-07-14 10:22:07 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
fe2ffaeafa Fixes in Production Planning Tool 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
09a66c4201 Fixed issue with Customer Contacts in Transaction Documents 2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Rushabh Mehta
f3b0b95b15 [fix] [filter] for general ledger 2015-07-13 10:24:25 +05:30
Nabin Hait
93d3c82737 minor fix in due date validation 2015-07-10 17:12:08 +05:30