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