Commit Graph

9359 Commits

Author SHA1 Message Date
nabinhait
7d7123de37 Merge branch 'ankitjavalkarwork-wip_payrec' into develop 2014-07-21 19:23:20 +05:30
nabinhait
7f1e4a29c5 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2014-07-21 19:23:07 +05:30
nabinhait
97ab902895 payment reconciliation fixes 2014-07-21 19:22:02 +05:30
Anand Doshi
6e15f675a5 Merge pull request #1966 from anandpdoshi/anand-july-21
Stock Entry Warehouse prefill, Item autosuggest by description
2014-07-21 18:25:16 +05:30
Anand Doshi
67ecce695d [fix] Show against account in General Ledger Print Format 2014-07-21 18:13:05 +05:30
Anand Doshi
ac11d6ff97 Merge pull request #1964 from frappe/new-production-order-fix
[minor] fix server error for new production order if sales order is invalid
2014-07-21 18:05:06 +05:30
Anand Doshi
4c5d7617fb [minor] Update if missing, source and target warehouse in stock entry detail table, when they are specified in the form 2014-07-21 18:02:22 +05:30
Anand Doshi
7fcb3c9865 [minor] Item query - search by description 2014-07-21 17:51:32 +05:30
Pratik Vyas
994d9075b4 Change TRAVIS_BRANCH to develop 2014-07-21 17:36:50 +05:30
Pratik Vyas
649d18c4f7 [minor] fix server error for new production order if sales order is invalid 2014-07-21 17:17:59 +05:30
Nabin Hait
cbf0cb7de7 Merge pull request #1955 from anandpdoshi/financial-statements
Balance Sheet and Profit and Loss Statement
2014-07-21 16:44:46 +05:30
Anand Doshi
5f0459c321 Fixes to Financial Statements 2014-07-21 16:13:06 +05:30
nabinhait
2d355c7478 Merge branch 'wip_payrec' of github.com:ankitjavalkarwork/erpnext into ankitjavalkarwork-wip_payrec 2014-07-21 15:33:50 +05:30
ankitjavalkarwork
4dfe19e613 Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-21 14:23:52 +05:30
Rushabh Mehta
1c6313679b Update material_request.js 2014-07-21 13:08:49 +05:30
Anand Doshi
f457bce0e7 Changed localize_date to formatdate 2014-07-21 12:03:04 +05:30
Anand Doshi
6cc5babd2e Use include directive to embed common print format 2014-07-21 11:43:19 +05:30
Anand Doshi
db4ba39824 Better handling of ignore zero values 2014-07-21 11:43:19 +05:30
Anand Doshi
825d014616 Commonfied code for Financial Statements and added Profit and Loss Statement 2014-07-21 11:43:18 +05:30
Anand Doshi
fa576a22e3 Balance Sheet 2014-07-21 11:43:18 +05:30
Anand Doshi
059f1e09a8 Balance Sheet - first cut 2014-07-21 11:43:18 +05:30
Anand Doshi
7a7675c7ef Merge pull request #1957 from nabinhait/hotfix
Hotfix
2014-07-19 18:17:52 +05:30
nabinhait
b1e7bf16ba Translate while creating India specific accounts 2014-07-19 17:56:43 +05:30
nabinhait
711e8bec3d Fixes overflow tolerance 2014-07-19 17:00:15 +05:30
nabinhait
b1c5738a67 Fixes overflow tolerance 2014-07-19 16:53:45 +05:30
ankitjavalkarwork
5283e5a7d8 Add Payment Reconciliation Feature/Tool - JS changes1 2014-07-18 15:54:29 +05:30
Anand Doshi
1a2516d4be Merge pull request #1953 from anandpdoshi/anand-july-18
Minor fix in reorder item
2014-07-18 10:32:14 +05:30
Anand Doshi
d141cf7293 Minor fix in reorder item 2014-07-18 10:31:34 +05:30
Anand Doshi
3c45c37428 Merge pull request #1952 from nabinhait/hotfix
Country mandatory in company master
2014-07-18 10:22:13 +05:30
nabinhait
d4e080be29 Country mandatory in company master 2014-07-17 19:32:12 +05:30
ankitjavalkarwork
84fd33ea7a Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-17 19:11:07 +05:30
ankitjavalkarwork
87e30f68b9 Add Payment Reconciliation Feature/Tool - Complete 2014-07-17 19:10:45 +05:30
Anand Doshi
e8332be285 Merge pull request #1949 from anandpdoshi/anand-july-17
Fix in Stock Entry test case
2014-07-17 12:37:42 +05:30
Anand Doshi
e5df7a7f01 Merge pull request #1935 from nabinhait/hotfix
Default letter head in general ledger and bank reco statement print
2014-07-17 12:31:34 +05:30
Anand Doshi
fa0db761da Fix in Stock Entry test case 2014-07-17 12:30:55 +05:30
nabinhait
5f2f955224 From date and to date in general ledger print format 2014-07-17 12:29:56 +05:30
nabinhait
e26204e61d From date and to date in general ledger print format 2014-07-17 12:22:58 +05:30
nabinhait
fa1cd5faff Fixed root type of liability accounts 2014-07-17 11:52:50 +05:30
nabinhait
d16081c4d9 Batch no get query fix 2014-07-17 11:08:19 +05:30
nabinhait
143400d444 Batch no get query fix 2014-07-17 11:00:13 +05:30
nabinhait
96cb130263 Default letter head in general ledger and bank reco statement print 2014-07-17 10:56:07 +05:30
Nabin Hait
0a4c824a06 Merge pull request #1946 from anandpdoshi/anand-july-16
Fixes in load defaults of transaction.js
2014-07-16 20:04:37 +05:30
Anand Doshi
b8189d7d23 Auto Re-order Item for default warehouse only, if Warehouse wise re-order not specified 2014-07-16 19:24:53 +05:30
Anand Doshi
4b5e89a067 Fixes in Stock Entry test cases 2014-07-16 19:23:58 +05:30
Anand Doshi
f214bfcfc3 Fixes in load defaults of transaction.js 2014-07-16 17:53:02 +05:30
Rushabh Mehta
2e21e25613 Merge pull request #1945 from anandpdoshi/anand-july-16
Fixes in Stock Entry and test cases
2014-07-16 17:04:18 +05:30
Anand Doshi
d93fa2f78b Fixes in Stock Entry and test cases 2014-07-16 16:08:15 +05:30
Anand Doshi
75936cdde5 Merge pull request #1942 from anandpdoshi/anand-july-16
Fixes in Setup Wizard and Support Ticket
2014-07-16 13:17:50 +05:30
Anand Doshi
e73ed2afae Setup Wizard: fixed attachment issue #1940 2014-07-16 11:48:51 +05:30
Anand Doshi
c70d2d23a8 Support Ticket: set resolution_date as None if missing 2014-07-16 11:48:51 +05:30