Commit Graph

9629 Commits

Author SHA1 Message Date
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
ankitjavalkarwork
540a1eb6d9 Merge branch 'develop' of https://github.com/frappe/erpnext into wip_payrec 2014-07-15 18:02:08 +05:30
ankitjavalkarwork
d934cd105b Add Payment Reconciliation Feature/Tool - invoice entries table population 2014-07-15 18:01:36 +05:30
ankitjavalkarwork
ec05d7f8a1 Add Payment Reconciliation Feature/Tool - javascript validation 2014-07-14 18:28:10 +05:30
ankitjavalkarwork
345753ed19 Add Payment Reconciliation Feature/Tool - fetch unreconciled entries 2014-07-14 16:38:27 +05:30
Anand Doshi
c58e6c0dff Merge pull request #1932 from nabinhait/hotfix
Fixes
2014-07-14 14:28:05 +05:30
Anand Doshi
1829bd84d3 hotfix: website_image 2014-07-14 14:26:42 +05:30
nabinhait
7700c62fa8 Minor fix 2014-07-14 14:21:21 +05:30
Anand Doshi
8efbf5ef33 Merge pull request #1933 from anandpdoshi/anand-july-14
Fixed Address and Contact report name
2014-07-14 14:16:26 +05:30
Anand Doshi
e8c5cb8c9a Fixed Address and Contact report name 2014-07-14 13:10:24 +05:30
nabinhait
d5fd535909 Minor fix, if no default company 2014-07-14 12:39:50 +05:30
nabinhait
b0a8d000b1 Utility: reset serial no status and warehouse 2014-07-14 11:56:03 +05:30
nabinhait
5c38488590 Utility: reset serial no status and warehouse 2014-07-14 11:44:42 +05:30
nabinhait
614fb750b7 set qty as per stock uom in entire purchase cycle 2014-07-14 10:48:12 +05:30
nabinhait
e6cee7b41f Expense account can be liability account for stock reconciliation 2014-07-14 10:48:11 +05:30
ankitjavalkarwork
0e57b971ad Add Payment Reconciliation Feature/Tool - minor changes 2014-07-11 16:08:55 +05:30
ankitjavalkarwork
90b79fcd1f Add Payment Reconciliation Feature/Tool - minor changes 2014-07-11 15:23:26 +05:30
webnotes
9d31705f75 Merge https://github.com/frappe/erpnext into wip_payrec 2014-07-11 11:21:51 +05:30
webnotes
059922cef1 Add Payment Reconciliation Feature/Tool 2014-07-11 11:20:44 +05:30
Rushabh Mehta
8e4a9ba831 Merge pull request #1927 from anandpdoshi/anand-july-10
Bank Reconciliation Statement Print Format
2014-07-10 21:59:05 +05:30
Anand Doshi
9b7b9b2e93 Bank Reconciliation Statement Print Format 2014-07-10 18:45:03 +05:30
Rushabh Mehta
e0d7a6869c Merge pull request #1926 from anandpdoshi/anand-july-10
Production Planning Tool - Fixed bom get query
2014-07-10 17:37:34 +05:30
Anand Doshi
28c4bee0b1 Production Planning Tool - Fixed bom get query 2014-07-10 16:43:31 +05:30
Rushabh Mehta
052b5a68ed Merge pull request #1925 from nabinhait/hotfix
Overflow validation fixed
2014-07-10 15:46:08 +05:30
nabinhait
ee8b6f28b8 minor fix 2014-07-10 15:27:27 +05:30
nabinhait
d5fb5d91e9 overflow validation fixed 2014-07-10 15:27:27 +05:30
Anand Doshi
16658c14fe Merge pull request #1924 from anandpdoshi/anand-july-10
Print Hide other charges calculation
2014-07-10 13:09:39 +05:30
Anand Doshi
a96cf5b96b Print Hide other charges calculation 2014-07-10 12:16:39 +05:30
Anand Doshi
287fe0559e Merge pull request #1920 from anandpdoshi/anand-july-9
Fixes in queries
2014-07-09 13:39:51 +05:30
Anand Doshi
9006bba11e Merge pull request #1919 from nabinhait/hotfix
Github issue fixes
2014-07-09 13:39:38 +05:30
Anand Doshi
48d3b54e02 Fixes in queries 2014-07-09 13:15:03 +05:30