Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,662 Commits 3 Branches 0 Tags 1 GiB
88de158378
Commit Graph

1045 Commits

Author SHA1 Message Date
Rohit Waghchaure
efb5bf2cfc [POS] Fixed payment gl entry for sales return 2016-08-25 16:23:47 +05:30
Rushabh Mehta
69349f2672 [fix] [patch] column conversion before item reload 2016-08-18 17:06:55 +05:30
Kanchan Chauhan
bccf0fa041 [WIP] Formula based Salary Structure and multiple employees for same Salary Structure 2016-08-18 13:02:39 +05:30
Rushabh Mehta
de08639d49 [minor] fixes to patches while moving from v5 2016-08-16 10:01:56 +05:30
Nabin Hait
f44b5152d2 Portal settings for schools 2016-08-09 17:08:13 +05:30
Nabin Hait
ee018b5ae1 [fix]Patch order changed. Fixed #6026 2016-08-09 11:27:28 +05:30
Nabin Hait
99d4ff4a29 Repost gle for future transactions if update stock checked in back dated purchase invoice 2016-08-08 14:12:58 +05:30
Neil Trini Lasrado
50b2278eda Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch 2016-08-05 15:09:49 +05:30
Nabin Hait
ae921ce2c8 [patch] Set default material request type in Item based on default bom 2016-08-02 18:02:31 +05:30
Rohit Waghchaure
08aadb853c PPT looks at default MR type in Item to set MR type. 2016-08-02 16:59:03 +05:30
Nabin Hait
3c364dd5b8 [patch] Update refdoc in Landed Cost Voucher 2016-08-01 15:53:36 +05:30
Neil Trini Lasrado
74dbd168c2 [new Feature] Added guardian master 2016-08-01 15:08:04 +05:30
Nabin Hait
66126ffc7a Merge pull request #5938 from nabinhait/salary_renaming 
Delete old salary earning and deduction doctypes
 2016-08-01 13:06:52 +05:30
Nabin Hait
bc691dccba Changed the order of the patch 2016-08-01 12:36:28 +05:30
Nabin Hait
feed313a66 Delete old salary earning and deduction doctypes 2016-08-01 11:54:19 +05:30
Nabin Hait
e72ff9377a Added converted status in Opportunity 2016-07-28 15:59:20 +05:30
Neil Trini Lasrado
98151ce5b2 [Patch] Change status in Opportunity to Quotation where status is converted 2016-07-27 15:58:16 +05:30
Nabin Hait
444bedcd20 Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account 2016-07-27 12:33:10 +05:30
Rohit Waghchaure
c4afd63e50 [minor] Fixes 2016-07-26 20:47:42 +05:30
Rohit Waghchaure
4d3e8da4a2 [Fix] Set warehouse to stock account and fixed gl entries against transactions. 2016-07-26 17:09:33 +05:30
Rohit Waghchaure
26cf01aaba [mionr] fixes and cleanups 2016-07-26 00:30:25 +05:30
Neil Trini Lasrado
ce1c63f776 [rename] Renamed Fee Amount to Fee Component 2016-07-25 18:24:37 +05:30
Neil Trini Lasrado
d69d961f2a Removed Administrator role from Doctypes 2016-07-25 11:39:23 +05:30
Rushabh Mehta
ead3ccfd52 [fix] more routes patch up 2016-07-24 22:28:50 +05:30
Rushabh Mehta
20038ad2c9 [fixes] setup wizard and domainify for schools; 2016-07-21 16:01:59 +05:30
Saurabh
718d835f45 [enhance] Add Accounts table in to mention expense account based on company #5777 2016-07-19 11:38:16 +05:30
Nabin Hait
4fddff1606 Merge pull request #5767 from nabinhait/fix101 
Payment Improvements
 2016-07-16 11:55:12 +05:30
Nabin Hait
2842a86225 Merge pull request #5775 from revant/patch-1 
Issue #5774
 2016-07-16 11:28:15 +05:30
Revant Nandgaonkar
88e16a7f82 removed force=True 2016-07-16 11:00:37 +05:30
Nabin Hait
6831b9422b payment entry improvements and deletion of payment tool 2016-07-16 11:00:29 +05:30
Revant Nandgaonkar
cc08682879 Issue #5774 2016-07-15 23:41:22 +05:30
Kanchan Chauhan
9846b945d9 Patch to delete previous report 2016-07-15 14:06:20 +05:30
Kanchan Chauhan
7ff0c4eef4 Employee Attendance report renamed to Employees working on a holiday 2016-07-15 13:42:36 +05:30
Rohit Waghchaure
3bc6a958c7 [Fix] Timesheet overlap issue 2016-07-14 18:27:49 +05:30
Saurabh
6bc7b892c4 [fix] alter fieldtype for is_group from select to check 2016-07-14 14:06:28 +05:30
Nabin Hait
54bd79bd93 Merge pull request #5690 from nabinhait/fix100 
Deleted report Customers Not Buying Since Long Time
 2016-07-11 12:52:35 +05:30
Nabin Hait
bbc394fd72 Changed patch order to fix old patches 2016-07-11 12:40:18 +05:30
Nabin Hait
f176cc03df Deleted report Customers Not Buying Since Long Time 2016-07-08 09:03:13 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Rohit Waghchaure
a71d9d33af Rename prevdoc field in purchase order and purchase receipt doctype 2016-07-06 12:13:29 +05:30
Kanchan Chauhan
d963b76a4b Salary component cleanup 2016-07-06 12:04:38 +05:30
Rushabh Mehta
c1d2247f2c Merge pull request #5620 from nabinhait/payment_entry 
Payment Entry
 2016-07-04 13:01:16 +05:30
