Rushabh Mehta
|
abdfb4d3db
|
[fixed] New button in POS Sales Invoice, reported via forum
|
2015-09-23 12:05:51 +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
|
f7e6eb4fd7
|
[optimization] get balance on
|
2015-09-21 19:30:21 +05:30 |
|
Anand Doshi
|
26bcd89d10
|
[hotfix] journal entry - get balance
|
2015-09-17 20:36:44 +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 |
|
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
|
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
|
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 |
|
Nabin Hait
|
3a53d49b7e
|
[fix] Set account and party balance in Journal Entry
|
2015-09-04 15:46:47 +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
|
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
|
06b15bfd63
|
[report] General Ledger in multi currency
|
2015-08-31 15:39:03 +05:30 |
|
Nabin Hait
|
6e439a5e53
|
Multi currency: test case and fixes
|
2015-08-28 19:24:22 +05:30 |
|