Nabin Hait
46bccb55c5
Merge pull request #8080 from rmehta/item-variants-by-mfg
...
[feature] ability to have variants based on manufacturer
2017-03-23 16:29:41 +05:30
Rushabh Mehta
a07c43fd68
[feature] ability to have variants based on manufacturer
2017-03-21 17:48:34 +01:00
Rohit Waghchaure
6ee91ec9c6
on selection of row highlight the background in the cart
2017-03-21 15:55:09 +05:30
rohitwaghchaure
2b9c95a940
Merge pull request #8043 from rohitwaghchaure/pos_issue_v8
...
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 17:56:20 +05:30
Rohit Waghchaure
75177c0e35
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
2017-03-16 15:47:25 +05:30
Faris Ansari
d79f239001
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-16 12:18:35 +05:30
mbauskar
27efc91db0
[minor] make item code mandatory if update_stock is selected
2017-03-15 18:57:18 +05:30
Rushabh Mehta
f340e19ea7
[minor] field re-arrangements in sales invoice, purchase invoice, stock reco
2017-03-15 15:12:43 +05:30
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
mbauskar
f54b1047b8
[minor] custom script to create issue, lead, opportunity from email
2017-03-14 17:57:47 +05:30
Rushabh Mehta
6b53792aea
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Rohit Waghchaure
87fa59a710
[Fix] Customer delete, customer edit functionality, added country field in the pos profile
2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398
[pos] ui cleanup
2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e
minor fix
2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779
ui cleanup
2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6
[pos] cleanup
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0
fixed pos numeric keypad functionality
2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a
minor changes
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9
Provision to edit customer and address details
2017-03-10 17:00:42 +05:30
Faris Ansari
adcb3c62fa
wip
2017-03-10 17:00:42 +05:30
Rohit Waghchaure
3b5a412a9c
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
56a7974b58
added event on numeric keypad
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4
[Enhancement] POS, numeric keypad
2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695
UI changes
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161
offline email for POS
2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f
added event on numeric keypad
2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af
[Enhancement] POS, numeric keypad
2017-03-10 17:00:40 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Rohit Waghchaure
2087e574aa
[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working
2017-02-27 13:43:04 +05:30
Kanchan Chauhan
6981870a40
[Fix] Add Serial No fix for other langauges
2017-02-27 12:54:13 +05:30
Neil Trini Lasrado
e4903b77b6
Added New Doctype - Assessment Code
2017-02-24 13:16:46 +05:30
Rushabh Mehta
509543752c
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
2017-02-23 17:03:46 +05:30
Manas Solanki
f869a679ae
Fixed Student Attendence
2017-02-21 18:49:00 +05:30
Nabin Hait
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
Nabin Hait
0d66579e83
Merge branch 'develop' into develop
2017-02-20 19:22:03 +05:30
Nabin Hait
cd837ecbac
Merge branch 'develop' into develop
2017-02-20 19:09:20 +05:30
Nabin Hait
9f4cb0c097
Fixed merge conflict
2017-02-20 15:00:04 +05:30
mbauskar
e1e25a0c9d
[minor] auto close opportunity after 7 days
2017-02-17 14:54:50 +05:30
Nabin Hait
6af7dd4e1b
Set fiscal year start and end date based on country
2017-02-17 14:47:33 +05:30
pratu16x7
462e89e452
[minor] margin fix
2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4
Mobile view fixes
2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90
Website data from existing child tables, layout, images
2017-02-14 17:18:09 +05:30
Kanchan Chauhan
779c581a92
[Minor] List of Contacts
2017-02-13 16:01:52 +05:30
suyashphadtare
049a88cc40
[minor] Show item quantity in warehouse set query
2017-02-10 19:14:43 +05:30
Neil Trini Lasrado
f37d329cf5
Merge branch 'develop' into eval-group
2017-02-02 17:30:10 +05:30
Neil Trini Lasrado
749516c22d
Renamed Evaluation Criteria to Assessment Criteria
2017-02-01 18:47:36 +05:30
rohitwaghchaure
c13dbd408f
[Enhancement] POS Redesign ( #7639 )
...
* item group, discount
* POS Redesign
* offline customer
* removed offline records from modal view
2017-02-01 18:07:22 +05:30
Makarand Bauskar
d893efd0a9
[minor] replace object values in translations ( #7602 )
2017-01-30 12:35:34 +05:30
rohitwaghchaure
3b40098738
Merge pull request #7571 from RicardoJohann/projectfilter
...
added project filter to gl and carry project filter from P&L
2017-01-30 12:24:36 +05:30
mbauskar
51b1d6de48
[minor] moved the address_and_contact utils to frappe
2017-01-30 10:45:28 +05:30
mbauskar
8271b4c564
[minor] fixes in address filters
2017-01-30 10:45:28 +05:30
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Rohit Waghchaure
f58cad6b13
[Fix] Calculate paid amount when is pos is enabled
2017-01-17 12:11:57 +05:30
Nabin Hait
03f82240fa
Merge pull request #7222 from neilLasrado/assessment
...
Redesign Assessment Module
2017-01-17 11:04:02 +05:30
Rushabh Mehta
8d39fd9790
[fix] address queries + tests
2017-01-16 13:06:15 +05:30
Neil Trini Lasrado
38bd62d82d
Merge branch 'develop' into assessment
2017-01-16 12:23:51 +05:30
Rushabh Mehta
b92087cb2d
[cleanup] move contact, address to frappe 💥
2017-01-13 18:54:47 +05:30
robert schouten
7a3d418aa5
Email inbox based off of frappe email inbox pr ( #7308 )
...
* email inbox
* inbox fixes
* separate email-inbox to pass tests
* separate email-inbox to pass tests
* fix import
* add more info to contact and address
2017-01-13 14:51:09 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Rohit Waghchaure
8afe267813
[Fix] POS issues
2017-01-12 15:22:02 +05:30
Neil Trini Lasrado
2a9e0f6fd8
Added assessment result tool
2017-01-10 17:32:02 +05:30
Rushabh Mehta
d40e661ebd
[style] better demo start page
2017-01-10 14:46:54 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
Nabin Hait
202bcc09d5
Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues
...
[Enhancement] POS features
2017-01-04 15:15:32 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
ce5f942678
Merge branch 'master' into develop
2016-12-30 15:54:32 +05:30
Rohit Waghchaure
585448b225
set default terms and condition if tc_name is available on the form
2016-12-30 15:41:55 +05:30
Rohit Waghchaure
bef185c404
restrict user to edit the rate in the POS
2016-12-28 15:16:49 +05:30
Faris Ansari
0822e41f96
pos item area scrollable
2016-12-21 18:17:00 +05:30
Nabin Hait
3a8ea2a3bb
Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2
...
[POS] Provision to delete the offline records
2016-12-14 12:52:28 +05:30
Nabin Hait
82ce67d49a
Merge pull request #7190 from KanchanChauhan/jinja-in-tc
...
Jinja template in Terms and Conditions
2016-12-13 11:25:07 +05:30
Kanchan Chauhan
b642625ed2
Jinja template in Terms and Conditions
2016-12-12 17:34:30 +05:30
Rohit Waghchaure
9f2cc382a8
[POS] Provision to delete the offline records
2016-12-12 17:15:47 +05:30
Nabin Hait
0fa0af18cc
Merge pull request #7175 from neilLasrado/develop
...
Student Attendance Tool
2016-12-12 15:03:59 +05:30
Neil Trini Lasrado
eccbf43235
Renamed Student Batch Attendance Tool to Student Attendance Tool
...
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
2016-12-09 17:41:09 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
87d70279c6
get exchange rate on change of date
2016-12-08 14:43:11 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Rohit Waghchaure
c857f37f3a
[fix] currecny symbol for customer's total annual billing, total unpaid amount
2016-12-05 17:44:06 +05:30
Nabin Hait
3f1c50a483
Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo
...
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-05 16:51:42 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1
[Fix] Fetch Serial No by default for Delivery Note Item
2016-12-02 18:18:04 +05:30
bhupen
3c7e70ffb3
[Fix] Disallow same items to be fetched multiple times in sales invoice
2016-11-30 14:32:11 +05:30
Rohit Waghchaure
b1b328865e
[Enhancement] Currency added in the BOM
2016-11-22 12:52:20 +05:30
Nabin Hait
8af429da1f
Cleanup and fixes in quality inspection feature
2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39
[Fix] Delivery Note fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
34feab1b25
[Fix] Redesign of quality inspection doctype
2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4
[Fix] Quality Inspection in Purchase Invoice fixed
2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6
Function in parent transaction.js and call from corresponding files
2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5
Quality Inspection Issue
...
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
2016-11-16 17:22:38 +05:30
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
Rushabh Mehta
440650d4a2
[fix] view shopping cart dropdown ( #6928 )
2016-11-14 13:13:53 +05:30
pratu16x7
84228402e6
Update erpnext manual link ( #6853 )
...
* Update erpnext manual link
* Update README.md
* Update conf.js
2016-11-07 17:18:15 +05:30
Nabin Hait
eab38cd4eb
Merge branch 'master' into develop
2016-11-03 15:17:39 +05:30
Nabin Hait
9f5f534900
set item rate on first selection of item
2016-11-03 14:54:06 +05:30
