Nabin Hait
|
310d64d565
|
Fixed conflict
|
2016-05-26 16:10:02 +05:30 |
|
Nabin Hait
|
b46d021f2a
|
Charts on reports / activity page, deprecated financial analytics report
|
2016-05-26 15:26:01 +05:30 |
|
Rohit Waghchaure
|
62dbbfba0d
|
[Fix] during making of material request from sales order, system fetching product bundle items only if so has both product bundle and purchase item
|
2016-05-20 17:09:29 +05:30 |
|
Rushabh Mehta
|
d0cee1b61b
|
[fix] minor fixes to pos
|
2016-05-20 12:54:59 +05:30 |
|
Rushabh Mehta
|
532eedf411
|
[enhance] more editable grids
|
2016-05-19 18:22:49 +05:30 |
|
Umair Sayyed
|
90cea14ce3
|
domanifying EPRNext, fixes #5334
|
2016-05-13 18:06:17 +05:30 |
|
Anand Doshi
|
a3f20ae9e6
|
Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup
Shopping Cart error messages issue resolved
|
2016-05-10 17:35:02 +05:30 |
|
Kanchan Chauhan
|
1d79f350bc
|
Shopping Cart error messages issue resolved
|
2016-05-10 17:19:47 +05:30 |
|
Rohit Waghchaure
|
6087fe178e
|
[Enhancement] POS
|
2016-05-09 23:36:15 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Rushabh Mehta
|
1aa1c8a9ef
|
[minor] remove hide_first in forms
|
2016-04-29 12:20:23 +05:30 |
|
Anand Doshi
|
e3bd78e912
|
[css] portal
|
2016-04-22 18:53:21 +05:30 |
|
Rushabh Mehta
|
621283c5c5
|
[enhancement] stock balance page
|
2016-04-21 19:00:34 +05:30 |
|
Rushabh Mehta
|
c291ab64a6
|
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
[WIP] No not merge
|
2016-04-21 11:39:45 +05:30 |
|
Rushabh Mehta
|
02772442b6
|
[cleanup] added dashboard in project
|
2016-04-20 18:45:56 +05:30 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +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 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +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 |
|
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 |
|
Umair Sayyed
|
6269f1e3d0
|
address and contact related fields re-arranged in the sales transactions fixes #5192
|
2016-04-14 13:07:41 +05:30 |
|
Rushabh Mehta
|
0e2dd859b0
|
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
|
2016-04-13 17:22:09 +05:30 |
|
Nabin Hait
|
7132bd3659
|
[fix] Ignore closed sales order in credit limit validation
|
2016-04-13 15:19:37 +05:30 |
|
Nabin Hait
|
c2ae1a7375
|
fixed merge conflict
|
2016-04-13 11:55:15 +05:30 |
|
Rushabh Mehta
|
8bbca6fa2e
|
[enhancement] links menu in customer, supplier, item
|
2016-04-12 19:16:33 +05:30 |
|
Nabin Hait
|
9fef3df6a0
|
[fix] Fixed pending so items for material request report
|
2016-04-12 18:46:47 +05:30 |
|
Rushabh Mehta
|
5d0e8dee11
|
[fix] dashboard for customer, supplier
|
2016-04-11 17:34:49 +05:30 |
|
Rushabh Mehta
|
6fe962e6ad
|
[test] fixed circular dependencies
|
2016-04-08 17:55:11 +05:30 |
|
Anand Doshi
|
2f957f27b0
|
[fix] apply Tax Rule for lead
|
2016-04-08 17:43:08 +05:30 |
|
Rushabh Mehta
|
dda1349a2d
|
[minor] [fix] typo in customer_list.js
|
2016-04-08 17:22:52 +05:30 |
|
Rushabh Mehta
|
f16f9c569b
|
[enhancement] add status in customer, supplier
|
2016-04-08 17:21:00 +05:30 |
|
Rushabh Mehta
|
203cc962f5
|
[enhancement] Item Selector
|
2016-04-08 17:21:00 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Rushabh Mehta
|
d690094b12
|
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
|
2016-04-04 16:57:56 +05:30 |
|
Nabin Hait
|
4f10f15686
|
[fix] Modified date changed in query report due to project field renaming
|
2016-04-01 17:59:06 +05:30 |
|
Rushabh Mehta
|
45c6b550f0
|
[cleanup] assets and made items mandatory in transactions
|
2016-03-31 15:37:51 +05:30 |
|
Rushabh Mehta
|
652dee45a6
|
[minor] make margin collapsible
|
2016-03-29 16:42:13 +05:30 |
|
Rushabh Mehta
|
3117b4b8d6
|
[fix] minor for quick-entry
|
2016-03-29 11:53:17 +05:30 |
|
Rushabh Mehta
|
e1b20a0b29
|
Merge pull request #5044 from rohitwaghchaure/add_margin_feature
[Enhancement] Add margin in sales flow.
|
2016-03-28 18:27:05 +05:30 |
|
Rushabh Mehta
|
c20c536f28
|
[fix] [wip] cleanup for collaborative pm
|
2016-03-25 17:22:17 +05:30 |
|
mbauskar
|
a52472cf5b
|
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
|
2016-03-24 14:07:51 +05:30 |
|
mbauskar
|
75b6fbb6a7
|
[fix] apply pricing rule added type and rate on ignore pricing rule trigger
|
2016-03-24 14:07:50 +05:30 |
|
mbauskar
|
b6d19bcfc2
|
[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item
|
2016-03-24 14:07:50 +05:30 |
|
mbauskar
|
dcd8b7773d
|
[fix] calculated rate on py side, added depends on for sales order item
|
2016-03-24 14:07:50 +05:30 |
|
mbauskar
|
1e428ae400
|
[fix] function to calculate the revised margin and rate
|
2016-03-24 14:07:50 +05:30 |
|
mbauskar
|
5e76a1cffa
|
[fix] added eval for total margin and margin rate field
|
2016-03-24 14:07:50 +05:30 |
|
mbauskar
|
e40736c105
|
test case for quotation
|
2016-03-24 14:07:49 +05:30 |
|
mbauskar
|
5738dd473c
|
set the target.ignore_pricing_rule to 0
|
2016-03-24 14:07:49 +05:30 |
|
mbauskar
|
1e9c1640fa
|
triggers on Margin type and Margin rate fields to calculate the revised Total Margin and Rate
|
2016-03-24 14:07:49 +05:30 |
|
mbauskar
|
8c8fa17a9b
|
[new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item
|
2016-03-24 14:07:48 +05:30 |
|
Rushabh Mehta
|
b07b06dde0
|
Merge pull request #5011 from neilLasrado/develop
[WIP] - Added Project to Manufacturing
|
2016-03-23 11:45:35 +05:30 |
|
Nabin Hait
|
c8baa01e9c
|
[fix] Updated modified datetime
|
2016-03-21 17:20:03 +05:30 |
|
Neil Trini Lasrado
|
11dafa27ba
|
Added Project to materail request
|
2016-03-21 12:40:42 +05:30 |
|
Nabin Hait
|
5996b2f1bb
|
[fix] recurring document logic
|
2016-03-18 15:19:54 +05:30 |
|
rohitwaghchaure
|
90ff509f6d
|
[fix]Earlier recurring billing
|
2016-03-18 10:44:53 +05:30 |
|
Saurabh
|
14d646f636
|
[fixes] shipping address on purchase flow
|
2016-03-16 16:23:30 +05:30 |
|
Nabin Hait
|
91a69e4a8d
|
Merge pull request #4992 from neilLasrado/project-rename
Fixed bug while selecting project in sales_invoice, sales_order, deli…
|
2016-03-16 16:03:18 +05:30 |
|
Neil Trini Lasrado
|
f433a5a124
|
Fixed bug while selecting project in sales_invoice, sales_order, delivery_note
|
2016-03-16 16:00:27 +05:30 |
|
Nabin Hait
|
2a5c1138a0
|
Merge pull request #4944 from rmehta/modules-redesign
[redesign] modules
|
2016-03-16 14:35:11 +05:30 |
|
Neil Trini Lasrado
|
6e343e23d9
|
Renamed project_name to project
|
2016-03-15 17:50:53 +05:30 |
|
Nabin Hait
|
5fc9552d29
|
Merge pull request #4980 from rohitwaghchaure/support_week_14_03
[fixes]Unable set recurring date in sales order
|
2016-03-14 19:20:13 +05:30 |
|
Nabin Hait
|
b1f0a7d52e
|
Merge pull request #4876 from saurabh6790/valuation_rate_on_so
[enhancement] get valuation rate and gross profit on sales order item
|
2016-03-14 19:18:58 +05:30 |
|
rohitwaghchaure
|
c54b805981
|
[fixes]Unable set recurring date in sales order
|
2016-03-14 19:03:22 +05:30 |
|
Valmik Jangla
|
98ec1164fc
|
Removed from Attendance, Upload Attendance, and Sales Order
|
2016-03-11 13:07:16 +05:30 |
|
Valmik Jangla
|
865d547965
|
Removed from GL Entry, Opportunity and Quotation
|
2016-03-11 13:05:20 +05:30 |
|
Valmik Jangla
|
1d797c1688
|
Removed from Installation Note
|
2016-03-11 13:05:19 +05:30 |
|
Saurabh
|
3fbf3ce852
|
[fixes] raise if selects product bundle as sub item in another product bundle.
|
2016-03-09 15:42:01 +05:30 |
|
Saurabh
|
5ada14b887
|
[fixes] calculate valuation rate for non stock item
|
2016-03-09 15:42:01 +05:30 |
|
Saurabh
|
2d7af63351
|
[fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate
|
2016-03-09 15:42:00 +05:30 |
|
Saurabh
|
d313553ae3
|
[enhancement] get valuation rate and gross profit on sales order item
|
2016-03-09 15:42:00 +05:30 |
|
Rushabh Mehta
|
d1e1c52171
|
[redesign] modules
|
2016-03-08 18:07:20 +05:30 |
|
Rushabh Mehta
|
1396b776bc
|
[fix] print hide for submit_on_creation
|
2016-03-03 13:57:15 +05:30 |
|
Rushabh Mehta
|
7114b7786e
|
[fix] print hide for submit_on_create
|
2016-03-03 13:12:21 +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 |
|
Rushabh Mehta
|
aac4dcedc8
|
[fix] print language and contact_email fields and removed translations
|
2016-03-02 15:45:09 +05:30 |
|
Rushabh Mehta
|
cbed331047
|
Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test
Multilingual print format test
|
2016-03-01 17:10:50 +05:30 |
|
rohitwaghchaure
|
4151e3dc92
|
[enhancement] Multi-lingual print format
|
2016-03-01 16:33:08 +05:30 |
|
Rushabh Mehta
|
39a6f804bf
|
Merge pull request #4871 from ShashaQin/patch-27
Improvements about recurring documents
|
2016-03-01 16:06:33 +05:30 |
|
Saurabh
|
cc7132763f
|
[fixes] set projected qty in Quotaion Item table
|
2016-02-26 18:33:53 +05:30 |
|
ShashaQin
|
73c71f9dd5
|
Update sales_order.json
|
2016-02-25 11:22:27 +08:00 |
|
sbkolate
|
f9a9754dab
|
opportunities status fix in Sales Funnel report
reference https://discuss.erpnext.com/t/sales-funnel-not-showing-updated-opportunities/10702/4
|
2016-02-24 19:25:35 +05:30 |
|
Anand Doshi
|
acd1bcffde
|
[fix] changed field type to Code
|
2016-02-24 12:38:08 +05:30 |
|
Nabin Hait
|
57b30430e4
|
Merge pull request #4695 from neilLasrado/develop
Material Request of type Manufcture
|
2016-02-24 12:30:53 +05:30 |
|
Nabin Hait
|
d2d261dc87
|
Merge pull request #4854 from patilsangram/develop
Removed Stop Button from SO and PO
|
2016-02-24 11:21:17 +05:30 |
|
patilsangram
|
a812d67837
|
[fixes]
|
2016-02-23 19:04:29 +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 |
|
Saurabh
|
ac33724656
|
[fixes] removed no copy for warehouse field
|
2016-02-23 18:18:04 +05:30 |
|
Saurabh
|
3724448cd3
|
[fixes] typo-fixes and fix in balance qty fetching
|
2016-02-23 18:18:04 +05:30 |
|
Saurabh
|
dcb72c6be7
|
[enhance] Displaying stock balance while creating quotation
|
2016-02-23 18:18:04 +05:30 |
|
Nabin Hait
|
8a59c33e2f
|
[fix] Sales Person target variance report: based on lft and rgt of item group
|
2016-02-23 15:23:24 +05:30 |
|
saurabh
|
fb71f32ebf
|
conflicts resolved
|
2016-02-23 02:26:37 +05:30 |
|
saurabh
|
2e2dd0fb42
|
Documentation of multilingual print format and minor fixes
|
2016-02-23 02:17:04 +05:30 |
|
saurabh
|
c422c23813
|
import method to load all languages in language field on customer form
|
2016-02-23 02:17:03 +05:30 |
|
saurabh
|
65820ed013
|
added new field language for users
|
2016-02-23 02:17:03 +05:30 |
|
patilsangram
|
bf2b511988
|
[Removed Stop Button from SO and PO]
|
2016-02-22 16:24:23 +05:30 |
|
saurabh
|
755fefbfd4
|
import method to load all languages in language field on customer form
|
2016-02-19 11:46:29 +05:30 |
|