Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,319 Commits 3 Branches 0 Tags 1 GiB
1c785a99b1
Commit Graph

2167 Commits

Author SHA1 Message Date
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
Rushabh Mehta
79a6fc9a84 [fix] recurring patch for purchase 2016-03-22 11:01:31 +05:30
Nabin Hait
2646f84a30 [patch] Fix delivery and billing status of recurring orders 2016-03-21 15:22:31 +05:30
Rushabh Mehta
7364f0cf1c [patch-fix] remove old patches for web-forms 2016-03-21 14:47:35 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +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
Nabin Hait
a61930e7a7 [fix] reload doctype forcefully to rename project field 2016-03-16 12:29:32 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Anand Doshi
f319206d22 [fix] [hot] reload doctype Holiday List 2016-03-11 19:45:28 +05:30
Anand Doshi
4284fcf2a6 [fix] additional fixes for removal of Fiscal Year form Holiday List 2016-03-11 17:16:30 +05:30
shreyas
6f8dfa4c8d [Minor] Fix print settings for custom print format 2016-03-07 18:22:40 +05:30
Rushabh Mehta
69cfab8559 [fix] [patch] recurring 2016-03-03 10:37:45 +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
Nabin Hait
737849a0f5 [patch] Update stopped status to close 2016-02-25 15:16:02 +05:30
Neil Trini Lasrado
f79760ce2d Mumtiple fixes 2016-02-23 18:35:45 +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
Anand Doshi
9c24bec654 Merge branch 'nabinhait-mc_fix_5' into develop 2016-01-29 12:16:35 +05:30
Nabin Hait
ee8f88d641 [patch] Set party account currency in existing orders 2016-01-27 16:01:31 +05:30
Anand Doshi
01de945388 [cleanup] Removed 'Is Service Item' checkbox and filters 
'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.
 2016-01-26 16:22:51 +05:30
Nabin Hait
e6b52bbb43 Update create_manufacturer_records.py 2016-01-21 00:30:39 +05:30
Nabin Hait
a613ea8abf [patch] Create manufacturer records 2016-01-20 18:32:37 +05:30
Anand Doshi
4096603656 [fix] add index on so_detail in Delivery Note Item 2016-01-07 17:10:09 +05:30
Anand Doshi
ed72a28e41 [minor] patch for billed in DN and PR 2016-01-06 18:53:12 +05:30
Anand Doshi
6b71ef5843 [refactor] changed set_modified, change_modified to update_modified like in the framework 2016-01-06 16:32:06 +05:30
Nabin Hait
1eea26fc5c [patch] Update billing status in Delivery Note and Purchase Receipt 2016-01-06 15:42:44 +05:30
Nabin Hait
8444febbda [patch] Repost entries with wrongly selected target warehouse 2015-12-15 15:55:06 +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
5d39a9594d [fix] Reload SO Item in patch 2015-12-09 17:06:09 +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
f7911687a0 [minor] fixes to patch 2015-12-03 08:09:42 +05:30
Nabin Hait
621f4cd7c9 [fix] Invoicing against drop-ship Purchase Order 2015-11-30 18:40:28 +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
8c56adf42b [hotfix] drop ship patch 2015-11-20 00:41:28 +05:30
Nabin Hait
06df19b56a Reload PO Item before patch 2015-11-19 12:46:37 +05:30
Saurabh
2e292060c5 [fix] Reserved and ordered qty fix for drop ship orders 2015-11-18 17:39:26 +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
Anand Doshi
438c4fb279 [patch] reload doctype Leave Allocation 2015-11-07 15:38:29 +05:30
Rushabh Mehta
c14f80838b [fix] [hot] leave allocation patch 2015-11-06 10:49:16 +05:30
Rushabh Mehta
e54a4004ec Merge pull request #4258 from anandpdoshi/fixes-3to6 
[fix] issues encountered migrating from v3/4 to 6
 2015-11-02 15:20:25 +05:30