Nabin Hait
1991c7b17d Payment Reconciliation changes for Payment Entry 2016-07-04 11:42:24 +05:30
Saurabh
f5ab5f3c0c [minor][fix] reload warehouse before executing patches 2016-07-04 11:38:58 +05:30
Rohit Waghchaure
4d8f4d76e1 [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI 2016-07-01 15:33:57 +05:30
Kanchan Chauhan
fb3eb13ca4 New Maintenance Module 2016-06-29 15:51:02 +05:30
Saurabh
99892c7ce7 [fix] provision to convert group to ledger and vice versa 2016-06-27 17:16:56 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Anand Doshi
771ab0c8c3 [fix] [patch] re-route 2016-06-27 12:04:48 +05:30
Saurabh
7fecb50360 [enhance] rename warehouse account type to stock 2016-06-26 14:27:46 +05:30
Anand Doshi
f576f3b17b implemented get_site_info for erpnext and patch to move setup complete to system settings 2016-06-25 19:52:26 +05:30
Saurabh
dfbcdeb8a0 [enhancement] warehouse tree structure 2016-06-25 11:06:12 +05:30
Rushabh Mehta
a334062b03 [redesign] website routing system 2016-06-24 16:18:07 +05:30
Nabin Hait
2effad33d0 Merge branch 'master' into develop 2016-06-24 12:48:24 +05:30
Nabin Hait
6dfc78b12a Item Valuation Rate in case of negative inventory 2016-06-24 12:28:55 +05:30
Rushabh Mehta
a55fb6426c [patch] mins_to_first_response in opporutnity and issue 2016-06-14 15:54:54 +05:30
Rohit Waghchaure
9fe40d557f [POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes. 2016-06-14 01:11:09 +05:30
Rushabh Mehta
d56306add0 [minor] [fix] quotation cancelled status issue, fixes #5221 2016-06-09 15:56:48 +05:30
Nabin Hait
591a5aba56 Added Project in GL Entry and General Ledger report 2016-05-26 17:51:20 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
ca90963d5b Redesigned budgets 2016-05-23 13:04:26 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Nabin Hait
f3bff49799 Merge branch 'master' into develop 2016-05-02 15:19:17 +05:30
Valmik Jangla
651dc5b345 Reset Values in Tools 2016-05-02 12:00:06 +05:30
Anand Doshi
49e470035d [fix] removed rename_item_field patch 2016-04-29 12:50:07 +05:30
Nabin Hait
14aa9c5320 [fix] Cleanup and fixes in update stock feature in Purchase Invoice 2016-04-18 16:59:47 +05:30
Rushabh Mehta
c65726bf07 [patch] hide new icons if equivalent old ones are set 2016-04-15 12:51:28 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9 [enhancement] heatmaps on item and notifications for item 2016-04-14 17:30:53 +05:30
Rushabh Mehta
f16f9c569b [enhancement] add status in customer, supplier 2016-04-08 17:21:00 +05:30
Anand Doshi
4b207647db [fix] sanitize html of product bundle description 2016-04-05 18:34:11 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
Nabin Hait
2646f84a30 [patch] Fix delivery and billing status of recurring orders 2016-03-21 15:22:31 +05:30
Saurabh
0f063a5f46 [patch] map customer_address to shipping_address and customer_address_display to shipping_address_display 2016-03-16 16:23:30 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Anand Doshi
4284fcf2a6 [fix] additional fixes for removal of Fiscal Year form Holiday List 2016-03-11 17:16:30 +05:30
Anand Doshi
6d59a41b27 [fix] delete Web Form contact 2016-03-10 14:31:04 +05:30
shreyas
6f8dfa4c8d [Minor] Fix print settings for custom print format 2016-03-07 18:22:40 +05:30
Rushabh Mehta
5a700820e7 [fix] [minor] autoload chart of accounts 2016-03-07 11:57:54 +05:30
Rushabh Mehta
5839a8d7f0 [fixes] usability cleanup of recurring document and added explicit submit_on_creation 2016-03-02 17:51:52 +05:30
Nabin Hait
5a4c7d3b62 [patch] repost valuation rate for serialized items 2016-02-29 12:07:42 +05:30
Anand Doshi
7b52dc9f32 [hotfix] added back comment_feed_communication patch 2016-02-26 20:51:33 +05:30
Nabin Hait
737849a0f5 [patch] Update stopped status to close 2016-02-25 15:16:02 +05:30
Saurabh
dca6302e15 [fixes] field renaming, cart checkout fixes, JE fixes for multi-currency payment 2016-02-24 15:07:24 +05:30
Neil Trini Lasrado
abd9248ba6 Rename sales_order_no to sales_order in Material Request Item 2016-02-23 18:35:43 +05:30
Rushabh Mehta
3cdf3544fb [enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue 2016-02-08 18:50:40 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Nabin Hait
ee8f88d641 [patch] Set party account currency in existing orders 2016-01-27 16:01:31 +05:30
Anand Doshi
eca2e42ecb [fix] patch title field of Pricing Rule 2016-01-27 12:36:36 +05:30
Nabin Hait
a613ea8abf [patch] Create manufacturer records 2016-01-20 18:32:37 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
c040075bd4 [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Rushabh Mehta
13ec41abb2 [enhancement] task status will be set to overdue when it crosses expected end date 2015-12-10 12:59:02 +05:30
Nabin Hait
4ad0963ee8 [patch][fix] Fixed drop ship status and tax rule patch 2015-12-08 16:51:04 +05:30
Nabin Hait
694373d022 Fixed conflict 2015-12-08 15:30:15 +05:30
Saurabh
70ed6ede5c [fixes] patch to update delivery status for drop ship item 2015-12-08 14:48:19 +05:30
Nabin Hait
a974ab3dc5 [fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier 2015-12-08 12:56:14 +05:30
Rushabh Mehta
0cc177f73c Merge pull request #4400 from nabinhait/total_amount_in_jv 
[fix] Total Amount in Journal Entry in bank currency
 2015-12-01 10:58:34 +05:30
Nabin Hait
621f4cd7c9 [fix] Invoicing against drop-ship Purchase Order 2015-11-30 18:40:28 +05:30
Nabin Hait
6c173e9730 [fix] Total Amount in Journal Entry in bank currency 2015-11-30 16:13:42 +05:30
Anand Doshi
563c243ec6 Revert "[hotfix] total amount in journal entry" 
This reverts commit 5b03a75970.
 2015-11-27 17:38:17 +05:30
Anand Doshi
5b03a75970 [hotfix] total amount in journal entry 2015-11-27 17:24:06 +05:30
Rushabh Mehta
9785cd35dc [minor] quote optional in email digest 2015-11-27 14:50:15 +05:30
Rushabh Mehta
b82bdd6f1f [fix] total amount in journal entry 2015-11-26 09:08:07 +05:30
Anand Doshi
ebae726237 [fix] status update - update qty after int float not null change 2015-11-25 17:55:47 +05:30
Anand Doshi
7221805587 [fix] Changed Country fieldtype to Link in Web Form 2015-11-23 19:20:51 +05:30
Saurabh
20628f5bd8 [patch] mo drop shipment from purchase order to purchase order item 2015-11-18 17:39:25 +05:30
Rushabh Mehta
511421b6a3 [minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405 2015-11-13 11:04:50 +05:30
Nabin Hait
61fb7ee5b8 Deleted Stock UOM Replace Utility 2015-11-12 12:06:47 +05:30
Nabin Hait
7c654cd1bb Leave allocation patch included 2015-11-06 10:37:26 +05:30
Nabin Hait
a90a0528aa Fixed conflict 2015-10-28 15:50:26 +05:30
Nabin Hait
15bf4e5599 [patch] Deleted Item-wise Last Purchase Rate report 2015-10-28 12:48:32 +05:30
Anand Doshi
c794ca53fb [fix] delete file records created via item.py even if website_image file didn't exist 2015-10-27 16:56:42 +05:30
Nabin Hait
be464696cc [fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account 2015-10-21 17:40:06 +05:30
Anand Doshi
95dfc2730b [fix] re-run thumbnail patch 2015-10-20 19:03:30 +05:30
Anand Doshi
7c0eadb451 [fix] Patch template item to be shown in website, show variant's description and price on change of attribute 2015-10-20 17:30:02 +05:30
Rushabh Mehta
6e322d0a02 [enhancement] use thumbnails in grid views, patch to make thumbnails 2015-10-14 16:21:24 +05:30
Rushabh Mehta
73e73795f1 [minor] Added 'Invite User' in Contact 2015-10-14 16:20:39 +05:30
Anand Doshi
71ebad5668 Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error 2015-10-14 16:13:49 +05:30
Rushabh Mehta
174299124f [cleanup] [wip] email digest 2015-10-14 15:53:37 +05:30
Rushabh Mehta
86125b2b9f [fix] sales order status for maintenance 2015-10-13 12:31:05 +05:30
Nabin Hait
b7e46c4ed9 [fix][patch] Delete duplicate bins 2015-10-12 18:28:50 +05:30
Anand Doshi
7866c6e6db [fix] modified in sales order and purchase order 2015-10-07 17:26:19 +05:30
Rushabh Mehta
d10ba853e6 [fix] sales & purchase order status 2015-10-02 17:16:51 +05:30
Nabin Hait
7a287a9153 [patch] Fix affected Journal Entries due to reconciliation 2015-10-02 16:00:42 +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
d970b001a4 [fix] Round status update percentages to 2 decimals 2015-09-28 16:52:22 +05:30
Rushabh Mehta
72fbf902d7 [cleanup] added single price list for shopping cart, removed Applicable Territory 2015-09-23 12:50:34 +05:30
Anand Doshi
0332f83bc2 [fix] customer naming series validation and patch to fix missing default taxes and lead 2015-09-17 19:01:48 +05:30
Anand Doshi
e9b14e497b [fix] remove duplicate newsletter subscribers 2015-09-17 17:46:40 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
f0b3014a23 Planned Qty logic fixed and reposted for existing 2015-09-09 11:04:10 +05:30
Nabin Hait
6c3ff3e2ed Fixed conflict 2015-09-08 18:09:03 +05:30
Nabin Hait
83a358afc1 Fix invoice outstanding where party missing 
Conflicts:
	erpnext/accounts/doctype/gl_entry/gl_entry.py
	erpnext/patches.txt
 2015-09-08 16:37:26 +05:30
Nabin Hait
d387dd3bc6 [fix] Project: round percent_complete to 2 decimals 2015-09-08 16:15:00 +05:30
Rushabh Mehta
91b0e2348c [minor] task not mandatory for Time Log and Expense Claim #3904 2015-09-08 15:53:53 +05:30
Nabin Hait
4de91887db [patch] Re-run the 'default_title' patch 2015-09-08 15:53:35 +05:30
Nabin Hait
11a746d363 Fixed conflict 2015-09-03 16:04:11 +05:30
Nabin Hait
59c4ae5a46 [patch] Re-run the 'default_title' patch 2015-09-03 10:46:48 +05:30
Rushabh Mehta
85abdc4fad [minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291 2015-09-03 10:29:38 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Nabin Hait
54fe26dcfb [patch] Multi currency 2015-08-27 12:55:24 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +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
047ecd1eb9 Update order reference in return entries and repost reserved / ordered qty 2015-08-25 14:11:13 +05:30
Anand Doshi
cf7adb5c02 [patch] re-run repost_reserved_qty 2015-08-20 15:42:58 +05:30
Nabin Hait
fa5fcf5405 [fix] Purchase cost against project 2015-08-19 11:56:23 +05:30
Nabin Hait
1826791891 [fix][patch] Reserved Qty logic fixed and reposted for existing items 2015-08-19 11:00:00 +05:30
Anand Doshi
b6c5b21dd0 [fix] [patch] typo and remove Bulk SMS 2015-08-18 16:27:20 +05:30
Anand Doshi
09ba897297 [fix] [patch] Item Template Attributes - migration from v4 and v5 2015-08-17 19:21:29 +05:30
Nabin Hait
9495adc9d7 Update patches.txt 2015-08-17 17:58:53 +05:30
Anand Doshi
bfbf768daa [hotfix] [patch] cleanup journal entry 2015-08-17 17:58:51 +05:30
Neil Trini Lasrado
62dba50e9b Multiple Fixes 2015-08-13 16:18:55 +05:30
Neil Trini Lasrado
b9b49632f2 Added patch to fetch Item Template Attributes 2015-08-13 16:17:36 +05:30
Rushabh Mehta
2645980f62 [patch] cleanup_journal_entry 2015-08-13 13:38:20 +05:30
Nabin Hait
c51d5ba5df [patch] Update item description in Production Order based on item master 2015-08-13 11:39:45 +05:30
Nabin Hait
3c3a3ecea8 Additional Costs in Stock Entry 2015-08-10 14:07:45 +05:30
Anand Doshi
aa5182bb9e [fix] rename old filenames that start with FileData and fix missing Item images 2015-08-04 23:06:01 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Nabin Hait
232ad777c9 [fix][patch] Remove fifo stack entry if qty after transaction is zero via stock reconciliation 2015-08-04 11:40:38 +05:30
Nabin Hait
ad44b00f33 [patch] Fix outstanding amount for original invoice for return entry 2015-08-03 19:19:11 +05:30
Nabin Hait
1db0b6de0c Patch to notify system managers if there are any wrong entries due to bug related to 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
Nabin Hait
17405d4130 repost stock for product bundle materials 2015-07-30 14:53:27 +05:30
Anand Doshi
2f443a5789 [hotfix] Item checkbox mandatory and removed Module Def Contacts 2015-07-30 14:44:43 +05:30
Nabin Hait
d1dc622914 [fix][patch] Reload Leave Type 2015-07-29 16:37:02 +05:30
Nabin Hait
b24d2efc4b [fix] Updated 'Include Holiday' in existing and default leave type records 2015-07-29 16:15:08 +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
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
2771b7d828 Track Operations removed and Global Switch added to disable capacity planning in manufacturing settings 2015-07-23 17:39:35 +05:30
Nabin Hait
bb274fce2e [cleanup] Party Type deleted 2015-07-23 11:45:30 +05:30
Anand Doshi
f6954fb798 Merge pull request #3663 from neilLasrado/bom 
Bom
 2015-07-16 15:02:40 +05:30
Anand Doshi
c6656e68b8 Merge pull request #3666 from nabinhait/patch-fix 
[patch][fix] Sales BOM should be renamed before rename_table_fields patch
 2015-07-16 14:55:35 +05:30
Nabin Hait
5464ca8a73 [patch][fix] Sales BOM should be renamed before rename_table_fields patch 2015-07-16 12:19:57 +05:30
Neil Trini Lasrado
20523c45c7 Patch for default BOM 2015-07-16 11:27:06 +05:30
Rushabh Mehta
51e7086a08 [patch] rename roles 2015-07-15 16:30:49 +05:30
Rushabh Mehta
94157334a7 [rename] Material User > Stock User 2015-07-13 15:06:12 +05:30
Neil Trini Lasrado
4089b3d376 Salary Slip renamed to Process Payroll 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
cc08c68153 Patch for Production Order Track Operation 2015-07-13 12:35:20 +05:30
Nabin Hait
0724449d0e [patch] Set 'Credit days based on' in existing customer, customer group and company 2015-07-09 17:49:50 +05:30
Rushabh Mehta
6b35ea873b [fix] against account in general ledger will show party 2015-07-02 14:25:51 +05:30
Neil Trini Lasrado
9c15ef903d Image feild added to Sales Invoice & Purchase Invoice 2015-07-02 13:09:57 +05:30
Neil Trini Lasrado
3f2604eff6 Patch for Item Variants 2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
a25e8ea0bc Fixed Issues in Project Task 2015-06-30 17:15:13 +05:30
Nabin Hait
39046d663d [patch] Add index on Account and GL Entry table 2015-06-14 20:59:28 +05:30
Nabin Hait
56fcf30cb9 [Patch] Update material transferred for manufacturing for existing entries 2015-06-05 18:21:35 +05:30
Nabin Hait
3c1017c43b Removed deprecated page users 2015-06-05 12:15:01 +05:30
Nabin Hait
0b18a2d347 Reset values in tools like Payment Tool 2015-06-05 12:01:29 +05:30
Rushabh Mehta
a33d468d30 [fixes] portal, issues, addresses etc 2015-06-01 17:15:42 +05:30
Nabin Hait
11190268ab [fix][patch] GL Entries for Journal Entries with multiple Party, merge entries considering party 2015-06-01 16:21:25 +05:30
Rushabh Mehta
b0b446e899 [fix] cleanup tables from description and re-sync print format 2015-05-29 12:44:33 +05:30
Pratik Vyas
37ee57c211 [fix] Remove guest perms from Issue 2015-05-28 13:04:43 +05:30
Rushabh Mehta
306c49f8a0 [enhancement] list backups for download 2015-05-26 15:14:58 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Nabin Hait
9895aba42e update operation description patch 2015-05-21 14:43:24 +05:30
Nabin Hait
de7b87ee3a [fix] operations and bom 2015-05-21 13:24:49 +05:30
Rushabh Mehta
a27cca97b5 [rename] POS Setting > POS Profile #3271 2015-05-20 15:43:17 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Nabin Hait
b893972486 update tax amount after discount amount in purchase cycle 2015-05-15 15:16:30 +05:30
Nabin Hait
8719c1a6b8 Fix taxes and totals in party currency 2015-05-12 12:28:26 +05:30
Nabin Hait
8f5b8c658a fixes for renaming taxes and charges master 2015-05-11 11:32:38 +05:30
Nabin Hait
6752b31091 Fixed issue while updating Requested Qty on stoping material request and patch to recalculate 2015-05-08 12:49:50 +05:30
Nabin Hait
e27690ceda Fixed issue while updating Requested Qty on stoping material request and patch to recalculate 2015-05-08 12:43:10 +05:30
Nabin Hait
15c284497b fixed patch 2015-05-08 01:28:01 +05:30
Nabin Hait
fbdc0dc7d1 fixed patch 2015-05-08 01:24:28 +05:30
Nabin Hait
752479d08d patch order changed 2015-05-08 01:15:39 +05:30
Neil Trini Lasrado
e64d453d09 patch added 2015-05-07 17:31:59 +05:30
Nabin Hait
08c0c04ef2 Removed old page style Stock ledger end stock level report 2015-05-07 16:59:51 +05:30
Rushabh Mehta
bcdea3ea51 [rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template 2015-05-06 18:45:47 +05:30
Nabin Hait
d51b09282a link warehouse with account 2015-05-01 20:31:11 +05:30
Nabin Hait
042f86e555 advance paid should not be copied and patch to fix affected records 2015-04-28 13:00:23 +05:30
Nabin Hait
3be69d4d81 patch for updating temporary account type 2015-04-27 18:33:05 +05:30
Nabin Hait
3c3855ac8c advance paid should not be copied and patch to fix affected records 2015-04-27 11:25:56 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
e7ddb72e7f patch for renaming project feilds 2015-04-22 11:25:59 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Nabin Hait
e68e86f109 execute on_doctype_update 2015-04-21 15:26:42 +05:30
Rushabh Mehta
80f8b7be2f [minor] [perms] Expense Claim Type 2015-04-19 16:18:15 +05:30
Nabin Hait
2ba88c4a5f patch: delete gle for cancelled invoices 2015-04-17 12:05:00 +05:30
Nabin Hait
c3daa91c8a Reset no-copy fields for recurring docs and patch to fix 2015-04-16 13:13:18 +05:30
Rushabh Mehta
12ade3573b [minor] fix default permissions for purchase taxes and charges master 2015-04-16 11:43:25 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Pratik Vyas
d102cba71c [patch] [fix] Fix missing image column error 2015-04-07 15:32:15 +05:30
Rushabh Mehta
8bd54f27c5 Merge pull request #3051 from rmehta/opportunity 
Opportunity
 2015-04-03 11:01:59 +05:30
Rushabh Mehta
bb2041d22c [patch] fix 2015-04-02 22:11:16 +05:30
Rushabh Mehta
4c46687fb1 [incoming sales email] to opportunity 2015-04-02 22:00:34 +05:30
Anand Doshi
5445c460b7 [fix] [patch] party model patch 2015-04-02 17:42:27 +05:30
Anand Doshi
5745cf7600 fixed rename field patches 2015-03-31 17:31:53 +05:30
Nabin Hait
d25fda7537 patch fixes 2015-03-25 15:55:09 +05:30
Nabin Hait
37eaa0cca3 Merge pull request #3003 from neilLasrado/activity-type 
time_log_for select field in TL changed to against_manufacturing (check)
 2015-03-24 18:03:25 +05:30
Nabin Hait
b6061e5d3f deleted chart of accounts and style settings doctype 2015-03-24 17:11:58 +05:30
Neil Trini Lasrado
bccec29415 In Time Log 
- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log

In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures
 2015-03-24 16:53:54 +05:30
Rushabh Mehta
14ae4c3603 [email] many fixes, newsletter, unsubscribe 2015-03-19 17:16:03 +05:30
Nabin Hait
a1bf43b1a6 Merged develop into v5 2015-03-17 10:50:47 +05:30
Anand Doshi
5b73da99d6 [minor] fixed patch 2015-03-16 17:10:28 +05:30
Anand Doshi
9d9e31f4e8 moved get_list_context to module 2015-03-13 12:48:05 +05:30
Neil Trini Lasrado
6f272f2f53 fixes in Production Order 2015-03-12 17:51:06 +05:30
Nabin Hait
11498cac94 Repost sle for si without warehouse 2015-03-09 18:28:35 +05:30
Nabin Hait
7a31f6aaca repost reserved qty if negative 2015-03-09 16:31:11 +05:30
Rushabh Mehta
2cc585f180 [git fixes] salary manager, time log title, notificaitons 2015-03-03 16:06:54 +05:30
Neil Trini Lasrado
fd0920fe83 Fixes in Appraisal doc 2015-03-02 17:33:48 +05:30
Rushabh Mehta
905f8328ab cleanup global defaults, fix #2838: 2015-03-02 13:01:39 +05:30
Rushabh Mehta
66a92792b4 [fix] default account for manufacturing stock entry should be cogs 2015-02-25 17:15:45 +05:30
Rushabh Mehta
6cdfd1e976 [fix] patches 2015-02-25 15:55:57 +05:30
Rushabh Mehta
2a21bc9fc2 [taxes and charges] refactor 2015-02-25 15:08:57 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Nabin Hait
6dfbc2465b Patch: taxes and totals in party currency 2015-02-24 10:04:00 +05:30
Rushabh Mehta
a1da88a3d3 [capacity planning] automatically plan Time Logs from Production Order 2015-02-23 20:18:38 +05:30
Rushabh Mehta
d06c1188a0 [item] patches 2015-02-23 14:43:15 +05:30
Rushabh Mehta
d54031f3b5 [tests] [projects] merged tasks and projects and added quick edit of tasks from projects 2015-02-22 22:32:39 +05:30
Rushabh Mehta
dc93e0adc6 [fixes] stock reco 2015-02-20 15:11:56 +05:30
Nabin Hait
ad3fd5166b update stock uo in sle for DN 2015-02-20 14:23:58 +05:30
Rushabh Mehta
c7a11cc451 [usability] [fixes] stock entry and production order 2015-02-19 16:28:35 +05:30
Rushabh Mehta
d60acb9f26 [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation 2015-02-19 14:53:31 +05:30
Neil Trini Lasrado
e9d45bcb28 patch fixes 2015-02-18 20:25:44 +05:30
Neil Trini Lasrado
d8b35639d8 image feild made hidden 2015-02-18 12:33:53 +05:30
Nabin Hait
da5f766dd5 fixed conflict 2015-02-18 11:55:13 +05:30
Nabin Hait
b120520aa8 fixed patches 2015-02-18 11:54:08 +05:30
Neil Trini Lasrado
744aec8def activity type fixs 2015-02-17 16:12:32 +05:30
Anand Doshi
0fe854692d [fix] add CRM module to user desktop items in patch 2015-02-17 14:45:36 +05:30
Rushabh Mehta
06072c1e51 [refactor] Material Transfer for Manufacture 2015-02-17 11:50:45 +05:30
Rushabh Mehta
46e03eadca [rename] Customer Issue -> Warranty Claim 2015-02-17 10:45:50 +05:30
Rushabh Mehta
60cfccbf77 [new-module] crm 2015-02-17 10:36:54 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Neil Trini Lasrado
41acbff959 item name added to BOM 2015-02-03 10:59:40 +05:30
Neil Trini Lasrado
dc65dc3778 rename patch 2015-01-27 12:27:10 +05:30
Neil Trini Lasrado
f0b0464cce patch for is_batch_item 2015-01-23 15:32:35 +05:30
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Nabin Hait
3f671ea60f Landed Cost Voucher: Add field and fixed reposting issue 2015-01-21 14:08:06 +05:30
Nabin Hait
9ef2e78905 Merge pull request #2553 from neilLasrado/mode-of-payment 
mode of payment - company wise default account added
 2015-01-19 14:26:00 +05:30
Nabin Hait
fff3ab752c Fixed conflict 2015-01-14 16:27:13 +05:30
Neil Trini Lasrado
bd2ac2f51f mode of payment - company wise default account added 2015-01-14 12:00:17 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Nabin Hait
ebc4ae7892 patch fixes 2015-01-02 12:46:49 +05:30
Nabin Hait
56ac3fb29d some fixes for renaming patch 2015-01-01 13:40:54 +05:30
Rushabh Mehta
7a8f009116 [fixes] 2014-12-31 15:34:37 +05:30
Nabin Hait
cbdfb767a9 patch fix 2014-12-31 13:30:36 +05:30
Nabin Hait
54361e8651 fixed conflict while merging develop into v5 2014-12-31 13:24:36 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
57595cf73b fixed merge conflict 2014-12-23 18:05:13 +05:30
Nabin Hait
89c52eacc7 Actual operation cost in stock entry, fixed cost removed from bom and workstation 2014-12-23 17:39:00 +05:30
Nabin Hait
0f4350dd61 capacity planning fixes and cleanup 2014-12-23 17:39:00 +05:30
Neil Trini Lasrado
8d34417c44 Bom currency feilds changed to type currency and company feild added to BOM 2014-12-12 11:33:50 +05:30
Neil Trini Lasrado
3a34cadcb2 Fix - Total Fixed Cost with patch 2014-12-11 17:15:12 +05:30
Rushabh Mehta
6d950d23a8 [merge] 2014-11-28 12:08:51 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Rushabh Mehta
7d36875d6f [refactor] address and contact list in customer, supplier, lead, sales person 2014-11-24 14:16:47 +05:30
Nabin Hait
a6a70a5f35 Make email account patch 2014-11-12 17:00:42 +05:30
Neil Trini Lasrado
ce020cfb27 mapper added, type 'Transfer' renamed to 'Material Transfer', patch added 2014-11-05 15:46:32 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
9114c26857 Patch to recalculate requested qty and ordered qty for all items 2014-11-04 15:34:03 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
9bbfca9226 Fix gl entries for stock transactions 2014-10-15 12:24:38 +05:30
Neil Trini Lasrado
6644406185 Fix - BOM calculated wrong cost on update cost 2014-10-14 12:14:38 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
Nabin Hait
7820b171d3 Stock balance grid report deprecated and moved to server side 2014-10-10 18:03:07 +05:30
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
Nabin Hait
803cd11f68 Update patches.txt 2014-10-07 13:05:29 +05:30
Nabin Hait
0ef1e75c56 party model patch included in patches.txt 2014-10-07 11:37:58 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Neil Trini Lasrado
29d1a1c593 manufacturing and repack sepreted, test cases fixed, patch fixed 2014-09-30 14:07:56 +05:30
ankitjavalkarwork
44d42ddf63 [fix] Merge permission roles to modify frozen entries/set frozen accounts 2014-09-30 10:40:39 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
Pratik Vyas
144f06e381 Update patches.txt 2014-09-01 18:31:11 +05:30
ankitjavalkarwork
28a975dd32 Add patch for field name change in SI, rename email template 2014-09-01 16:22:56 +05:30
Anand Doshi
98eacdb785 [patch] Set company's country 2014-09-01 10:23:47 +05:30
Rushabh Mehta
52f04da5f5 [style] default website 2014-08-25 15:17:20 +05:30
nabinhait
fe39442c48 Removed old landed cost wizard 2014-08-11 16:12:31 +05:30
Anand Doshi
6b8145a813 [patch] Add currency Turkish Lira 2014-08-08 14:05:01 +05:30
Rushabh Mehta
c9bd3f5d4a added templates for projects 2014-08-08 11:56:32 +05:30
Nabin Hait
05b56d0d08 Fix account's master type 2014-08-07 15:03:41 +05:30
Pratik Vyas
1271bc4457 [hotfix] [patch] remove missing patch 2014-08-05 06:54:11 +05:30
Anand Doshi
35cc320e21 [fixes] Leave Application and Toggle Rounded Totals 2014-07-30 17:00:26 +05:30
Anand Doshi
bc708ee4c2 [print] Disable rounded total 2014-07-29 22:24:31 +05:30
nabinhait
079611936f Delete Payment-to-invoice-matching-tool through patch 2014-07-29 12:12:09 +05:30
Anand Doshi
bd748bd115 [hotfix] [patch] Delete old print formats 2014-07-29 08:51:41 +05:30
Anand Doshi
a5437cdac1 Fixes for print 2014-07-25 13:02:28 +05:30
ankitjavalkarwork
82ec488b99 Payment Reconciliation Feature/Tool - Patch 2014-07-25 13:02:28 +05:30
Rushabh Mehta
781ddc3a25 added patch to remove old print formats 2014-07-25 13:02:28 +05:30
Anand Doshi
cb86d597b7 Report: Trial Balance 2014-07-22 19:49:16 +05:30
ankitjavalkarwork
87633d6be6 Payment Reconciliation Feature/Tool - Patch 2014-07-22 18:14:30 +05:30
nabinhait
fa1cd5faff Fixed root type of liability accounts 2014-07-17 11:52:50 +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
2c0c66e756 Update delivery and billing status in SO 2014-07-07 17:56:25 +05:30
Rushabh Mehta
5f42276dbd added patch for fixing sales order delivered qty 2014-07-01 18:42:59 +05:30
Anand Doshi
bc71f737b8 Fix JV Remarks 2014-07-01 18:12:26 +05:30
Anand Doshi
5ba7ab0fed Outgoing Mail Footer patch 2014-06-27 21:00:51 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Nabin Hait
444f956e7b Pricing Rule fixes and improvements. Fixes #1795 2014-06-20 16:00:45 +05:30
Nabin Hait
91090042d1 Patch: update users report view settings for rename fields 2014-06-18 10:29:53 +05:30
Anand Doshi
ccf370f813 Fixed item query 2014-06-16 13:50:11 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Nabin Hait
e7f2d3179d update other_charges in custom print formats 2014-06-12 14:58:09 +05:30
Nabin Hait
91016ba989 update custom print formats for renamed fields 2014-06-10 10:41:37 +05:30
Anand Doshi
c01db5fe9c Save default letterhead 2014-06-09 18:01:14 +05:30
Nabin Hait
d532d2f64f create custom fields for india specific fields 2014-06-09 16:00:49 +05:30
Anand Doshi
cdfa9a371d Export perm for GL Entry and Stock Ledger Entry 2014-06-09 15:11:17 +05:30
Nabin Hait
b63e99eb43 Update tax amount after discount in existing documents 2014-06-09 12:49:09 +05:30
Anand Doshi
fc601659f5 Fixed Address Template 2014-06-06 17:07:50 +05:30
Anand Doshi
4a069a1e7f Changed case in modules.txt 2014-06-06 16:28:03 +05:30
Anand Doshi
171c00cfd6 Reload permissions for master and setting documents 2014-06-06 15:13:20 +05:30
Rushabh Mehta
ba83e9cfbe removed sms control and related cleanup, fixes frappe/erpnext#462 2014-06-05 17:56:42 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Nabin Hait
19d1e499c3 Removed Purchase in transit report #1435 2014-06-04 19:00:56 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
fab0904af7 Started permission relogication 2014-06-04 17:48:52 +05:30
Nabin Hait
0e6554edc1 Root Type field added in account and patch for existing accoutns 2014-05-21 11:53:58 +05:30
Nabin Hait
9419575126 Merged language patch with global_defaults_to_system_settings patch 2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a Global Defaults to system settings. Fixes #1653 2014-05-15 16:42:23 +05:30
Nabin Hait
ea7e3d6405 Clear default for price_list_currency 2014-05-14 18:52:06 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Anand Doshi
8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 2014-05-13 16:52:26 +05:30
Anand Doshi
d711209dde Fixed patches.txt 2014-05-12 19:42:38 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Anand Doshi
0c85169539 Fixed clear cache for item page 2014-05-08 17:46:00 +05:30
Anand Doshi
f410bd9bf9 Better default permissions, ignore_restrictions for defaults, removed field trash_reason 
Additions:
	Account --> Material User: Read
	Cost Center --> Sales User, Purchase User: Read
	Mode of Payment --> Accounts User: Read
	Supplier --> Material User, Accounts User: Read
	Employee --> Employee: Restricted Read
	Leave Type --> Employee: Read
	Production Order --> Material User: Read
	Sales Order --> Material User: Read
	Print Heading --> All: Read
	Terms and Conditions --> Purchase User, Material User: Read
	Territory --> Material User, Maintenance User: Read
	Item --> Sales User, Purchase User, Maintenance User, Accounts User: Read
	Price List --> Manufacturing User: Read
	Purchase Receipt --> Accounts User: Read
	Warehouse --> Manufacturing User: Read
 2014-05-07 17:20:42 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Nabin Hait
02d37bbb5a Allow Rename option added in multiple docs. Fixes #1521 2014-05-06 12:18:50 +05:30
Nabin Hait
576f025c84 Payment to invoice matching tool 2014-04-30 19:30:50 +05:30
Nabin Hait
2594e41462 Removed Stock Ledger doctype 2014-04-28 16:23:45 +05:30
Anand Doshi
7fbdba02ab Fixed Countrywise Chart of Accounts patch 2014-03-25 13:50:52 +05:30
Nabin Hait
155c96b410 patch to delete mis control and financial statements and set bank/cash account 2014-03-21 12:15:13 +05:30
Nabin Hait
24e136e3f3 Patch: set root_type for old existing accounts 2014-03-21 11:25:16 +05:30
Nabin Hait
b93ebaebe4 Added new account types and patch for existing 2014-03-21 11:22:41 +05:30
Nabin Hait
a69c30edec country code added 2014-03-21 11:22:39 +05:30
Nabin Hait
53822ae9d0 Account balance must be of type debit/credit 2014-03-21 11:22:38 +05:30
Anand Doshi
c379c78fec Fixed Dropbox, Scheduler, 3to4 migration 2014-03-11 15:17:13 +05:30
Anand Doshi
74d0e40bdc Moved Notification Count hooks to frappe, employee user id patch, Item ignore restriction fields 2014-03-05 15:24:29 +05:30
Anand Doshi
e30511d315 Email Settings split into Outgoing Email Settings and Support Email Settings 2014-03-03 20:32:20 +05:30
Anand Doshi
f5794f1c07 Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
Nabin Hait
311079a311 Patch: copy customer discount to pricing rule 2014-02-28 13:04:19 +05:30
Rushabh Mehta
063141d152 added patch for address 2014-02-28 11:37:36 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Rushabh Mehta
a6628eee56 rename sitemap to route 2014-02-25 11:08:37 +05:30
Pratik Vyas
31affc0e67 bump modified dates for purchase receipt and purchase invoice 2014-02-17 11:36:10 +05:30
Rushabh Mehta
793ba6bd37 -webnotes +frappe 💥 2014-02-14 15:47:51 +05:30
Nabin Hait
36028bfb56 minor 2014-02-12 19:09:28 +05:30
Nabin Hait
e219d61ed4 patch included in patches txt 2014-02-12 17:08:35 +05:30
Rushabh Mehta
22ababbec1 configs 2014-02-07 18:16:11 +05:30
Akhilesh Darjee
602fdc0000 patch reloading employee form 2014-02-03 19:32:59 +05:30
Akhilesh Darjee
d6d2193f91 newsletter reload 2014-01-31 19:59:25 +05:30
Akhilesh Darjee
4cdb79941b map charge to taxes and charges in transactions 2014-01-30 13:56:57 +05:30
Akhilesh Darjee
b665d86292 patch to reload all sales and purchase doctypes and print formats 2014-01-29 17:40:34 +05:30
Akhilesh Darjee
86894f3bbf merge conflict fixed 2014-01-27 15:42:02 +05:30
Anand Doshi
cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip 
Conflicts:
	config.json
	erpnext/accounts/utils.py
	erpnext/patches/patch_list.py
	erpnext/stock/doctype/price_list/price_list.txt
	erpnext/stock/doctype/warehouse/warehouse.py
	portal/templates/sale.html
	portal/utils.py
	selling/doctype/sales_order/templates/pages/order.py
	selling/utils/cart.py
	selling/utils/product.py
	utilities/demo/demo_docs/Fiscal_Year.csv
	utilities/demo/make_demo.py
 2014-01-24 21:44:36 +05:30
Akhilesh Darjee
57738a0ff3 flat discount replaced to discount amount 2014-01-03 18:15:07 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Rushabh Mehta
c4a0ed63ef Moved demo to separate app, moved patches folder 2013-12-27 17:30:24 +05:30
Anand Doshi
e7fc25d6a8 Fixes after permissions merge 2013-12-27 10:49:28 +05:30
Anand Doshi
8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
 2013-12-26 19:12:51 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30