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