Commit Graph

9427 Commits

Author SHA1 Message Date
Nabin Hait
5cf3a6bcd2 Merge pull request #1975 from anandpdoshi/anand-july-22
Trial Balance and Newsletter sending via Worker
2014-07-25 11:21:13 +05:30
Anand Doshi
329a8ef9a1 Merge pull request #1985 from ankitjavalkarwork/payrec
Remove Payment To Invoice Matching Tool
2014-07-24 18:57:46 +05:30
Anand Doshi
9e89dcf855 Merge pull request #1984 from nabinhait/hotfix
Fix for company in chart of accounts
2014-07-24 18:57:31 +05:30
ankitjavalkarwork
344dd3793a Merge branch 'develop' of https://github.com/frappe/erpnext into payrec 2014-07-24 15:15:12 +05:30
ankitjavalkarwork
d93f4c99e1 Remove Payment To Invoice Matching Tool 2014-07-24 15:14:36 +05:30
nabinhait
ffd57a0565 Fix for company in chart of accounts 2014-07-24 10:40:18 +05:30
Rushabh Mehta
92c043423e updated bench 2014-07-23 15:57:01 +05:30
Anand Doshi
d1a2ce2750 [minor] is_ajax check in newsletter 2014-07-23 12:51:17 +05:30
Rushabh Mehta
3c78ab5841 [email digest] [fix] [hot] only open to-do items 2014-07-23 10:19:31 +05:30
Anand Doshi
de85a3af15 Newsletter: Bulk Send via worker 2014-07-22 19:49:16 +05:30
Anand Doshi
cb86d597b7 Report: Trial Balance 2014-07-22 19:49:16 +05:30
Nabin Hait
9df4196597 Merge pull request #1970 from ankitjavalkarwork/payrec
Added Payment Reconciliation to list accounts.py
2014-07-22 18:24:58 +05:30
ankitjavalkarwork
87633d6be6 Payment Reconciliation Feature/Tool - Patch 2014-07-22 18:14:30 +05:30
Anand Doshi
33a94a74df Merge pull request #1968 from nabinhait/hotfix
Fixes
2014-07-22 17:39:07 +05:30
ankitjavalkarwork
b5ae643b6e Payment Reconciliation Feature/Tool - minor change 2014-07-22 15:26:04 +05:30
ankitjavalkarwork
b0cffac79d Payment Reconciliation Feature/Tool - add in module list 2014-07-22 15:02:59 +05:30
nabinhait
b5f9b5de45 PP Tool: data for required raw materials 2014-07-22 11:38:15 +05:30
nabinhait
c772b3d86a Purchase invoice: Copy project name from first row on addition of row 2014-07-22 11:38:14 +05:30
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