Commit Graph

9497 Commits

Author SHA1 Message Date
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
Anand Doshi
0c3bb75fd9 Added error_report_email in hooks 2014-07-09 12:59:56 +05:30
nabinhait
7e848b1924 Title mandatory in Note. Fixes #1913 2014-07-09 12:54:56 +05:30
nabinhait
8e4fcca216 Get query fixes in address in contact listing. Fixes #1911 2014-07-09 12:50:50 +05:30
nabinhait
fcfa42d992 Minor fixes #1917 2014-07-09 11:31:11 +05:30
nabinhait
5e0de79c0d Account validated in general ledger report. Fixed #1912 2014-07-09 11:10:40 +05:30
Anand Doshi
8adb211216 Fixed patch: erpnext/patches/v4_1/fix_delivery_and_billing_status.py 2014-07-09 11:09:53 +05:30
nabinhait
5eea6f1b6d Account validated in general ledger report. Fixed #1912 2014-07-09 11:08:59 +05:30
Rushabh Mehta
3f606b6c64 Update project.py 2014-07-09 09:27:02 +05:30
Rushabh Mehta
f31221d0d3 Changed raise Exception to frappe.throw 2014-07-09 09:13:00 +05:30
nabinhait
5220b462fd Merge branch 'anandpdoshi-reapply-price-list' into develop 2014-07-08 16:03:53 +05:30
nabinhait
89b5e3e2ea Set discount zero while fetching price list rate 2014-07-08 16:00:25 +05:30
nabinhait
ff2cc1626e Merge branch 'reapply-price-list' of github.com:anandpdoshi/erpnext into anandpdoshi-reapply-price-list 2014-07-08 15:30:25 +05:30
Anand Doshi
cf6d31cefc Sales Order: Fixed test case 2014-07-07 18:46:02 +05:30
Anand Doshi
46d64849b4 Merge pull request #1902 from nabinhait/hotfix
Run trigger of company field on onload function, even if company exists
2014-07-07 18:08:51 +05:30
nabinhait
6c40079139 Update delivery and billing status in SO 2014-07-07 18:02:53 +05:30
nabinhait
2c0c66e756 Update delivery and billing status in SO 2014-07-07 17:56:25 +05:30
nabinhait
bc408d8d0b Run trigger of company field on onload function, even if company exists 2014-07-07 17:56:24 +05:30
Anand Doshi
06cf2c7b51 Merge pull request #1903 from anandpdoshi/anand-july-7
Translations: Indonesian, Japanese and Russian
2014-07-07 17:44:04 +05:30
Anand Doshi
37f15ea664 Translations: Indonesian, Japanese and Russian 2014-07-07 17:26:51 +05:30
Anand Doshi
0da9060a80 Merge pull request #1900 from anandpdoshi/anand-july-7
Fix in Purchase Order and Re-order Item
2014-07-07 16:12:50 +05:30
Anand Doshi
e729516af7 Minor fix 2014-07-07 15:54:11 +05:30
Anand Doshi
4f0a42846c Catch FiscalYearError in Re-order Item 2014-07-07 15:21:18 +05:30
Anand Doshi
484b092720 BugFix in Purchase Order: Validate minimum order qty using Qty in Stock UOM 2014-07-07 14:03:26 +05:30
Rushabh Mehta
ada6e5a5c4 Merge pull request #1899 from anandpdoshi/anand-july-7
BugFix: Maintenance Visit against Customer Issue
2014-07-07 13:57:59 +05:30
Anand Doshi
2cf256c6d0 Merge pull request #1898 from rmehta/pdf-etc
sales order status bugfix, add leading / in website_image and removed se...
2014-07-07 13:09:22 +05:30
Rushabh Mehta
58692fe4d1 sales order status bugfix, add leading / in website_image and removed send_print_in_body_and_attachment 2014-07-07 12:29:43 +05:30
Anand Doshi
3a389788bf BugFix: Maintenance Visit against Customer Issue
+ Map Item details from Customer Issue into Maintenance Visit Purpose Table
+ Map Prev DocType and Prev DocName
+ Changed prevdoc_doctype and prevdoc_docname into Dynamic Link
2014-07-07 12:24:19 +05:30
Rushabh Mehta
47f26b0df4 Merge pull request #1896 from anandpdoshi/anand-july-7
BugFix: selling_controller.py
2014-07-07 11:50:54 +05:30
Anand Doshi
80a988c04f BugFix: selling_controller.py 2014-07-07 11:35:54 +05:30
Anand Doshi
51f722d20f Trigger Apply Price List on change of Currency Conversion Rate or Price List Currency Conversion Rate 2014-07-04 15:44:49 +05:30
Anand Doshi
dffec8fb85 Reapply Price List on Change 2014-07-04 15:44:48 +05:30
Anand Doshi
f9cae65df5 Merge pull request #1884 from nabinhait/hotfix
Hotfix
2014-07-04 15:31:15 +05:30