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 |
|