Nabin Hait
|
cd13a28417
|
Get items from quotation in sales invoice
|
2017-11-14 17:13:53 +05:30 |
|
AravindPranera
|
86e726158b
|
Getting Quotation Document in Sales Invoice
|
2017-11-14 17:13:53 +05:30 |
|
Prateeksha Singh
|
17b7209032
|
remove erroneous column breaks (#11522)
|
2017-11-10 18:54:03 +05:30 |
|
Saurabh
|
a5275a1ba9
|
Merge branch 'master' into develop
|
2017-11-10 15:53:44 +05:30 |
|
Rohit Waghchaure
|
a5e3c3a79f
|
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
|
2017-11-10 15:29:26 +05:30 |
|
Pawan Mehta
|
1368ba00bc
|
[fix] #11337 (#11339)
|
2017-11-10 14:59:26 +05:30 |
|
Nabin Hait
|
ff73646212
|
Made POS Profile mandatory and changed test order
|
2017-11-08 14:34:38 +05:30 |
|
Saurabh
|
98aa544f25
|
Merge branch 'master' into staging
|
2017-11-08 12:18:50 +05:30 |
|
Saurabh
|
f41b13b736
|
[fix] merge-conflicts
|
2017-11-08 12:18:41 +05:30 |
|
Sushant Nadkar
|
72c40f0383
|
Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440)
|
2017-11-08 11:35:46 +05:30 |
|
Rohit Waghchaure
|
57cc924d29
|
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
|
2017-11-06 18:42:37 +05:30 |
|
rohitwaghchaure
|
bcb7854340
|
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
[Enhancement] Allow Multiple users in POS Profile
|
2017-11-06 16:45:01 +05:30 |
|
Faris Ansari
|
cbaa0e629c
|
fix codacy
|
2017-11-03 11:35:49 +05:30 |
|
Saurabh
|
62fd4007b0
|
Merge branch 'master' into staging
|
2017-11-02 12:14:42 +05:30 |
|
Saurabh
|
3be72ef187
|
Merge branch 'master' into develop
|
2017-11-02 12:14:41 +05:30 |
|
Faris Ansari
|
3d59179205
|
Load default pos profile if not found
|
2017-10-31 21:56:16 +05:30 |
|
Rohit Waghchaure
|
5ec9f6930b
|
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
|
2017-10-31 15:26:56 +05:30 |
|
Faris Ansari
|
895aa7b7ac
|
fix codacy
|
2017-10-30 17:12:50 +05:30 |
|
Faris Ansari
|
7095de03ef
|
Merge branch 'develop' into multiple-users-pos-profile
|
2017-10-30 15:00:55 +05:30 |
|
Nabin Hait
|
c799a22d55
|
Merge branch 'master' into staging
|
2017-10-26 14:35:34 +05:30 |
|
Nabin Hait
|
edef9811f9
|
Merge branch 'master' into develop
|
2017-10-26 14:35:34 +05:30 |
|
Faris Ansari
|
6887cedaea
|
[fix] item qty trigger (#11349)
|
2017-10-26 14:34:15 +05:30 |
|
Saurabh
|
b445633e56
|
Merge branch 'master' into staging
|
2017-10-26 09:59:22 +05:30 |
|
Saurabh
|
0d597cef8d
|
Merge branch 'master' into develop
|
2017-10-26 09:59:22 +05:30 |
|
rohitwaghchaure
|
c65f1d7745
|
Search item using name instead of item code (#11327)
|
2017-10-25 17:04:56 +05:30 |
|
Nabin Hait
|
4d22b6db30
|
Fixed Merge Conflict
|
2017-10-25 14:09:46 +05:30 |
|
Nabin Hait
|
cd3dbcb2ef
|
Fixed Merge Conflict
|
2017-10-25 14:07:25 +05:30 |
|
rohitwaghchaure
|
4a60554b91
|
Green indicator in the cart for non stock item (#11325)
|
2017-10-25 13:59:29 +05:30 |
|
tundebabzy
|
bafcd7418a
|
Add Bundle Description Field To Product Bundle (#11122)
* add description field that shows in list view
* description field should be simply `description`
|
2017-10-25 12:22:08 +05:30 |
|
Nabin Hait
|
1c1237537b
|
Subscription fixes (#11292)
* Subscription fixes
* Removed recurring fields, cleanup code
|
2017-10-25 12:10:44 +05:30 |
|
Rushabh Mehta
|
bc4e2cd9c1
|
[added] hospitality domain (#11020)
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
|
2017-10-17 12:30:34 +05:30 |
|
mbauskar
|
cd4202c2f7
|
Merge branch 'master' into develop
|
2017-10-15 19:10:56 +05:30 |
|
rohitwaghchaure
|
8bf7230fcc
|
[Fix] New invoice showing old paid amount if POS Profile is not created (#11160)
|
2017-10-15 19:09:14 +05:30 |
|
Saurabh
|
5ffed60916
|
Merge branch 'master' into develop
|
2017-10-11 14:39:11 +05:30 |
|
rohitwaghchaure
|
76a9cefc9c
|
Merge pull request #11151 from rohitwaghchaure/minor_fix_title
[minor] Title not showing in payment modal
|
2017-10-11 12:05:29 +05:30 |
|
Rohit Waghchaure
|
4f7873b9df
|
[minor] Title not showing in payment modal
|
2017-10-11 12:03:49 +05:30 |
|
Saurabh
|
ad9afe68f3
|
Merge pull request #11119 from rohitwaghchaure/default_company_pos
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
|
2017-10-11 12:00:56 +05:30 |
|
Rohit Waghchaure
|
3f309e1c20
|
Multiple items showing for single barcode
|
2017-10-11 02:14:56 +05:30 |
|
Rohit Waghchaure
|
9bb81ee1cb
|
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
|
2017-10-11 01:54:36 +05:30 |
|
mbauskar
|
966b3c156a
|
[conflicts] resolved merge conflicts
|
2017-10-09 15:20:30 +05:30 |
|
Rohit Waghchaure
|
d270748eea
|
[Fix] Provision to select company in the POS screen if company is not defined in the global defaults
|
2017-10-09 12:54:26 +05:30 |
|
Rohit Waghchaure
|
62ce218fc2
|
Show total instead of net total
|
2017-10-06 11:16:46 +05:30 |
|
Nabin Hait
|
5a834209d0
|
Cleanup of PO schedule date pull requests
|
2017-10-05 19:51:10 +05:30 |
|
rohitwaghchaure
|
e0dfd1608e
|
[Fix] Auto add item in the cart if sinfle items found in the serach (#11072)
|
2017-10-05 18:30:51 +05:30 |
|
Nabin Hait
|
395cf4689b
|
Cleanup of schedule date functionality in Material Request
|
2017-10-05 18:27:37 +05:30 |
|
rohitwaghchaure
|
607b5d4985
|
[Fix] Negative qty issue in POS (#11070)
* [Fix] Negative qty issue in POS
* Update point_of_sale.js
|
2017-10-05 15:57:58 +05:30 |
|
Rohit Waghchaure
|
f7a856b913
|
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
|
2017-10-05 13:31:29 +05:30 |
|
Nabin Hait
|
b779644493
|
Merge branch 'master' into develop
|
2017-10-04 14:52:32 +05:30 |
|
rohitwaghchaure
|
5049edb494
|
[Fix] Discount and serial no search issue (#11040)
|
2017-10-04 14:33:12 +05:30 |
|
Saurabh
|
ee4a2dd26f
|
[fix] resolved merge conflicts
|
2017-10-03 18:02:09 +05:30 |
|