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
