Rushabh Mehta
994fa8dcef
Merge pull request #5530 from rmehta/website-route-fixes
...
[redesign] website routing system
2016-06-24 16:37:43 +05:30
Rushabh Mehta
a334062b03
[redesign] website routing system
2016-06-24 16:18:07 +05:30
Nabin Hait
438565f678
Merge branch 'master' into develop
2016-06-24 16:12:26 +05:30
Nabin Hait
0bfd4849ca
minot fix
2016-06-24 16:04:31 +05:30
Nabin Hait
2effad33d0
Merge branch 'master' into develop
2016-06-24 12:48:24 +05:30
Nabin Hait
6dfc78b12a
Item Valuation Rate in case of negative inventory
2016-06-24 12:28:55 +05:30
Rushabh Mehta
1d1bc27a57
[minor] fix update_mins_to_first_response patch
2016-06-14 16:27:50 +05:30
Rushabh Mehta
a55fb6426c
[patch] mins_to_first_response in opporutnity and issue
2016-06-14 15:54:54 +05:30
Rushabh Mehta
277cda195c
[fix] for #5419
2016-06-01 12:29:08 +05:30
Nabin Hait
a60ceba6d4
[fix] reload gl entry doctype in patch
2016-05-27 12:44:18 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Rushabh Mehta
1885645d6d
[fix] [patch]
2016-05-24 16:10:21 +05:30
Nabin Hait
d9117cb726
reload budget doctype in patch
2016-05-23 13:04:26 +05:30
Nabin Hait
ca90963d5b
Redesigned budgets
2016-05-23 13:04:26 +05:30
Anand Doshi
1d88c6a742
[fix] [patch] home page + erpnext.css
2016-05-20 10:42:04 +05:30
Anand Doshi
e13c3ad048
[fix] [patch] homepage
2016-05-18 01:46:23 +05:30
Anand Doshi
0d66260d31
[fix] [patch] update home page
2016-05-17 10:21:08 +05:30
Rushabh Mehta
02f76dc0f9
[patch] [fix]
2016-05-16 11:46:29 +05:30
Rushabh Mehta
f1bdae4496
[patch] [fix]
2016-05-16 11:41:29 +05:30
Rushabh Mehta
c8b2a9d654
[patch] [fix]
2016-05-15 10:08:52 +05:30
Rushabh Mehta
9c6c0d2836
[patch] [fix]
2016-05-13 17:50:33 +05:30
Rushabh Mehta
d774f40497
remove print in homepage
2016-05-13 16:21:37 +05:30
Rushabh Mehta
4b9238a03b
[cleanup] homepage
2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5
[cleanup] remove Features Setup
2016-05-11 16:47:14 +05:30
Nabin Hait
f3bff49799
Merge branch 'master' into develop
2016-05-02 15:19:17 +05:30
Valmik Jangla
651dc5b345
Reset Values in Tools
2016-05-02 12:00:06 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Nabin Hait
867dfec64b
Reload bin in reserved qty reposting patch
2016-04-20 11:53:34 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Rushabh Mehta
a305c29b0e
[cleanup] remove is_pro_applicable
2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2
removed Is Sales Item and Is Purchase Item
2016-04-15 12:57:00 +05:30
Rushabh Mehta
c65726bf07
[patch] hide new icons if equivalent old ones are set
2016-04-15 12:51:28 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Rushabh Mehta
15a7f215b9
[enhancement] heatmaps on item and notifications for item
2016-04-14 17:30:53 +05:30
Nabin Hait
e1433aab30
[fix] Fixed party update status patch
2016-04-09 16:12:40 +05:30
Rushabh Mehta
f16f9c569b
[enhancement] add status in customer, supplier
2016-04-08 17:21:00 +05:30
Anand Doshi
4b207647db
[fix] sanitize html of product bundle description
2016-04-05 18:34:11 +05:30
Nabin Hait
3a15c92c5e
Fixed Asset Depreciation first commit
2016-03-29 11:54:37 +05:30
Rushabh Mehta
c20c536f28
[fix] [wip] cleanup for collaborative pm
2016-03-25 17:22:17 +05:30
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