Anand Doshi
aba8fdd18d [fix] issues encountered migrating from v3/4 to 6 2015-10-31 22:49:42 +05:30
Saurabh
a2c668cb77 [fixes] patch, test cases and validations 2015-10-29 14:27:57 +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
Anand Doshi
d905204e49 [fix] Update expense account in old purchase invoices if missing 2015-10-22 18:49:08 +05:30
Anand Doshi
d8bc40d7f0 [fix] party gle currency validation 2015-10-22 17:55:22 +05:30
Nabin Hait
70b7f7f036 minor improvement in patch 2015-10-21 17:40:06 +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
25ef4ff373 [fix] variant selector display 2015-10-20 18:34:21 +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
Anand Doshi
7a869b0dca [hotfix] print in patch 2015-10-19 17:33:40 +05:30
Rushabh Mehta
2a1ba886f1 [patch-fix] 2015-10-15 16:56:53 +05:30
Rushabh Mehta
fb73151da6 [fixes] 2015-10-14 16:22:01 +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
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
b20baf894f [fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account 2015-09-30 15:11:12 +05:30
Anand Doshi
d970b001a4 [fix] Round status update percentages to 2 decimals 2015-09-28 16:52:22 +05:30
Anand Doshi
aea250bc5a [fix] [patch] fix missing default lead 2015-09-24 16:31:36 +05:30
Anand Doshi
d37d4dfdec [fix] applicable territory patch and tax rule tests 2015-09-24 15:44:39 +05:30
Anand Doshi
e75d947867 [fix] [patch] convert applicable territory 2015-09-24 15:22:12 +05:30
Anand Doshi
953e97536a [fix] [patch] tax rule 2015-09-24 15:05:06 +05:30
Anand Doshi
e74d7ca33e [fix] [patch] tax rule 2015-09-24 15:04:15 +05:30
Anand Doshi
b3f12c3109 [fix] [patch] convert_applicable_territory 2015-09-24 15:01:27 +05:30
Anand Doshi
f66e6aacd4 [fix] [patch] convert_applicable_territory 2015-09-24 14:59:26 +05:30
Anand Doshi
c020e42d20 [fix] [patch] convert applicable territory 2015-09-24 13:08:35 +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
0a1d037f01 Merge pull request #3974 from rmehta/dms 
[enhancement] document management system
 2015-09-22 14:51:01 +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
Anand Doshi
cba5a684cb [hotfix] multicurrency patch 2015-09-17 17:36:05 +05:30
Anand Doshi
340709b2da [hotfix] multicurrency patch 2015-09-17 17:28:39 +05:30
Nabin Hait
9ff52cd57e [fix] Multi currency patch 2015-09-17 17:07:26 +05:30
Rushabh Mehta
e3401182c8 Merge pull request #4012 from saurabh6790/cart 
Taxation for Shopping Cart based on Tax Rule template
 2015-09-17 16:26:35 +05:30
Anand Doshi
c19afa140d [fix] reload time log in update projects patch 2015-09-16 12:44:22 +05:30
Neil Trini Lasrado
1a2d121073 Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier 2015-09-15 15:41:00 +05:30
Anand Doshi
b74265c842 [minor] [patch] reload activity cost in default_activity_rate 2015-09-15 11:27:19 +05:30
Nabin Hait
f76d63b92a Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 
[fix][patch] delete item variant attributes if no variants exists against that item
 2015-09-10 19:26:02 +05:30
Anand Doshi
793b87948c [fix] [patch] item template attributes 2015-09-10 18:10:15 +05:30
Nabin Hait
2377cdfa4e Fixed conflict 2015-09-09 18:45:41 +05:30
Nabin Hait
e3ae05aabd Multi-currency: Exchange Rate in Journal Entry 2015-09-09 18:43:12 +05:30
Anand Doshi
b1454cdf9f [fix] fix planned qty 2015-09-09 18:00:09 +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
Anand Doshi
43888546f6 Merge pull request #3968 from rmehta/task-not-mandatory 
[minor] task not mandatory for Time Log and Expense Claim #3904
 2015-09-08 15:47:11 +05:30
Nabin Hait
3607737b5e Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency 2015-09-07 10:41:01 +05:30
Anand Doshi
28f8664b93 [fix] [patch] reload item attribute + value 2015-09-04 16:41:27 +05:30
Rushabh Mehta
4223d7c044 [minor] task not mandatory for Time Log and Expense Claim #3904 2015-09-04 16:18:17 +05:30
Nabin Hait
34fe81f7eb Patch fixed 2015-09-03 19:18:00 +05:30
Nabin Hait
98096771c2 [multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that 2015-09-03 10:28:08 +05:30
Rushabh Mehta
deb38f7a68 [enhancement] document management system 2015-09-02 18:34:24 +05:30
Nabin Hait
76bb927337 Fixed conflict 2015-08-31 17:28:05 +05:30
Nabin Hait
c68f68d6cc [fix] Patch fixed for account_currency field rename 2015-08-28 19:26:28 +05:30
Nabin Hait
6e439a5e53 Multi currency: test case and fixes 2015-08-28 19:24:22 +05:30
Anand Doshi
f370b0c6a4 [fix] print hide additional discount, reload doctypes in sales return patch 2015-08-27 16:03:29 +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
cd2d8a0410 [merge] re-applied changes to sales invoice & delivery note 2015-08-27 11:05:26 +05:30
Rushabh Mehta
5bec301929 Merge branch 'layout-cleanup' into develop 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
	erpnext/stock/doctype/delivery_note/delivery_note.json
 2015-08-27 11:01:39 +05:30
Rushabh Mehta
17679c6902 [layout cleanup] purchase, stock, journal entry 2015-08-26 22:20:38 +05:30
Rushabh Mehta
f7800c053b [layout cleanup] in Quotation, Sales Order, Delivery Note 2015-08-26 18:53:37 +05:30
Anand Doshi
cb2f9a863d [hotfix] reload Sales and Purchase Order Item 2015-08-26 17:42:40 +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
3f321ebfde utilities/repost_stock file renamed to stock/stock_balance 2015-08-25 14:11:13 +05:30
Nabin Hait
047ecd1eb9 Update order reference in return entries and repost reserved / ordered qty 2015-08-25 14:11:13 +05:30
Nabin Hait
b69eb84936 [fix] Stock Entry additional costs patch fix for v4 accounts 2015-08-24 16:55:10 +05:30
Nabin Hait
69c1401764 Multi currency patch initialized 2015-08-21 14:31:47 +05:30
Anand Doshi
8554cbf001 [minor] fixed patch item template attributes 2015-08-20 17:43:35 +05:30
Nabin Hait
24998a6ca7 [fix][patch] Delete Bin for non-stock item 2015-08-20 15:21:42 +05:30
Nabin Hait
712fccd876 [fix][patch] Repost reserved qty for stock item 2015-08-20 14:59:44 +05:30
Anand Doshi
807c6af571 [minor] fix item template attributes 2015-08-20 11:42:05 +05:30
Nabin Hait
3922823bd6 [fix] Test case fixed for purchase cost against project 2015-08-19 14:23:13 +05:30
Nabin Hait
6ce72c5b07 [fix] Update project cost for draft project only 2015-08-19 14:15:28 +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
2f01f96ae3 [fix] [patch] item template attributes 2015-08-18 17:52:50 +05:30
Anand Doshi
afbe39a559 [fix] patch and rename Variant Attribute to Item Variant Attribute 2015-08-18 17:30:44 +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
3278ea177d [fix] Additional Costs patch fixed for version 4 to 5 migration 2015-08-17 17:58:52 +05:30
Anand Doshi
5dc7ff1355 [hotfix] [patch] cleanup journal entry 2015-08-17 17:58:51 +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
Anand Doshi
0a37f5575f [hotfix] [patch] stock entry additional cost for docstatus < 2 2015-08-13 15:53:40 +05:30
Anand Doshi
746eae4d1a [minor] Reload Journal Entry Account 2015-08-13 12:52:13 +05:30
Rushabh Mehta
7e4b93f48e [patch] cleanup_journal_entry 2015-08-13 12:10:21 +05:30
Rushabh Mehta
b01cc1b449 [patch] cleanup_journal_entry 2015-08-13 11:54:04 +05:30
Rushabh Mehta
f738b951c5 [patch] cleanup_journal_entry 2015-08-13 11:50:51 +05:30
Rushabh Mehta
207b3efed7 [fix] journal entry get_query 2015-08-12 15:18:35 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +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
Nabin Hait
845bbe3e27 Update fix_invoice_outstanding.py 2015-08-04 10:48:05 +05:30
Nabin Hait
f7bf50d6fe Merge pull request #3786 from nabinhait/fix4 
[fix] Ignore if error coming while sending emails to system managers
 2015-08-03 19:27:04 +05:30
Nabin Hait
374559bfad [fix] Ignore if error coming while sending emails to system managers 2015-08-03 19:26:32 +05:30
Nabin Hait
5bbe823106 [patch] Fix outstanding amount for original invoice for return entry 2015-08-03 19:19:11 +05:30
Nabin Hait
03bccb81d8 [test case] Test case for discount amount on net total 2015-08-03 19:11:44 +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
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
14a394cde1 Update fields_to_be_renamed.py 2015-07-17 15:14:19 +05:30
Nabin Hait
3c821c89f2 Update rename_table_fieldnames.py 2015-07-17 15:13:29 +05:30
Nabin Hait
a041297861 Update rename_total_fields.py 2015-07-17 15:12:52 +05:30
Nabin Hait
1401e3f679 Update rename_total_fields.py 2015-07-17 14:43:19 +05:30
Nabin Hait
dae29bf2d4 Update fields_to_be_renamed.py 2015-07-17 14:42:46 +05:30
Nabin Hait
0a3be6da27 Update rename_table_fieldnames.py 2015-07-17 14:39:41 +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
Rushabh Mehta
f3791797d6 [fix] [patch] 2015-07-16 14:17:59 +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
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
5cbe3441e8 Reload doctype in patch 2015-07-09 18:42:15 +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
Nabin Hait
d7441ec051 [fix][patch] delete item variant attributes if no variants exists against that item 2015-07-03 19:20:27 +05:30
Nabin Hait
5906f02e3a update item image in invoice if item exists 2015-07-02 17:51:35 +05:30
Nabin Hait
34058ded0e [fix] Update item image in sales invoice 2015-07-02 16:31:55 +05:30
Rushabh Mehta
2cd02af80a [fix] patch date 2015-07-02 14:25:51 +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
0988440fd9 Fixes for Manage Variants 2015-07-01 13:17:15 +05:30
Neil Trini Lasrado
724fd82419 Fixes in Manage Variants 2015-07-01 12:51:40 +05:30
Neil Trini Lasrado
3f2604eff6 Patch for Item Variants 2015-07-01 12:51:40 +05:30
Nabin Hait
9d0dd5066a Removed 'Root Type' validation for receivable/payable account in sales/purchase invoice 2015-06-22 07:32:46 +05:30
Nabin Hait
59f063e5c3 [fix] opening balance in general ledger report 2015-06-18 10:33:20 +05:30
Nabin Hait
9c852108d0 Added index in sales/purchase invoice and fix in index patch 2015-06-16 16:48:47 +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
0b18a2d347 Reset values in tools like Payment Tool 2015-06-05 12:01:29 +05:30
Nabin Hait
2c214e0362 [fix][patch] force reload web-form-field in portal fixes patch 2015-06-03 17:42:12 +05:30
Anand Doshi
64aa6620be [hotfix] portal fixes patch 2015-06-02 11:53:17 -04:00
Rushabh Mehta
2aa577f110 [hot] patch-fix 2015-06-02 11:12:25 +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
a3e9dbbcc3 Merge pull request #3374 from nabinhait/develop 
Make gl entry for rounded-off amount
 2015-05-29 14:20:20 +05:30
Rushabh Mehta
b0b446e899 [fix] cleanup tables from description and re-sync print format 2015-05-29 12:44:33 +05:30
Nabin Hait
98c515fe7d replace 'entries' by 'items' in custom print formats and scripts 2015-05-29 10:39:09 +05:30
Nabin Hait
54a10cd2af patch fix 2015-05-27 16:14:10 +05:30
Nabin Hait
5b731ff73a Fix _idx property as per renamed fields 2015-05-27 13:02:59 +05:30
Nabin Hait
d4c8dc2915 multiple minor fixes 2015-05-26 16:32:30 +05:30
Nabin Hait
093beecd0a minor fix 2015-05-26 12:15:39 +05:30
Rushabh Mehta
822fd7747a [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Nabin Hait
4888a5dc0d [patch][fix] party model - create debtors and creditors only if parent account exists 2015-05-21 16:51:37 +05:30
Nabin Hait
9895aba42e update operation description patch 2015-05-21 14:43:24 +05:30
Rushabh Mehta
a27cca97b5 [rename] POS Setting > POS Profile #3271 2015-05-20 15:43:17 +05:30
Nabin Hait
521aa2e94a Update party_model.py 2015-05-20 14:39:39 +05:30
Nabin Hait
a2d8585b07 party model patch fix 2015-05-20 14:32:54 +05:30
Pratik Vyas
129a0a4cae Fix merge mistakes 2015-05-19 13:12:00 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Nabin Hait
fcda5b636c patch fix 2015-05-19 11:12:06 +05:30
Nabin Hait
b893972486 update tax amount after discount amount in purchase cycle 2015-05-15 15:16:30 +05:30
Nabin Hait
53ba64b653 fix update_projects patch 2015-05-15 15:16:30 +05:30
Nabin Hait
96c4252762 reload account in patch 2015-05-13 14:55:12 +05:30
Nabin Hait
6c0c5702c5 patch fix : replace fields in print formats and custom scripts 2015-05-12 16:49:40 +05:30
Nabin Hait
23d6eb7e5c patch fixed for making email acocounts 2015-05-12 15:02:33 +05:30
Nabin Hait
8ba849184f Fix taxes and totals in party currency 2015-05-12 12:50:43 +05:30
Nabin Hait
8719c1a6b8 Fix taxes and totals in party currency 2015-05-12 12:28:26 +05:30
Pratik Vyas
3d77de9cf9 [fix] rename table fieldnamess patch 2015-05-11 16:08:14 +05:30
Nabin Hait
fedcb242ef Rename table fieldnames only if doctype exists 2015-05-11 15:11:17 +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
Neil Trini Lasrado
e64d453d09 patch added 2015-05-07 17:31:59 +05:30
Nabin Hait
c62c64c38b patch fixed for taxes and charges template 2015-05-07 16:58:28 +05:30
Nabin Hait
28b18222c0 capacity planning patch fixed 2015-05-07 16:29: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
40557750d5 party model patch fix 2015-05-05 16:00:21 +05:30
Nabin Hait
cf22fdbc85 party model patch fix 2015-05-05 14:22:10 +05:30
Nabin Hait
7104cf613f party model patch fix 2015-05-04 19:21:36 +05:30
Nabin Hait
72f71836d7 Party model patch fix 2015-05-04 13:01:44 +05:30
Nabin Hait
874ead2ed9 Update warehouse as per master_name if master_name exists 2015-05-04 08:53:57 +05:30
Nabin Hait
d51b09282a link warehouse with account 2015-05-01 20:31:11 +05:30
Nabin Hait
f25822cd8d fix in patches 2015-05-01 15:50:52 +05:30
Nabin Hait
816cb8c141 Migrate customized precision for newly created total fields 2015-05-01 11:10:37 +05:30
Nabin Hait
aa03a8e3a2 Migrate customized precision for newly created total fields 2015-04-30 16:13:47 +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
Nabin Hait
52cf6e947c patch fix 2015-04-24 16:07:32 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Neil Trini Lasrado
086c0463be Fixes in Patch 2015-04-22 11:26:00 +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
Nabin Hait
0287b1f75c hotfix in patch 2015-04-17 16:15:25 +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
Pratik Vyas
850ee3c53d Fix make_email_account patch 2015-04-15 14:36:32 +05:30
Rushabh Mehta
39539f14ce [patch-fix] make_email_accounts 2015-04-14 13:07:28 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Anand Doshi
432c12ad93 [fix] email account patch fix and minor setup wizard fix 2015-04-03 14:30:15 +05:30
Rushabh Mehta
8bd54f27c5 Merge pull request #3051 from rmehta/opportunity 
Opportunity
 2015-04-03 11:01:59 +05:30
Rushabh Mehta
7c32770a69 move opportunity item to CRM 2015-04-02 22:06:36 +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
Anand Doshi
fc79492bac Lead Status in List, minor fix in Make Email Accounts patch 2015-03-30 22:35:51 +05:30
Pratik Vyas
4ec1a9e8f6 Move frappe field renames to frappe 2015-03-30 19:37:02 +05:30
Nabin Hait
f977ad036e reload block module 2015-03-27 10:49:41 +05:30
Nabin Hait
d25fda7537 patch fixes 2015-03-25 15:55:09 +05:30
Nabin Hait
06b0b36ae6 Patch fixes 2015-03-25 14:51:35 +05:30
Anand Doshi
d3a32bc9e5 [minor] fixed newsletter patch 2015-03-25 14:51:11 +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
Nabin Hait
03f7a8e44a minor fix in newsletter patch 2015-03-24 11:58:21 +05:30
Nabin Hait
e9d83303d3 create manufacturing activity type via patch only if setup completed 2015-03-23 17:05:32 +05:30
Rushabh Mehta
c2eae25d0e [cleanup] validate_email_add 2015-03-23 14:10:51 +05:30
Rushabh Mehta
aca5c7b580 [test] newsletter list 2015-03-20 16:06:34 +05:30
Rushabh Mehta
acdd5189d1 [test-fix] 2015-03-20 15:52:11 +05:30
Rushabh Mehta
288a833422 [test-fix] 2015-03-20 15:37:31 +05:30
Rushabh Mehta
8f343165ad [patch-fix] convert_stock_reco 2015-03-20 15:04:13 +05:30
Rushabh Mehta
a7e21eb484 [newsletter-list] fixes, patch fix 2015-03-20 14:38:12 +05:30
Nabin Hait
c1199c0d27 minor fix in patch 2015-03-20 10:29:30 +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
Neil Trini Lasrado
14543169b4 patch rename 2015-03-13 11:43:52 +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
0c677aa151 fix #2847 2015-03-04 12:32:59 +05:30
Rushabh Mehta
2cc585f180 [git fixes] salary manager, time log title, notificaitons 2015-03-03 16:06:54 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +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
Anand Doshi
8f9e631a44 minor fixes 2015-02-26 20:29:43 +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
8f62e2448c [fix] patches 2015-02-25 16:28:33 +05:30
Rushabh Mehta
6cdfd1e976 [fix] patches 2015-02-25 15:55: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
d5616cd977 reload journal entry on patch 2015-02-24 13:12:13 +05:30
Nabin Hait
b923f8a78b project milestone patch fix 2015-02-24 13:05:49 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Nabin Hait
6dfbc2465b Patch: taxes and totals in party currency 2015-02-24 10:04:00 +05:30
Nabin Hait
2b019ed430 Fixes for discount amount 2015-02-24 10:02:27 +05:30
Rushabh Mehta
a1da88a3d3 [capacity planning] automatically plan Time Logs from Production Order 2015-02-23 20:18:38 +05:30
Rushabh Mehta
281dc5d639 [patch] added item patch 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
bcccfa09f2 [patch] [fix] 2015-02-20 15:28:50 +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
ae3f4f363f patch renamed 2015-02-18 20:48:26 +05:30
Neil Trini Lasrado
e9d45bcb28 patch fixes 2015-02-18 20:25:44 +05:30
Rushabh Mehta
614e7ab757 [cleanup] SMS, and added item filter in stock balance 2015-02-18 19:51:48 +05:30
Nabin Hait
8626d3881d fixed renaming patch 2015-02-18 15:10:29 +05:30
Neil Trini Lasrado
42e42b7647 fixes in patch 2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d98c4e007b patch 2015-02-18 12:33:53 +05:30
Neil Trini Lasrado
d8b35639d8 image feild made hidden 2015-02-18 12:33:53 +05:30
Nabin Hait
fe81da2dd1 listview indicator fix 2015-02-18 12:23:18 +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
Nabin Hait
6f0a3ed8d4 fixed conflict 2015-02-17 11:12:04 +05:30
Rushabh Mehta
46e03eadca [rename] Customer Issue -> Warranty Claim 2015-02-17 10:45:50 +05:30
Nabin Hait
031303d719 Replace renamed fields in custom script and custom print formats 2015-02-12 11:48:50 +05:30
Nabin Hait
56e6ad2112 Patch for renamed total fields 2015-02-12 11:48:20 +05:30
Nabin Hait
8fa503e177 Fixed conflict while merging v4 into v5 2015-02-10 16:44:00 +05:30
Nabin Hait
15cd12214e Fixed conflict while merging v4 into v5 2015-02-10 16:37:18 +05:30
Anand Doshi
6dfd430a2f Moved flags like ignore_mandatory, ignore_validate etc to doc.flags 2015-02-10 14:41:27 +05:30
Anand Doshi
dd942bb3d2 [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists 2015-02-04 18:53:24 +05:30
Rushabh Mehta
b736443e3f [patch] [fix] 2015-02-04 10:40:02 +05:30
Neil Trini Lasrado
7dac750ffe patch fix 2015-02-03 10:59:40 +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
81b98261ae patch fix 2015-01-27 11:28:56 +05:30
Neil Trini Lasrado
40a9f6f8e9 patch fix 2015-01-23 15:32:35 +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
Anand Doshi
938ed1a57d [minor] fixed patch update_companywise_payment_account 2015-01-19 16:20:26 +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
f2b1f2658d patch fix 2015-01-14 12:06:20 +05:30
Neil Trini Lasrado
bd2ac2f51f mode of payment - company wise default account added 2015-01-14 12:00:17 +05:30
Nabin Hait
f34c96bf7a minor fix 2015-01-14 11:49:04 +05:30
Nabin Hait
2244ac4d52 Discount amount in party currency 2015-01-12 17:35:37 +05:30
Nabin Hait
e8500ad4e6 Multiple fixes 2015-01-10 16:05:17 +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
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
79f091e2fe field renaming 2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19 renaming: entries 2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017 Code replacement for journal voucher renaming 2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f Table Field Renaming: code replace, JV and budget distribution renamed 2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71 Table fieldnames renaming: updated json and patch 2014-12-24 17:04:48 +05:30
Nabin Hait
2eed5a35e3 fixed capacilty planning patch 2014-12-24 10:41:55 +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
Pratik Vyas
0a726e2335 add reload doc to patch 2014-12-18 12:41:09 +05:30
Pratik Vyas
387e1e21cb add reload_doc in a few patches 2014-12-18 11:36:23 +05:30
Neil Trini Lasrado
1d66b71464 patch fix 2014-12-12 14:48:30 +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
Nabin Hait
4b83403a63 Fixed bom patch 2014-12-12 11:28:58 +05:30
Neil Trini Lasrado
6ddc487fb6 patch fix 2014-12-11 17:33:41 +05:30
Neil Trini Lasrado
3a34cadcb2 Fix - Total Fixed Cost with patch 2014-12-11 17:15:12 +05:30
Rushabh Mehta
9f32a50379 [merge] fix 2014-12-03 12:35:19 +05:30
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Nabin Hait
1caa1a3708 Fixed party model patch 2014-11-28 11:26:35 +05:30
Nabin Hait
249bbbc56f fixes during testing version 5 2014-11-26 15:35:39 +05:30
Pratik Vyas
85a354f2fb fix Mailbox migration patch 2014-11-20 11:41:30 +05:30
Nabin Hait
a6a70a5f35 Make email account patch 2014-11-12 17:00:42 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
5086ef2499 Update update_requested_and_ordered_qty.py 2014-11-05 12:33:29 +05:30
Nabin Hait
9114c26857 Patch to recalculate requested qty and ordered qty for all items 2014-11-04 15:34:03 +05:30
Nabin Hait
98050e7646 default receivable / payable accounts in company 2014-11-03 15:46:15 +05:30
Nabin Hait
aed3fc48ba Add default party accounts in customer/supplier 2014-11-03 15:46:15 +05:30
Rushabh Mehta
3daa49ac1f [shopping-cart] i'm back 2014-10-21 16:16:30 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
2348a5f592 repost stock utility 2014-10-15 15:31:33 +05:30
Nabin Hait
b2f32dac1b Minor fix 2014-10-15 14:42:18 +05:30
Nabin Hait
f1a07ff105 Allow zero rate while reposting 2014-10-15 12:23:35 +05:30
Neil Trini Lasrado
c40451ee2e Patch Fixed 2014-10-14 12:14:39 +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
ankitjavalkarwork
e69a611991 [#2164] New field names in DN, fix field name refs, Patch added 2014-10-09 17:31:46 +05:30
Pratik Vyas
e435592d64 [minor] Fix default website style patch (reload doc) 2014-10-09 11:22:12 +05:30
Nabin Hait
bd1c8aff8e Deleted customer/supplier account head report 2014-10-06 13:14:02 +05:30
Nabin Hait
8f44f03cba Party model patch 
- Create receivable / payable account, set them in company
	- Set party in JV and GL Entry
	- Delete all exisintg individual party account
 2014-10-06 13:13:27 +05:30
Nabin Hait
be8ec39678 Deleted master_type, master_name, credit_days, credit_limit fields from account 
Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail
 2014-10-06 13:02:40 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
Neil Trini Lasrado
3a19a71262 patch fixed 2014-09-30 14:48:38 +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
Nabin Hait
82d7c0c9eb Patch: Fix gl entries for stock transactions 2014-09-29 15:07:51 +05:30
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
ed37cef32a [refactor modules] 2014-09-16 15:08:02 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
Nabin Hait
3f4885e342 repost stock reconciliation 2014-09-02 20:02:24 +05:30
ankitjavalkarwork
aaac7c17b8 Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document 2014-09-01 16:22:56 +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
Pratik Vyas
3de7757ba4 Update update_project_milestones.py 2014-08-08 14:49:53 +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
d91cefb23d Update fix_account_master_type.py 2014-08-07 19:22:02 +05:30
Nabin Hait
05b56d0d08 Fix account's master type 2014-08-07 15:03:41 +05:30
Pratik Vyas
b91079676d [patch] remove reloading of removed print formats 2014-07-31 14:31:58 +05:30
Anand Doshi
bc708ee4c2 [print] Disable rounded total 2014-07-29 22:24:31 +05:30
Anand Doshi
bd748bd115 [hotfix] [patch] Delete old print formats 2014-07-29 08:51:41 +05:30
Rushabh Mehta
781ddc3a25 added patch to remove old print formats 2014-07-25 13:02:28 +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
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
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
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
02cb347ac7 Fix comments after naming series records rename 2014-06-30 17:05:51 +05:30
Anand Doshi
5ba7ab0fed Outgoing Mail Footer patch 2014-06-27 21:00:51 +05:30
Anand Doshi
a1be6021c4 Fix in pricing rule patch 2014-06-24 15:26:40 +05:30
Anand Doshi
83da92fdcc Naming Series Property Setter Patch 2014-06-23 18:04:07 +05:30
Nabin Hait
1d37698d4c Reload pricing rule in patch 2014-06-20 16:30:44 +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
e35841a2ea Reload Shopping Cart Settings in create price list patch 2014-06-16 12:59:54 +05:30
Anand Doshi
3474c273a5 Ignore mandatory in employee patch 2014-06-16 12:14:21 +05:30
Anand Doshi
3dc722b096 Create price list only if setup complete 2014-06-13 15:30:38 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Anand Doshi
27e295a4cb Merge pull request #1789 from nabinhait/v4-hotfix 
V4 hotfix
 2014-06-12 15:39:58 +05:30
Anand Doshi
3761ff3522 Fix in patch: split email settings 2014-06-12 15:00:52 +05:30
Nabin Hait
e7f2d3179d update other_charges in custom print formats 2014-06-12 14:58:09 +05:30
Anand Doshi
82029be6f9 Reload sales taxes and charges in patch 2014-06-10 14:52:49 +05:30
Nabin Hait
6febfca5a6 changed insert after for india related custom fields 2014-06-10 11:21:38 +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
af63d053b1 Also save Global Defaults in System Settings patch 2014-06-09 15:51:12 +05:30
Anand Doshi
be3f914acd Fixed add address template 2014-06-09 15:18:45 +05:30
Anand Doshi
390efdc884 Fix in HR patch 2014-06-09 15:04:00 +05:30
Nabin Hait
b63e99eb43 Update tax amount after discount in existing documents 2014-06-09 12:49:09 +05:30
Anand Doshi
6f561aa846 Fixed HR patch 2014-06-06 22:10:18 +05:30
Anand Doshi
0aa125304d Fixed Reset Permissions patch 2014-06-06 20:39:21 +05:30
Anand Doshi
cd0aed993a Fixed Address Template Patch 2014-06-06 17:37:31 +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
Anand Doshi
ede8ea52b0 Fixes 2014-06-05 18:06:20 +05:30
Anand Doshi
4022586015 Update new_address_template.py 2014-06-05 17:34:59 +05:30
Rushabh Mehta
eaa2e55d20 patch for address template fixes #1749 2014-06-05 16:16:13 +05:30
Anand Doshi
38dedf402b Fixes in patches for migration 2014-06-04 17:48:56 +05:30
Anand Doshi
cdc1b640d9 Fixes in user permissions patches 2014-06-04 17:48: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
Pratik Vyas
76e48b5c3f hotfix: update_account_root_type.py patch 2014-05-28 15:22:34 +05:30
Anand Doshi
c57d7dea8b Fixed global_defaults_to_system_settings 2014-05-22 11:05:46 +05:30
Nabin Hait
d811303d7b minor fix 2014-05-21 12:36:43 +05:30
Nabin Hait
27b12ef1b6 update account root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
dec02340e8 reload account doc in root type patch 2014-05-21 11:53:59 +05:30
Nabin Hait
3f80ef0648 reload account doc in root type patch 2014-05-21 11:53:59 +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
a220e5d850 Update global_defaults_to_system_settings.py 2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9 Update global_defaults_to_system_settings.py 2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc Update global_defaults_to_system_settings.py 2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac Update global_defaults_to_system_settings.py 2014-05-15 18:18:32 +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
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Pratik Vyas
6e686224eb fix patches 2014-05-10 22:17:04 +05:30
Pratik Vyas
95f558e7bc fix update user properties patch 2014-05-10 22:16:39 +05:30
Pratik Vyas
34e36a233c Patch changes for 3 to 4 migration 2014-05-09 12:01:25 +05:30
Anand Doshi
4b7a6b13ec Additions to remove India specific fields 2014-05-06 16:41:31 +05:30
Anand Doshi
37909b292f Remove India specific fields 2014-05-06 16:15:56 +05:30
Anand Doshi
91b451b8ce Updated validate v3 patch 2014-05-05 18:25:37 +05:30
Nabin Hait
985918d42b Minor fixes in company and account 2014-04-28 17:08:28 +05:30
Nabin Hait
6298536e46 set stock balance as per serial no count 
Cherry Picked and Modified by @anandpdoshi

Conflicts:
	stock/doctype/stock_ledger/stock_ledger.py
	utilities/repost_stock.py
 2014-04-16 15:23:08 +05:30
Rushabh Mehta
a504f0638b frappe/frappe#478, fixed list passed in 2014-04-04 12:16:26 +05:30
Rushabh Mehta
558a9aabfb removed control panel 2014-04-04 12:00:36 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Rushabh Mehta
b385ecf65e frappe/frappe#478 2014-03-28 16:54:45 +05:30
Anand Doshi
f78d1aee28 Replaced doc, doc.fields frappe/frappe#478 2014-03-28 13:55:00 +05:30
Rushabh Mehta
e88bc8b12a frappe/frappe#478 2014-03-27 17:51:41 +05:30
Nabin Hait
2c517e0a62 Fixes related to countrywise coa 2014-03-25 18:28:49 +05:30
Nabin Hait
ec9fb67d84 fixed conflict 2014-03-25 16:53:50 +05:30
Anand Doshi
7fbdba02ab Fixed Countrywise Chart of Accounts patch 2014-03-25 13:50:52 +05:30
Nabin Hait
221a8fff1c minor fix in patch 2014-03-23 17:35:24 +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
47a3c10334 Patch to update old accounts property 2014-03-21 11:26:08 +05:30
Nabin Hait
037bf6b382 More country charts imported from openerp 2014-03-21 11:25:17 +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
Rushabh Mehta
7c932003ed rename Profile to User frappe/frappe#470 2014-03-11 16:15:59 +05:30
Anand Doshi
c379c78fec Fixed Dropbox, Scheduler, 3to4 migration 2014-03-11 15:17:13 +05:30
Anand Doshi
ebdac5db5c Fix in Pricing Rule Patch 2014-03-05 17:31:37 +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
f976143063 pricing rule patch fix 2014-02-28 19:02:27 +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
fb21ce3893 3to4 fixes 2014-02-27 13:18:20 +05:30
Anand Doshi
e9baaa68e7 Changed frappe.conn to frappe.db 2014-02-26 12:35:33 +05:30
Anand Doshi
901f4434fd Fixed Purchase Invoice test cases 2014-02-25 17:25:28 +05:30
Rushabh Mehta
a6628eee56 rename sitemap to route 2014-02-25 11:08:37 +05:30
Pratik Vyas
da0a23e635 remove print in patch, booboo 2014-02-17 14:56:00 +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
eba1bdbcca minor fixes 2014-02-12 16:04:17 +05:30
Nabin Hait
139dc7b9b2 minor fixes 2014-02-12 14:54:16 +05:30
Nabin Hait
5f59726903 Rename fields: replaced in html and txt files 2014-02-12 14:54:15 +05:30
Nabin Hait
777397489e Fields renamed in schema 2014-02-12 14:54:13 +05:30
Nabin Hait
436f526102 commonify get_item_details and rename fields to sync selling and purchase 2014-02-12 14:54:12 +05:30
Anand Doshi
7bb9c3f125 Nested Set Test using Test Item group 2014-02-06 17:51:18 +05:30
Nabin Hait
574c7e7c63 item related cleanup 2014-02-06 15:51:01 +05:30
Nabin Hait
dfae0ea570 minor fix in patch 2014-01-31 17:25:09 +05:30
Akhilesh Darjee
e0a1039756 merge conflict fixed 2014-01-30 14:44:35 +05:30
Akhilesh Darjee
4cdb79941b map charge to taxes and charges in transactions 2014-01-30 13:56:57 +05:30
Nabin Hait
fe8db590a1 Fixed conflict while merging with develop 2014-01-30 12:32:47 +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
Rushabh Mehta
1cd96a136f updates for restriction 2014-01-24 11:10:24 +05:30
Nabin Hait
5c6d13a0df Fixed conflict while merging with develop branch 2014-01-20 17:18:16 +05:30
Nabin Hait
dc15b4fa8a Fixed conflict while merging with develop brnach 2014-01-20 16:48:49 +05:30
Akhilesh Darjee
5dd92fd5d6 reload doc in maintenance schedule 2014-01-03 19:14:01 +05:30
Akhilesh Darjee
e27717261d merge conflict fixed 2014-01-03 18:18:31 +05:30
Akhilesh Darjee
5c96b75a68 fixed maintenance schedule 2014-01-02 17:54:12 +05:30
Anand Doshi
9a4a13cb73 Moved Portal and Shopping Cart to Shopping Cart app, and some minor fixes 2013-12-31 17:38:21 +05:30
Akhilesh Darjee
829eda47a8 Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into flat-discount 2013-12-30 12:31:07 +05:30
Anand Doshi
0663ec4a9c Merge fixes: removed patches, removed Warehouse User 2013-12-27 18:00:28 +05:30
Rushabh Mehta
61bf425935 deleted moves 2013-12-27 17:58:39 +05:30
Akhilesh Darjee
d203aea7c2 [flat discount] flat discount implemented on sales cycle 2013-12-27 17:49:57 +05:30
Rushabh Mehta
c4a0ed63ef Moved demo to separate app, moved patches folder 2013-12-27 17:30:24 +05:30
Rushabh Mehta
4ac68952e8 Moved patches and fixed method routing in pages 2013-12-27 13:43:40 +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
caa4380d49 Merge with 3.3.8 2013-12-26 11:07:58 +05:30
Rushabh Mehta
54047780fc Merge with 3.3.8 2013-12-26 11:07:46 +05:30
Rushabh Mehta
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-09-26 12:24:28 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Nabin Hait
de7fcc66df updated repost_stock patch 2012-09-24 15:53:01 +05:30
Nabin Hait
9ed7b8bb75 fixed conflict 2012-09-24 15:46:55 +05:30
Nabin Hait
6e6dd1b0d5 reload gross profit report 2012-09-24 15:45:02 +05:30
Anand Doshi
5f76ceb38e Delete permission for Event doctype to System Manager 2012-09-24 15:41:41 +05:30
Anand Doshi
9ef7bd8494 Delete permission for Event doctype to System Manager 2012-09-24 15:41:27 +05:30
Nabin Hait
e4e88c9715 repost_stock patch and gross profit report 2012-09-24 15:40:56 +05:30
Rushabh Mehta
09d84b6575 Stock Ageing & release of Analytics 2012-09-21 19:46:24 +05:30
Rushabh Mehta
f200c5296d added sales analytics 2012-09-21 15:19:40 +05:30
Anand Doshi
86096ff0b4 syntax error fix 2012-09-19 12:23:35 +05:30
Rushabh Mehta
823c021e9c added index patch and updated general_ledger 2012-09-19 12:01:01 +05:30
Anand Doshi
05f1d45600 removed unicode literals from patch list 2012-09-18 14:04:22 +05:30
Nabin Hait
9a90c89b3f removed duplicate function from sales invoice 2012-09-18 13:37:27 +05:30
Anand Doshi
8263419691 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:35:40 +05:30
Anand Doshi
6450b12881 fix in permissions of role 'All'. Fix in Credit Days and Credit Limit permissions in Customer form 2012-09-17 11:34:24 +05:30
Rushabh Mehta
c6369046a1 merge 2012-09-14 11:09:46 +05:30
Anand Doshi
99e5ac3452 multi sort for stock ledger search criteria 2012-09-13 15:24:19 +05:30
Anand Doshi
21e8447e6c Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-10 12:04:30 +05:30
Anand Doshi
20d82800f3 add delete permission to communication 2012-09-10 12:03:31 +05:30
Anand Doshi
88411eddb8 Merge branch 'unicode' of github.com:webnotes/erpnext into unicode 2012-09-10 11:32:17 +05:30
Anand Doshi
0dab087be1 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
 2012-09-10 11:31:18 +05:30
Anand Doshi
38ab4ae3ac add stock report permission for accounts manager 2012-09-10 11:23:51 +05:30
Rushabh Mehta
93af75a160 added unicode literals in patch 2012-09-07 10:57:14 +02:00
Nabin Hait
ea4e6b0f0c reload stock ledger report 2012-09-07 12:15:29 +05:30
Anand Doshi
f03e3bb06b Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-09-06 07:55:19 +05:30
Anand Doshi
518090f38e autocommit for repost stock due to wrong packing list patch 2012-09-05 13:26:53 +05:30
Anand Doshi
fa97e8c783 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/search_criteria/cash_flow_statement/__init__.py
	erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py
	public/js/all-app.js
 2012-08-31 12:09:02 +05:30
Nabin Hait
245f920772 removed cash flow statement 2012-08-31 11:01:21 +05:30
Anand Doshi
62a3881837 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-30 18:17:20 +05:30
Nabin Hait
26da576f1e patch list updated 2012-08-29 12:09:35 +05:30
Nabin Hait
9c043b2f51 Billed amount in SO and DN based on export amount and patch for it 2012-08-29 11:46:12 +05:30
Anand Doshi
d297b88f60 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/patches/patch_list.py
 2012-08-23 15:26:38 +05:30
Anand Doshi
6db2ac51e6 changed blog comments date format to global date format i.e. 1 January 2012 2012-08-23 15:24:21 +05:30
Nabin Hait
22aa31ead2 updated profile permission 2012-08-13 13:15:36 +05:30
Rushabh Mehta
0f0d8850d0 merged with master (project cleanup) 2012-08-08 14:28:24 +05:30
Rushabh Mehta
2937e7e842 task cleanup: moved allocated_to -> assigned_to, autoname is now task (istead of tic) 2012-08-08 12:54:47 +05:30
Anand Doshi
ebcb3c02d0 fixes in supplier quotations report patch 2012-08-07 15:24:46 +05:30
Anand Doshi
4e2feb2b28 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-07 15:14:07 +05:30
Anand Doshi
883285f503 fix in supplier quotations patch 2012-08-07 15:13:48 +05:30
Anand Doshi
e81c07ff4d appended unicode literals import after merge 2012-08-07 15:08:52 +05:30
Anand Doshi
16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/stock/doctype/item/item.txt
 2012-08-07 15:07:56 +05:30
Anand Doshi
e30d5f833e New Report: Supplier Quotations 2012-08-07 15:05:42 +05:30
Anand Doshi
a742d32c96 added unicode literals import to supplier quotation patch 2012-08-06 20:03:49 +05:30
Anand Doshi
0d0efcfd14 Merge branch 'master' of github.com:webnotes/erpnext into unicode 2012-08-06 19:56:03 +05:30
Anand Doshi
b8219aa4f0 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	public/js/all-app.js
	public/js/fields.js
 2012-08-06 19:55:43 +05:30
Anand Doshi
8ce2ac3f0e supplier quotation release patch 2012-08-06 19:53:31 +05:30
Nabin Hait
ed8049ec19 fixes in patch: considered over delivery in reserved qty calculation 2012-08-06 14:31:45 +05:30
Anand Doshi
e64d900322 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
 2012-08-06 13:23:16 +05:30
Anand Doshi
326f88cce6 fixed patch: repost stock due to wrong packing list 2012-08-03 19:19:23 +05:30
Anand Doshi
fea3b64dd0 fixed patch: repost stock due to wrong packing list 2012-08-03 19:14:42 +05:30
Anand Doshi
df902d1a0c patch: repost stock due to wrong packing list entries - optimized query using index and subqueries 2012-08-03 19:11:11 +05:30
Rushabh Mehta
49dc5da0dc refactor unicode changes and merge with master with refactored email 2012-08-03 16:02:24 +05:30
Nabin Hait
175771c699 Merge branch 'master' of github.com:webnotes/erpnext 2012-08-03 08:40:14 +05:30
Nabin Hait
8292691470 stock repost patch 2012-08-03 08:39:17 +05:30
Anand Doshi
a67a74fee1 supplier quotation, project shift patch 2012-08-02 18:53:00 +05:30
Nabin Hait
dd9d4bbdea repost stock patch due to wrong packing list 2012-08-02 10:56:40 +05:30
Anand Doshi
59d37c4bcb Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py
 2012-07-31 17:30:49 +05:30
Nabin Hait
8d97290c06 updated bin permission 2012-07-31 14:12:23 +05:30
Anand Doshi
396628e7ea Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
 2012-07-27 14:45:24 +05:30
Anand Doshi
b3a4c09e07 added guest read permission to blog 2012-07-27 14:39:27 +05:30
Anand Doshi
66f90687e9 import unicode_literals where missing 2012-07-27 14:29:29 +05:30
Rushabh Mehta
0fa628bf86 Merge branch 'master' of github.com:webnotes/erpnext into unicode 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
 2012-07-26 15:46:13 +02:00
Anand Doshi
9b8fca9d75 new patches for unicode release 2012-07-23 13:10:33 +05:30
Nabin Hait
e9a62d1236 reload trial balance report 2012-07-23 11:46:37 +05:30
Anand Doshi
dbe31be55c deprecated bulk rename tool 2012-07-20 18:11:41 +05:30
Anand Doshi
486f9dfcec added unicode_literals import at start of each file 2012-07-19 13:40:31 +05:30
Anand Doshi
5756630efb Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/stock/doctype/delivery_note/delivery_note.py
	public/js/all-app.js
 2012-07-18 20:31:37 +05:30
Nabin Hait
28115f3373 repost stock due to incorrect packing list 2012-07-18 18:29:05 +05:30
Nabin Hait
ddb9f948ee repost stock due to incorrect packing list 2012-07-18 18:12:34 +05:30
Anand Doshi
3a281ae6c3 Merge branch 'master' of github.com:webnotes/erpnext into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-07-17 13:21:55 +05:30
Anand Doshi
26ca2c8c77 fix in syntax of owner match patch 2012-07-17 13:08:46 +05:30
Anand Doshi
5d4aaaa8a7 patch to remove match condition of owner on event doctype 2012-07-17 13:06:34 +05:30
Rushabh Mehta
2d7cb22f1f added auth_table patch file: 2012-07-13 15:07:07 +05:30
Rushabh Mehta
91ba346354 profile cleanup start and new auth table for better security 2012-07-13 14:54:40 +05:30
Nabin Hait
0c9a262de4 fixed conflict 2012-07-13 10:39:45 +05:30
Nabin Hait
91223d325b fixed conflict 2012-07-13 10:35:44 +05:30
Anand Doshi
158e7751a8 Merge branch 'master' into dev 2012-07-13 08:53:17 +05:30
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
 2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Anand Doshi
1522f5d76b Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-11 14:27:22 +05:30
Rushabh Mehta
e57267f79a added patch for account and cleanups to breadcrumbs and msgprint 2012-07-11 13:18:58 +05:30
Anand Doshi
40fce89631 Favicon for website 
Started work on comments to be embedded in blog page
 2012-07-09 20:02:52 +05:30
Anand Doshi
e47def842d Improvements in product page and its listing 
Login page rendered via a template
 2012-07-09 15:56:12 +05:30
Anand Doshi
ac475c61dc Merge branch 'master' of github.com:webnotes/erpnext 2012-07-04 11:26:01 +05:30
Anand Doshi
1731786a61 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-03 15:51:11 +05:30
Nabin Hait
b0e15d6ec5 Update master 2012-07-03 15:30:52 +05:30
Anand Doshi
af539fa5bd deprecate import data control 2012-07-03 14:45:03 +05:30
Nabin Hait
fdb1993125 fixed conflict 2012-07-03 12:14:48 +05:30
Anand Doshi
851b9c0aad address contact permissions 2012-07-02 20:25:26 +05:30
Nabin Hait
9b1e9aceaf packing list cleanup and serial no status update 2012-07-02 16:42:46 +05:30
Nabin Hait
52fd9de425 packing list cleanup and serial no status update 2012-07-02 16:41:11 +05:30
Anand Doshi
8c7cd2c407 Merge branch 'master' of github.com:webnotes/erpnext into dev 2012-07-02 14:44:05 +05:30
Nabin Hait
6751261589 reload pr-po mapper patch' 2012-07-02 11:24:37 +05:30
Anand Doshi
b38546489d Merge branch 'master' into dev 2012-06-28 20:49:31 +05:30
Anand Doshi
bfd9258326 fix in cacheitem table 2012-06-28 20:46:46 +05:30
Anand Doshi
10bcf5ea25 blog listing + started with products page and listing 2012-06-26 18:54:10 +05:30
Anand Doshi
401f12418f Merge branch 'master' into dev 
Conflicts:
	erpnext/patches/patch_list.py
 2012-06-26 12:20:29 +05:30
Anand Doshi
0b06004986 delete unwanted doctypes of website settings 2012-06-26 12:18:41 +05:30
Anand Doshi
68196bc966 delete records in child table where parent is missing or parent is like 
old_par%
 2012-06-26 12:15:21 +05:30
Nabin Hait
c6fc345f35 alter tabsessions to change user column definition 2012-06-25 15:30:59 +05:30
Nabin Hait
e5a0086fea alter tabsessions to change user column definition 2012-06-25 15:29:40 +05:30
Anand Doshi
72c945b7c6 template based web page loading using web.py 2012-06-22 20:01:07 +05:30
Anand Doshi
9078f652c3 Merge branch 'master' into cms2 2012-06-21 11:50:44 +05:30
Rushabh Mehta
40182bada3 added patch 2012-06-19 14:15:13 +05:30
Nabin Hait
34b4d26c1a reload_doc replaced with sync in patch 2012-06-18 11:18:27 +05:30
Nabin Hait
3adfa9595e patch list updated 2012-06-17 21:57:37 +05:30
Nabin Hait
3ad3ebdaec set recurring type as Monthly in all old sales invoice 2012-06-17 21:54:50 +05:30
Anand Doshi
3878b2a1ac add unique constraint to tabSeries name column 2012-06-14 18:28:29 +05:30
Anand Doshi
92fd9cce35 fixes in support ticket and email settings 2012-06-14 14:55:44 +05:30
Anand Doshi
94f26eae7c patch for list of search criteria and reports 2012-06-13 19:04:27 +05:30
Anand Doshi
47afacc8e9 1. Reports List - allow read permission to All 
2. Display message when ToDo doesnt contain any item
 2012-06-13 18:02:43 +05:30
Anand Doshi
443426277b sync purchase invoice item, purchase_receipt_item and purchase order item before patch 2012-06-12 14:17:44 +05:30
Anand Doshi
8eaa2dd570 sync purchase invoice item and purchase order item before patch 2012-06-12 14:16:37 +05:30
Nabin Hait
6581ef9449 fetch organization from lead to quote 2012-06-08 18:19:32 +05:30
Nabin Hait
f74b023106 fetch organization from lead to quote 2012-06-08 18:14:38 +05:30
Nabin Hait
7357fc1817 fetch organization from lead to quote 2012-06-08 18:02:38 +05:30
Nabin Hait
59c7670713 copy uom in pur inv from po, pr 2012-06-08 12:31:37 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
49230000e5 communication log removal patch 2012-06-05 18:51:57 +05:30
Anand Doshi
390b788e7b communication 2012-06-05 18:28:38 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Anand Doshi
6971f577da Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 15:47:47 +05:30
Anand Doshi
9c011f405d new rename doc function 2012-05-29 15:47:27 +05:30
Anand Doshi
2afe974a5b fix in remove euro currency patch 2012-05-29 10:58:28 +05:30
Anand Doshi
4792f51e2a remove euro currency patch, address / contact supplier/customer can now contain slashes in their name 2012-05-28 13:26:17 +05:30
Anand Doshi
5fda36f2c0 fix in profile permissions and support ticket response should update modified datetime 2012-05-24 12:39:18 +05:30
Anand Doshi
9da0bf6106 fix in customer address contact report 2012-05-23 18:27:05 +05:30
Nabin Hait
ea538bb9c7 fixed conflict 2012-05-23 12:57:05 +05:30
Nabin Hait
97bb6ce88b create report manager role patch 2012-05-23 12:55:11 +05:30
Nabin Hait
86df78aabc fixed conflict 2012-05-23 11:33:28 +05:30
Anand Doshi
6033d96a56 fixes in style settings 2012-05-22 17:21:24 +05:30
Nabin Hait
78b62cd865 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 16:23:27 +05:30
Nabin Hait
b695f73293 Maintain same rate throughout pur cycle: in global defaults, by default set true 2012-05-22 14:53:40 +05:30
Nabin Hait
86375f089a Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-21 15:48:21 +05:30
Anand Doshi
6420e602e0 make server side custom script readonly for system manager 2012-05-21 15:11:36 +05:30
Anand Doshi
881f154275 change session cache storage as json 2012-05-21 13:13:10 +05:30
Anand Doshi
0f7dd5453d Merge branch 'shf_rename' 2012-05-18 16:55:48 +05:30
Anand Doshi
227e9d3ac6 cleanup customize form 2012-05-18 16:55:20 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename' 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-05-18 11:52:31 +05:30
Nabin Hait
c58fbffc00 so pending item patch 2012-05-18 11:07:04 +05:30
Nabin Hait
a926468574 reload so pending items 2012-05-17 18:12:32 +05:30
Anand Doshi
ae4fc41e61 Merge branch 'shf_rename' 2012-05-16 14:35:15 +05:30
Anand Doshi
9175100e3d fixes in print format 2012-05-16 14:10:27 +05:30
Anand Doshi
28335b7ee7 print format readonly patch 2012-05-16 13:44:06 +05:30
Anand Doshi
1bba28a723 Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-15 18:22:55 +05:30
Anand Doshi
a5a747fd8d reload sales invoice print formats 2012-05-15 18:17:52 +05:30
Anand Doshi
4a3d3d75de Merge branch 'shf_rename' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-14 12:53:29 +05:30
Nabin Hait
43dd041ced page role series pacth 2012-05-11 11:47:18 +05:30
Nabin Hait
41526227e3 page role series pacth 2012-05-11 11:11:46 +05:30
Nabin Hait
91d6d1423d reload reports 2012-05-10 14:32:56 +05:30
Nabin Hait
3f7b883010 reload reports 2012-05-10 14:32:02 +05:30
Anand Doshi
bf68e04d2f Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	erpnext/patches/patch_list.py
 2012-05-10 12:40:58 +05:30
Nabin Hait
fdeb55ba69 stock reco patch 2012-05-10 12:18:11 +05:30
Nabin Hait
08f4cb7f6a stock reco fix in valuation and cancellation 2012-05-10 12:13:47 +05:30
Rushabh Mehta
81dba76699 cms updates 2012-05-09 15:37:54 +05:30
Rushabh Mehta
cb1f1d81aa cms patch 2012-05-09 14:10:49 +05:30
Rushabh Mehta
a933b632ad templates cleaner and generation for all pages 2012-05-08 16:06:44 +05:30
Nabin Hait
ce4d297641 rename dt in custom search criteria 2012-05-04 17:55:32 +05:30
Anand Doshi
4b6c1f8de5 fixes in notification control due to renaming of doctype 2012-05-03 16:26:38 +05:30
Nabin Hait
b92d9ef618 removed patch file specific to bullows 2012-05-02 17:58:13 +05:30
Nabin Hait
a4561e14aa patch list updated 2012-05-02 14:58:53 +05:30
Nabin Hait
7ef8168dbc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 14:56:17 +05:30
Nabin Hait
afb704c940 rename fix in prev doctype 2012-05-02 14:56:00 +05:30
Anand Doshi
187ac7ccf1 delete question-view page 2012-05-02 12:23:44 +05:30
Anand Doshi
60118662ff delete question-view page 2012-05-02 12:23:05 +05:30
Anand Doshi
b1f46c80b2 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:21:53 +05:30
Anand Doshi
e876ac2005 delete question-view page 2012-05-02 12:21:27 +05:30
Nabin Hait
dd200d363e cleanup property setter patch 2012-05-02 10:36:16 +05:30
Nabin Hait
50a0cadb9f cleanup property setter patch 2012-05-02 10:32:28 +05:30
Nabin Hait
5af62d0857 fixed conflict using theirs 2012-05-01 16:29:40 +05:30
Anand Doshi
23e777545a fix in naming series patch's execution 2012-05-01 16:05:23 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
28b9551acf fixes in patch 2012-04-30 11:55:25 +05:30
Nabin Hait
d1ac71c3e7 patch list updated 2012-04-30 11:53:58 +05:30
Rushabh Mehta
30cb5c20a1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6 more website cleanups 2012-04-27 18:39:14 +05:30
Nabin Hait
7ff69e10bf repost stock for entries where posting time goes wrong 2012-04-27 18:27:06 +05:30
Anand Doshi
864e220ec5 fixes in serial no patch 2012-04-27 17:12:47 +05:30
Anand Doshi
d461148296 fix in reload_c_form path 2012-04-27 17:05:50 +05:30
Nabin Hait
92ec4dcb6f minor fixes 2012-04-26 13:13:10 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Nabin Hait
3afecb9e30 update permission in appraisal 2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f updated permlevel in address 2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432 updated patch list 2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef update role in address 2012-04-24 12:23:12 +05:30
Nabin Hait
69f6d79791 patch list modified 2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805 remove def val from rv detail cost center 2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e change cacheitem schema 2012-04-23 18:23:17 +05:30
Nabin Hait
9ceaccce86 create custom flds for bullows account 2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16 after sync cleanup 2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50 some fixes in cleanup 2012-04-23 16:03:38 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Nabin Hait
eaf8b91402 hr reports cleanup 2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0 fixed hr issues 2012-04-16 12:22:47 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
966b6f1aa0 fix in patches 2012-04-10 12:38:17 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
 2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4 fix in rename dt patch 2012-04-09 12:02:15 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Nabin Hait
3525d92cfb c-form reload pach 2012-04-06 17:49:25 +05:30
Nabin Hait
c63a58d416 c-form reload pach 2012-04-06 17:42:02 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
a6eb15df4a fix in earning and deduction type field tyep 2012-04-03 13:22:20 +05:30
Anand Doshi
be9562dcd5 rerun of rename_dt 2012-04-02 19:13:00 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
5c6cdb06b2 fix in decimal places 2012-04-02 15:02:34 +05:30
Rushabh Mehta
c7f1e5a54a patch fixes 2012-04-02 14:24:35 +05:30
Rushabh Mehta
5475a3ca66 patch fixes 2012-04-02 14:06:46 +05:30
Anand Doshi
896c6fdc3c fix in patch order 2012-04-02 14:06:33 +05:30
Anand Doshi
0442bc5d63 fix in patch list 2012-04-02 13:09:20 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
7ff696fb12 Merge branch 'renamedt' into shf_rename 
Conflicts:
	erpnext/patches/patch_list.py
 2012-03-29 15:31:17 +05:30
Anand Doshi
fddb782a82 Merge branch 'renamedt' of github.com:webnotes/erpnext into renamedt 2012-03-29 15:28:16 +05:30
Nabin Hait
dc8ce0190d Merge branch 'master' into renamedt 2012-03-29 11:53:02 +05:30
Anand Doshi
8ac5ccae0a fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:29:55 +05:30
Anand Doshi
9767f79845 fix in Sales Order-Receivable Voucher Mapper 2012-03-28 19:25:29 +05:30
Anand Doshi
419260298b fix in mapper 2012-03-28 19:12:36 +05:30
Nabin Hait
79bc01e33d updated rename_dt 2012-03-28 16:19:01 +05:30
Nabin Hait
6370ba8280 Merge branch 'master' of github.com:webnotes/erpnext into renamedt 2012-03-28 16:17:53 +05:30
Nabin Hait
e6340f26c2 mapper fix in DN_RV 2012-03-28 14:11:31 +05:30
Nabin Hait
5b00addaf7 reload mapper for checking ref value 2012-03-28 11:38:25 +05:30
Nabin Hait
6ed0450dba reload mapper for checking ref value 2012-03-28 11:32:44 +05:30
Anand Doshi
b489297108 added delete_docformat in patch_list 2012-03-27 19:41:45 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
66ea30543c sync patches 2012-03-27 15:02:30 +05:30
Nabin Hait
bb6f10098e updated rename_dt 2012-03-26 11:06:34 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge 
Conflicts:
	erpnext/projects/doctype/project/project.txt
 2012-03-23 14:51:35 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge 
Conflicts:
	js/all-app.js
	version.num
 2012-03-23 13:55:20 +05:30
Nabin Hait
191e55f1bc sync ref db patch 2012-03-22 15:07:28 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Anand Doshi
71d0b2a428 permission engine fix - is doctype submittable 2012-03-21 17:15:49 +05:30
Nabin Hait
f676824791 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 17:08:35 +05:30
Nabin Hait
93162f603d update bom no options in stock entry 2012-03-21 16:02:44 +05:30
Nabin Hait
830b8baa9d update bom no options in stock entry 2012-03-21 15:56:22 +05:30
Nabin Hait
91375d64f1 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-21 12:05:30 +05:30
Nabin Hait
39a24794eb Purpose others to other 2012-03-21 11:02:50 +05:30
Anand Doshi
310bc462b9 fix in doctype refactor patch 2012-03-20 17:49:23 +05:30
Nabin Hait
ba62cf3b5a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 17:40:16 +05:30
Nabin Hait
ceb9f41f15 lead organization fld added in quotation for printing: patch 2012-03-20 17:04:32 +05:30
Nabin Hait
de51040763 lead organization fld added in quotation for printing 2012-03-20 16:47:03 +05:30
Nabin Hait
594ee37d26 patch list updated 2012-03-20 14:26:32 +05:30
Nabin Hait
547478f973 stock entry: new purpose others added in stock entry 2012-03-20 14:26:14 +05:30
Anand Doshi
6ba51ca693 POS Invoice fix 2012-03-20 12:24:51 +05:30
Anand Doshi
547ce9f9c8 POS Invoice fix 2012-03-20 12:11:38 +05:30
Anand Doshi
5dabfdd920 sync doctype - first cut 2012-03-19 14:26:14 +05:30
Nabin Hait
3ffca32ace rename dt patch updated 2012-03-16 16:21:44 +05:30
Anand Doshi
4b7ddff4c9 patch after doctype.py refactor 2012-03-14 17:45:54 +05:30
Rushabh Mehta
3bbc7aeeb8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 
Conflicts:
	version.num
 2012-03-14 07:58:10 +01:00
Nabin Hait
4af2c094cc rename dt error fixed 2012-03-14 12:12:23 +05:30
Nabin Hait
1732905db8 rename dt error fixed 2012-03-14 12:04:16 +05:30
Nabin Hait
64f40fab6d Rename doctype for more meaningful name 2012-03-14 11:07:00 +05:30
Nabin Hait
c6b989c9d7 update stock reco permission 2012-03-13 12:47:07 +05:30
Nabin Hait
9826ccce54 update stock reco permission 2012-03-13 12:45:53 +05:30
Rushabh Mehta
ae4d1f973c modules cleanup 2012-03-12 14:34:55 +05:30
Nabin Hait
4e154d2233 removed rv series def val 2012-03-06 11:19:29 +05:30
Nabin Hait
d342e2a4f2 reload item tables 2012-03-05 15:22:55 +05:30
Nabin Hait
d14bea3de5 patch list updated 2012-03-05 11:03:54 +05:30
Nabin Hait
3f958f7433 reload patch: field order changed 2012-03-05 10:59:02 +05:30
Nabin Hait
80d5261100 patch list updated 2012-03-01 18:56:06 +05:30
Nabin Hait
423474da5c transaction date issue in mapper patch 2012-03-01 18:04:08 +05:30
Nabin Hait
7807c6f173 clear cache patch 2012-03-01 15:58:30 +05:30
Nabin Hait
995d79421d error fixed in patch 2012-03-01 15:51:33 +05:30
Anand Doshi
8acf46c725 update in patches 2012-03-01 13:58:13 +05:30
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 
Conflicts:
	version.num
 2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Rushabh Mehta
fe521fdbc2 add messages to always show and add attribution to patch 2012-03-01 13:39:09 +05:30
Rushabh Mehta
cc6398e7c7 patch - update user_image in profile 2012-03-01 12:15:54 +05:30
Rushabh Mehta
4240ade0de user background 2012-02-29 18:40:21 +05:30
Rushabh Mehta
412a65c23c user background 2012-02-29 18:38:18 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Rushabh Mehta
1572adf7f7 minor fix 2012-02-29 15:19:20 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Nabin Hait
1f4aeab85c error fixed in label_cleanup 2012-02-28 14:14:20 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Anand Doshi
2b8c4d78f3 reload messages 2012-02-27 18:42:00 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
78805e702e patch for form/label cleanup 2012-02-27 12:48:35 +05:30
Nabin Hait
0cde984dc5 Update future year balances at the time of tranaction and acc bal reposting patch 2012-02-27 12:34:14 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Anand Doshi
eaaf65131b desktop: first cut 2012-02-24 15:29:07 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c023cdd0c0 Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-23 11:46:39 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Anand Doshi
bfa58a3516 allow deletion of products 2012-02-23 11:31:17 +05:30
Anand Doshi
9f94275d65 allow deletion of products 2012-02-23 11:27:40 +05:30
Rushabh Mehta
393d325e00 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 13:15:02 +01:00
Anand Doshi
c70e8d9791 fix in remove_archive 2012-02-21 17:30:36 +05:30
Rushabh Mehta
50144468be Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:58:48 +01:00
Anand Doshi
b8fa4a37e5 fix in remove_archive 2012-02-21 17:27:24 +05:30
Rushabh Mehta
307da4f91b Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:17:20 +01:00
Anand Doshi
62a3872480 fix in remove_archive 2012-02-21 16:46:57 +05:30
Rushabh Mehta
534b6a7d7f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:16:13 +01:00
Anand Doshi
5ff541b53c fix in remove_archive patch 2012-02-21 16:44:31 +05:30
Rushabh Mehta
7a867fc1f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 12:00:02 +01:00
Anand Doshi
8e703ef26f packing slip fix 2012-02-21 16:29:46 +05:30
Rushabh Mehta
02b36eba1c Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:54:33 +01:00
Nabin Hait
b461e1788a patch list updated 2012-02-21 14:22:06 +05:30
Rushabh Mehta
cdf0b7a502 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:45:46 +01:00
Anand Doshi
f9e9000092 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 14:12:39 +05:30
Anand Doshi
c05ee5bf64 patch to remove archive 2012-02-21 14:12:13 +05:30
Rushabh Mehta
25e57421f7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 09:17:30 +01:00
Nabin Hait
4b36c1e8f4 insert after fld should be no copy in custom fld 2012-02-21 13:43:59 +05:30
Rushabh Mehta
e55778627f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-21 08:57:24 +01:00
Nabin Hait
5fe6760406 reorder level checking based on stores and reserved warehouse 2012-02-21 13:25:27 +05:30
Rushabh Mehta
d25e0957d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 12:06:55 +01:00
Anand Doshi
2a7fa0451c todo_item patch 2012-02-20 16:36:08 +05:30
Anand Doshi
c3023be794 notifications of todo items 2012-02-20 16:31:55 +05:30
Rushabh Mehta
7c76f80966 gateway patch 2012-02-16 10:58:45 +01:00
Rushabh Mehta
1b1179477b added patch 2012-02-16 15:11:28 +05:30
Rushabh Mehta
8425c87d5f fixed old style file names 2012-02-16 13:01:28 +05:30
Nabin Hait
da1f48b96e mentioed account type for some tax/chargeable account 2012-02-16 10:55:05 +05:30
Anand Doshi
2c2991c3b7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 15:42:34 +05:30
Anand Doshi
65bc9db85e File Data rename 2012-02-15 15:42:18 +05:30
Nabin Hait
0e14191163 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 18:55:34 +05:30
Nabin Hait
13e62ccbc9 clear cache patch 2012-02-14 18:55:01 +05:30
Rushabh Mehta
c9b10fd8d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Nabin Hait
75ef7c7a89 def val of is_subcontracted is NO 2012-02-14 16:08:22 +05:30
Anand Doshi
507cb3c592 add website manager patch 2012-02-14 12:58:47 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Anand Doshi
d7ddea1e2a domain list patch 2012-02-13 18:59:43 +05:30
Anand Doshi
e8928b8bff website settings 2012-02-13 17:56:59 +05:30
Nabin Hait
e63ea67b54 error fixed in patch 2012-02-13 15:38:15 +05:30
Nabin Hait
42852a88dc account type patch added in patch list 2012-02-13 15:29:51 +05:30
Nabin Hait
bd0c05bf94 Mentioned account type in default accounts 2012-02-13 14:48:34 +05:30
Rushabh Mehta
0b2874afdb fix to install 2012-02-09 12:45:50 +05:30
Rushabh Mehta
5b625fa592 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-07 14:32:20 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Rushabh Mehta
cc54fd46bc website fixes 2012-02-06 13:09:08 +01:00
Rushabh Mehta
b4244bacba Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-06 10:59:48 +01:00
Rushabh Mehta
4167e2f97a patch fix 2012-02-06 10:58:48 +01:00
Rushabh Mehta
74fab55948 add home in website patch 2012-02-06 14:34:42 +05:30
Rushabh Mehta
6147451da3 refactored patches, bug fix for assign_to 2012-02-04 09:53:25 +05:30
Rushabh Mehta
b4c814484e fix to patch 2012-02-03 13:36:44 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
adc9a61bd7 bugfix 2012-02-02 16:45:26 +05:30
Rushabh Mehta
50e2cfe78e dateutil.js/patch fix 2012-02-02 16:40:01 +05:30
Rushabh Mehta
63adcb7355 patch update 2012-02-02 13:44:28 +05:30
Rushabh Mehta
a3d21a46e8 version 2012-02-02 13:43:20 +05:30
Rushabh Mehta
7018b19f42 added website settings, refactored home 2012-02-02 13:42:28 +05:30
Anand Doshi
a9a5128402 Merge branch 'stable' into latest 
Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
 2012-02-02 11:44:25 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Rushabh Mehta
9ef63f93d6 moved back to 'index.cgi' model 2012-02-01 14:47:29 +05:30
Anand Doshi
3325d0db74 Patch to set docstatus=2 for purchase returned serial no 2012-02-01 11:36:31 +05:30
Anand Doshi
0717ca63b2 Fix in Purchase Return - Serial No. status issue 2012-01-31 16:20:37 +05:30
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
e72de12993 Merge branch 'master' into latest 
Conflicts:
	index.html
	version.num
 2012-01-30 11:59:05 +05:30
Anand Doshi
69cfc5566a Email settings check on save 2012-01-30 11:54:59 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Rushabh Mehta
c8d2e73ee6 added blog 2012-01-27 15:57:17 +05:30
Rushabh Mehta
51e51da63f added about_us 2012-01-27 12:17:09 +05:30
Anand Doshi
af1ad9a31e Merge branch 'latest' of github.com:webnotes/erpnext into latest 
Conflicts:
	version.num
 2012-01-25 17:27:57 +05:30
Anand Doshi
6e174cc2c4 Merge branch 'master' into latest 
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
 2012-01-25 17:21:14 +05:30
Anand Doshi
46848a48fe Show DocType Labels instead of DocType names in Customize Form View 2012-01-25 17:15:46 +05:30
Rushabh Mehta
4b1fe0528a added home template 2012-01-25 15:06:28 +05:30
Rushabh Mehta
a8ad3907db added website page, home, patch 2012-01-25 10:37:35 +05:30
Anand Doshi
c655e37f1a Fixes in production and stock modules 2012-01-25 09:58:06 +05:30
Anand Doshi
6be842f960 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-24 14:58:41 +05:30
Anand Doshi
a2c9e39ca3 Merge branch 'master' into latest 
Conflicts:
	index.html
	version.num
 2012-01-24 14:58:24 +05:30
Rushabh Mehta
7cca292494 version 2012-01-24 14:34:27 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Anand Doshi
2e3ce6cc02 Fix error in patch due to single quote in name 2012-01-24 11:37:28 +05:30
Anand Doshi
3c572d7468 change patch file in patch list customer address contact patch 2012-01-24 10:55:04 +05:30
Anand Doshi
590be7e643 Merge branch 'master' into latest 
Conflicts:
	index.html
	version.num
 2012-01-23 18:37:09 +05:30
Anand Doshi
706baf77ae customer address contact patch 2012-01-23 18:35:28 +05:30
Anand Doshi
9a7ea9285e Customer Address Contact report 2012-01-23 18:32:20 +05:30
Rushabh Mehta
49ebfb6a30 version 2012-01-20 15:32:18 +05:30
Rushabh Mehta
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Rushabh Mehta
0a5657809a fixes to add user 2012-01-20 10:52:53 +05:30
Rushabh Mehta
3a32478db9 confict fix 2012-01-19 15:11:07 +05:30
Rushabh Mehta
d31bf62c9a fixed patches, small bugs 2012-01-19 15:09:49 +05:30
Anand Doshi
39eff71864 remove get tds button 2012-01-19 14:57:23 +05:30
Anand Doshi
26814e7bad Remove Get TDS button, which appears twice in JV 2012-01-19 14:26:25 +05:30
Anand Doshi
ad2f5d1270 Merge branch 'stable' 2012-01-19 12:42:11 +05:30
Anand Doshi
f343a8bc75 remove extra buttons labelled Make Maintenance Visit 2012-01-19 12:41:54 +05:30
Anand Doshi
4b0b4a7fdc Merge branch 'stable' 
Conflicts:
	erpnext/patches/patch_list.py
 2012-01-19 12:35:54 +05:30
Anand Doshi
5f72836f11 Patch to change allocated_to options to 'Profile' 2012-01-19 12:32:15 +05:30
Rushabh Mehta
94b88b9e22 added patch for subdomain 2012-01-18 10:55:39 +05:30
Anand Doshi
d3a23b5e8c Item Manufacturer/Supplier Details in item doctype 2012-01-17 18:46:43 +05:30
Anand Doshi
a9023b1787 Merge branch 'stable' 2012-01-16 17:39:10 +05:30
Rushabh Mehta
cb60ca13a9 added patch to convert tables to utf8 2012-01-16 11:58:14 +05:30
Anand Doshi
ada0b5d554 Merge branch 'stable' 2012-01-13 13:24:53 +05:30
Anand Doshi
7b96d1f300 search_criteria patch 2012-01-13 11:53:22 +05:30
Anand Doshi
4b80a81a2e Rename Search Criteria Patch 2012-01-13 11:14:29 +05:30
Anand Doshi
640955f91d Patch for fixes after major production rewrite 2012-01-12 12:55:29 +05:30
Nabin Hait
a8077bdd20 Error fixed in patch 2012-01-11 17:22:54 +05:30
Nabin Hait
42a411398a Error fixed in patches 2012-01-11 16:57:44 +05:30
Nabin Hait
55c037c250 Added production_cleanup patch 2012-01-11 16:44:07 +05:30
Nabin Hait
c5d6bcbb8f Production module cleanup 2012-01-11 16:41:16 +05:30
Anand Doshi
bf166e487d Patch to rename doctype indent 2012-01-10 17:06:16 +05:30
Anand Doshi
3a82dfd171 Rename Indent to Purchase Requisition 2012-01-10 16:56:11 +05:30
Anand Doshi
bc45f896f7 Merged master with stable 2012-01-10 14:11:07 +05:30
Anand Doshi
266829f024 Merge branch 'master' into stable 2012-01-10 13:59:14 +05:30
Anand Doshi
a9df960494 On Print Hide, hide net_total, rounded_total_export and grand_total_export 2012-01-09 16:55:30 +05:30
Anand Doshi
58455c9d8e Changes in print format to hide taxes when using inclusive prices and showing reference rate when discount is to be displayed 2012-01-06 14:33:57 +05:30
Nabin Hait
7394239e05 delete purpose of service 2012-01-05 12:16:28 +05:30
Nabin Hait
2abc6026f2 reload po-pr mapper 2012-01-05 11:24:49 +05:30
Nabin Hait
d2686b1c31 reload doctype 2012-01-05 11:16:18 +05:30
Anand Doshi
6ac1d4bb44 Merge branch 'stable' of github.com:webnotes/erpnext into stable 
Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
 2012-01-03 11:45:11 +05:30
Nabin Hait
db126e80b8 pos setting patch 2012-01-03 11:10:11 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Nabin Hait
21d0b68a7d Fixes in pending_patches 2011-12-29 15:39:26 +05:30
Nabin Hait
0dfb8e939c Pending patches to be run from patch.py 2011-12-29 14:40:05 +05:30
Anand Doshi
c50f605450 Enabled Attachments in Support Ticket 2011-12-27 17:44:30 +05:30
Nabin Hait
a0778fec61 Reload gl mapper patches 2011-12-26 12:28:14 +05:30
Nabin Hait
cf0163d09e Patch updated 2011-12-26 11:13:49 +05:30
Nabin Hait
a0286e986e patch updated 2011-12-26 11:08:32 +05:30
Nabin Hait
56f7ccbe70 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-23 18:26:34 +05:30
Nabin Hait
c6359a9179 Patch to update against_voucher in gle for jv aganst jv 2011-12-23 18:26:17 +05:30
Anand Doshi
8d53f7635a Merge pull request #179 from anandpdoshi/master 
Changes in Permission Manager to exclude doctype of 'Core' module and also mark Profile as not in create
 2011-12-23 00:21:53 -08:00
Anand Doshi
ac20eb2107 Changes in Permission Manager to exclude doctype of 'Core' module and mark Profile as not in create 2011-12-23 13:50:28 +05:30
Nabin Hait
e323ef20b0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 19:05:08 +05:30
Nabin Hait
d0a892ffe7 print hide price list flds 2011-12-22 19:04:49 +05:30
Anand Doshi
4714424de0 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-22 18:22:46 +05:30
Anand Doshi
0188df1609 Amended the patch to import class Document 2011-12-22 18:21:57 +05:30
Anand Doshi
27b05eac7a Merge pull request #176 from anandpdoshi/master 
Patch to enable income year to date summary in email digest
 2011-12-22 04:48:57 -08:00
Anand Doshi
68f3967de0 Patch to enable income year to date summary in email digest 2011-12-22 18:18:10 +05:30
Anand Doshi
99479bdb7f Merge pull request #172 from anandpdoshi/master 
remove previous field property setter
 2011-12-22 01:50:07 -08:00
Anand Doshi
f2f4c87bb6 remove previous field property setter 2011-12-22 15:19:16 +05:30
Anand Doshi
d1bfe839fa Merge pull request #171 from anandpdoshi/master 
Patch to update idx which starts with 0
 2011-12-22 01:37:04 -08:00
Anand Doshi
9ca7e5255b Patch to update idx.. start idx from 1 2011-12-22 15:05:14 +05:30
Nabin Hait
7e812bbee0 Error fixed in patch 2011-12-22 12:58:34 +05:30
Nabin Hait
6998261a7e Error fixed in auto indent patches 2011-12-22 12:56:57 +05:30
Anand Doshi
5a32f78bf3 Merge pull request #170 from anandpdoshi/master 
calls on_update method of email_digest obj for creating a scheduler entry
 2011-12-21 22:59:31 -08:00
Anand Doshi
248f8f5687 Update on previous commit: calls on_update method of email_digest obj for creating a scheduler entry 2011-12-22 12:26:36 +05:30
Anand Doshi
c9b2743e1c Merge pull request #168 from anandpdoshi/master 
Fix Image attachments and Enable Email Digests
 2011-12-21 22:45:13 -08:00
Anand Doshi
972b165850 Modified deploy_email_digest to enable all the default email digests 2011-12-22 12:04:28 +05:30
Nijil Y
36f58835e6 Update erpnext/patches/auto_indent.py 2011-12-21 16:35:43 +05:30
Nijil Y
9e6f00abab fixes for notification 2011-12-21 14:54:14 +05:30
Nijil Y
2c19960996 account conflict 2011-12-21 13:30:09 +05:30
Nijil Y
9b6fc0f83d Merge branch 'master' of github.com:nijil/erpnext 2011-12-21 13:24:02 +05:30
Nabin Hait
520de0529f Merge branch 'master' of github.com:webnotes/erpnext 2011-12-21 12:51:38 +05:30
Nijil Y
0f9eaeaa3c updation Merge branch 'master' of git://github.com/webnotes/erpnext 
Conflicts:
	erpnext/projects/doctype/ticket/ticket.py
 2011-12-21 12:34:13 +05:30
Nijil Y
16ca593bbf Update erpnext/patches/auto_indent.py 2011-12-21 12:20:07 +05:30
Nijil Y
4d6a71c5f2 Update erpnext/patches/auto_indent.py 2011-12-21 11:56:42 +05:30
Nijil Y
35aa35bea3 Update erpnext/patches/auto_indent.py 2011-12-21 11:50:20 +05:30
Nabin Hait
53ef4009ba Fixes in patches 2011-12-21 11:22:32 +05:30
Nijil Y
205e042113 patch file 2011-12-20 21:14:43 +05:30
Anand Doshi
146f47faab Merge pull request #167 from anandpdoshi/master 
Patch to remove extra button from Email Digest Form
 2011-12-20 05:40:59 -08:00
Nabin Hait
63b94c42e4 Price list patch 2011-12-20 19:09:23 +05:30
Anand Doshi
6a605b47ef Patch to remove 'Add Recipients' button from Email Digest form 2011-12-20 18:31:57 +05:30
Nijil Y
d82e8df7e5 patch update for auto indent with email notify 2011-12-20 17:30:41 +05:30
Nijil Y
8dd861bda5 Auto Indent creation when stock reaches re-order level 2011-12-20 17:17:51 +05:30
Nabin Hait
b8cec492c5 Fixed issue in c-form patch 2011-12-16 16:48:17 +05:30
Nabin Hait
488bcc8700 reload_employeewise_balance_leave_report patch updated 2011-12-16 16:29:31 +05:30
Nabin Hait
e3daffe477 reload_employeewise_balance_leave_report 2011-12-16 16:28:26 +05:30
Nabin Hait
3bfeefafcd Modified patch 2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495 Modified patch 2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44 Return if old patch.py executed anyway 2011-12-16 10:17:26 +05:30
Nabin Hait
9a0d05d354 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4 remove depricated default fileds 2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0 patch to remove old control panel email settings 2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5 patch to remove old control panel email settings 2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master 
Accounts Default Form Fix
 2011-12-14 22:28:52 -08:00
Nijil Y
b40f826c5a . 2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master 
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
 2011-12-13 05:37:41 -08:00
Nabin Hait
536e0cb1c4 fixes in patch 2011-12-13 19:05:13 +05:30
Nabin Hait
08d803791d Merge branch 'master' of git://github.com/nijil/erpnext 2011-12-13 18:49:59 +05:30
Nijil Y
f6a3441d99 patch 2011-12-13 18:31:42 +05:30
Anand Doshi
f5ff4434df Patch to reload Task doctype of Projects Module 2011-12-13 18:13:23 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount 
appended in description
 2011-12-13 15:57:09 +05:30
Anand Doshi
deb816d30c Patch to remove duplicate entries created due to change in 
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
 2011-12-12 12:41:36 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +05:30
Nijil Y
edf8bc2a3e Discount in purchase cycle Merge branch 'master' of git://github.com/nijil/erpnext 
Conflicts:
	erpnext/accounts/doctype/pv_detail/pv_detail.txt
	erpnext/buying/doctype/po_detail/po_detail.txt
	erpnext/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
 2011-12-08 17:29:24 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Nabin Hait
b28d6dc617 Repost stock patch 2011-12-06 15:11:14 +05:30
Nabin Hait
ea5f5ca57d Recurring invoices patch 2011-12-06 15:10:48 +05:30
Anand Doshi
8c10de6c1a Modified patch to create a DocType Label record for DocLayer 2011-11-25 11:25:39 +05:30
Nijil
4e54d7a434 pvdetail and patch 2011-11-24 16:18:42 +05:30
Nabin Hait
e92066fa80 modified fld prop in gl entry and index patch 2011-11-24 15:04:47 +05:30
Anand Doshi
956d665738 Merge pull request #148 from anandpdoshi/master 
Modified GLEntry doctype to be not in create
 2011-11-24 00:29:53 -08:00
Anand Doshi
be14e021b9 Reload GL Entry doctype 2011-11-24 13:57:46 +05:30
Anand Doshi
6b8d0bfb2a Added patch to reload doclayer, doclayer field and print format doctypes 2011-11-23 18:39:08 +05:30
Nabin Hait
5f9ceb8dc8 filter property changed in address 2011-11-23 13:19:20 +05:30
Nijil
6800ad55bd patch for Discount Rate 2011-11-22 15:21:42 +05:30
Nabin Hait
2690e72c14 updated reco patch 2011-11-21 17:27:36 +05:30
Nabin Hait
38477a3616 patch for stock reconciliation 2011-11-21 17:16:48 +05:30
Nabin Hait
bc60c1f29c fixed patch 2011-11-17 16:59:29 +05:30
Nabin Hait
92ec8d26eb reload LC wizard 2011-11-17 15:03:05 +05:30
Nabin Hait
1a8831f476 reload LC wizard 2011-11-17 15:00:55 +05:30
Nabin Hait
a8da0fecb5 Account link query changed in LC wizard 2011-11-17 14:47:05 +05:30
Nabin Hait
f164b269db Merge branch 'master' of github.com:webnotes/erpnext 2011-11-16 16:39:16 +05:30
Nabin Hait
b0fa2af45b Rewritten landed cost wizard 2011-11-16 16:20:37 +05:30
Anand Doshi
19a2767b77 Changes in spartan print formats to show border in chrome 2011-11-16 14:49:37 +05:30
Anand Doshi
96fd8bec9b Changes in Sales Invoice Print Formats 2011-11-16 14:02:30 +05:30
Anand Doshi
c573fb8eed Modified patch install_print_formats to reload the newly added Print Formats 2011-11-16 13:31:21 +05:30
Anand Doshi
e3559853bd Added new Print Formats as part of repository 2011-11-16 13:18:45 +05:30
Anand Doshi
86e91e5dce Changes in patch for installation of new print formats 2011-11-15 18:06:16 +05:30
Anand Doshi
f8b01097ac Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	index.html
 2011-11-15 15:24:11 +05:30
Anand Doshi
3cb68e17b9 New Print Formats 2011-11-15 15:22:44 +05:30
Nabin Hait
ff72835ad9 Qty consumed per unit field type currency to data 2011-11-10 14:37:47 +05:30
Nabin Hait
33e19480ae UOM field added in BOM, will be fetched from item master 2011-11-09 13:53:16 +05:30
Nabin Hait
93ba4fbaa4 Fixes related to finding prev sle 2011-11-08 15:30:04 +05:30
Rushabh Mehta
d77cb27bd2 fixes to bin for reposting future entires 2011-11-08 12:06:02 +05:30
Nabin Hait
30d34c4311 sal manager reload patch 2011-11-07 11:07:50 +05:30
Nabin Hait
990a5eacca sal manager reload patch 2011-11-07 10:51:29 +05:30
Anand Doshi
30cf682e46 Change criteria name of employeewise_balance_leave_report 2011-10-31 17:41:04 +05:30
Nabin Hait
d0c9d422af patch for project changes in pur cycle 2011-10-20 19:21:03 +05:30
Nabin Hait
69554511da fixes in patch 2011-10-19 16:35:39 +05:30
Nabin Hait
2eb5ae48f7 patch: default print format for invoice is standard 2011-10-19 16:06:37 +05:30
Nabin Hait
13800440f1 fixed issue in patch 2011-10-19 15:38:42 +05:30
Nabin Hait
d751c1d40d patch for reloading print format and new POS format 2011-10-19 15:33:27 +05:30
Nabin Hait
1546003d69 issue fixed in patch 2011-10-18 18:47:08 +05:30
Nabin Hait
0c005421fe Packing slip issues fixed and modified print format 2011-10-18 16:44:20 +05:30
Nabin Hait
e7c4a4011f acc bal repost patch moved in separate file 2011-10-14 19:05:38 +05:30
Nabin Hait
df8304f00b acc bal repost patch moved in separate file 2011-10-14 19:05:08 +05:30
Nabin Hait
c0d7434794 Edited erpnext/patches/patch.py via GitHub 2011-10-14 00:14:31 +05:30
Nabin Hait
989462b669 account balance reposting with freezing current session 2011-10-13 17:33:30 +05:30
Nabin Hait
d84ad942d1 Removed repost patch 2011-10-13 14:04:26 +05:30
Nabin Hait
fe4c4f94da repost account balance patch 2011-10-13 11:07:14 +05:30
Nabin Hait
c7cf94ec7b page break allow_on_submit 2011-10-12 13:16:11 +05:30
Nabin Hait
89a9a26524 page_break column allow_on_submit 2011-10-12 12:41:00 +05:30
Nabin Hait
685564f71d Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Nabin Hait
15cad19d7c Serial No moved to Stock module from Support module 2011-10-10 17:10:24 +05:30
Nabin Hait
6a0561612f cost center groupto ledger and vice versa 2011-10-10 12:23:10 +05:30
Nabin Hait
8e54aa882a patch for page break issue 2011-10-07 19:03:19 +05:30
Nabin Hait
ddaa5a33fe reload PO-PR mapper 2011-10-07 12:36:13 +05:30
Nabin Hait
7a941869ab clear cache forcefully 2011-10-07 12:30:48 +05:30