Nabin Hait
ae07f22d8b
Fixed syntax error
2017-06-02 13:57:16 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
ac3b2aa913
Set change amount automatically only if it is a cash transaction ( #9065 )
2017-05-30 15:35:01 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
6a541a6f7a
Merge branch 'master' into develop
2017-05-26 21:35:42 +05:30
Francisco Roldán
44c1a610a1
Financial Statements Button translateabled ( #9032 )
2017-05-26 21:32:51 +05:30
Makarand Bauskar
157c334737
[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents ( #9037 )
2017-05-26 21:32:33 +05:30
CH
d0ebd7f7c2
POS translatable fields correction
2017-05-24 17:45:46 +05:30
Nabin Hait
e72c98dafb
On change of item rate, set margin amount on price list rate, instead of margin percentage ( #8988 )
2017-05-24 09:01:44 +05:30
Rohit Waghchaure
8a1c58c3c3
[fix] _ is not defined while accessing the POS
2017-05-19 13:01:32 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +05:30
Rushabh Mehta
f69ffeb0b4
[fix] if rate is greater than price_list_rate, set margin instead of discount. Fixes frappe/erpnext#6468 ( #8856 )
2017-05-17 19:40:40 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Faris Ansari
125996e21c
Increase item cart height in mobile view ( Fixes #8827 ) ( #8846 )
2017-05-16 07:29:15 +05:30
Prateeksha Singh
edeb4dc7e0
Multiselect dialog for getting items ( #8583 )
...
* Concatenate docnames and send to mapper
* Multiselect with checkboxes
* set setters as separate filters
* Map filter fields to target_doc
* Get items from quotation (in SO) working
* [major] Set dialog setters for all forms
* Add date field
* Specify non-default date_fields
* [minor] add test_mapper.py
* [minor] remove cur_frm
* [minor][fix] test
* [minor] fix test with make_test_records
2017-05-15 11:32:06 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Nabin Hait
17179ee83a
minor syntax fix
2017-05-06 13:23:12 +05:30
Nabin Hait
3257aeeb55
Price list rate fix multiple uom and validation with prev doc ( #8718 )
2017-05-06 12:47:14 +05:30
Nabin Hait
6e7407962f
Get exchange rate only if date and currency is present ( #8712 )
...
* Get exchange rate only if date and currency is present
* Update transaction.js
2017-05-06 12:45:16 +05:30
Nabin Hait
fcc0246b38
Get mobile nos for customer contact ( #8674 )
2017-05-04 12:11:48 +05:30
mbauskar
c482aeda1a
[fixes] added missing get_linked_material_requests method to buying utils
2017-05-02 14:05:54 +05:30
Nabin Hait
8c9fb76854
Remove pricing rules if 'Ignore Pricing Rule' manually triggered
2017-04-28 15:20:49 +05:30
Faris Ansari
5687e2da9d
[ui-fix] POS item list
2017-04-24 19:22:05 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
2017-04-19 21:05:37 +05:30
mbauskar
287fe81329
[minor] calculate price list rate based on items uom
2017-04-19 21:05:37 +05:30
CH
61f4a8e757
Make the address type translatable in the Address_HTML field
2017-04-19 20:58:53 +05:30
mbauskar
ba41242f1f
[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493
2017-04-19 20:54:23 +05:30
Rohit Waghchaure
019501e4a0
[fix] Balance Sheet, linking account to general ledger is not working
2017-04-19 20:46:30 +05:30
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
mbauskar
8a2e6f427b
[minor] if address is not found then set the address_field to '' instead of None
2017-04-17 13:58:52 +05:30
Faris Ansari
8371c1c4cd
Text overflow fix for product text in portal
2017-04-17 13:57:19 +05:30
mbauskar
22cedeb006
[minor] POS & RFQ format_number fixes
2017-04-17 12:24:24 +05:30
Faris Ansari
19f90e984e
[POS] Show stock quantity of items
...
- frappe/erpnext#8247
2017-04-12 16:06:31 +05:30
Rushabh Mehta
f0b4562a95
[refactor] move purchase_common.js -> public/js/controllers/buying.js
2017-03-31 17:36:48 +05:30
Rushabh Mehta
b66edd19ca
[minor] refactor transaction.js
2017-03-31 10:50:58 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Rohit Waghchaure
5ecbaa408b
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
2017-03-28 12:09:07 +05:30
Nabin Hait
8bf58367b8
Fixed merge conflict
2017-03-27 12:30:01 +05:30
Nabin Hait
9c8159be8f
Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue
...
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
2017-03-27 12:25:18 +05:30
Nabin Hait
9ba1be60b7
Merge pull request #8039 from netchampfaris/pos-ui-fix
...
[pos] ui fix for small screens frappe/erpnext#8029
2017-03-23 17:14:39 +05:30
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