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 |
|
tunde
|
37c2b6116c
|
Merge branch 'develop' into payment-terms
|
2017-10-09 15:42:47 +01:00 |
|
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 |
|
tunde
|
d82677f1e6
|
Merge branch 'develop' into payment-terms
|
2017-10-06 02:23:45 +01:00 |
|
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 |
|
tunde
|
19e63b73ed
|
Merge branch 'develop' into payment-terms
|
2017-10-03 12:02:38 +01:00 |
|
Nabin Hait
|
7b6eaee05b
|
Fixes to handle async events (#11018)
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
|
2017-10-03 01:09:46 +05:30 |
|
Rohit Waghchaure
|
c4e52e5f95
|
[Fix] Old invoice payment amount showing in the payment modal while making payment
|
2017-10-02 21:20:54 +05:30 |
|
Nabin Hait
|
7eba1a35d3
|
Controller init args fix (#11015)
* Controller init args fix
* cleanup useless code
|
2017-10-02 15:59:27 +05:30 |
|
Nabin Hait
|
8919669ac2
|
Merge branch 'master' into develop
|
2017-10-02 12:28:27 +05:30 |
|
rohitwaghchaure
|
88491715e0
|
[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)
|
2017-10-02 12:13:36 +05:30 |
|
Sunny
|
869b878286
|
set schedule_Date when creating po
|
2017-10-02 11:36:24 +08:00 |
|
Faris Ansari
|
8ac56b26e0
|
[Enhancement] Allow Multiple users in POS Profile
|
2017-09-29 16:15:15 +05:30 |
|
tunde
|
3415ac6e9c
|
Merge branch 'develop' into payment-terms
|
2017-09-29 10:10:24 +01:00 |
|
Nabin Hait
|
c314485d55
|
Fixes based on test case
|
2017-09-28 18:55:49 +05:30 |
|
tunde
|
18764a12c4
|
increase point-of-sale timeout to fix UI test
|
2017-09-28 11:47:27 +01:00 |
|
tunde
|
d348c12bdb
|
fix sales order ui test
|
2017-09-28 09:46:31 +01:00 |
|
rohitwaghchaure
|
94799a8b93
|
[fix] ‘NoneType’ object is not iterable onload of POS (#10941)
|
2017-09-28 10:56:27 +05:30 |
|
Makarand Bauskar
|
70eaf2da95
|
[minor] removed the default precision for the margin_rate_or_amount field (#10923)
|
2017-09-27 12:49:16 +05:30 |
|
Rohit Waghchaure
|
87e994e0a2
|
[fixed] Disocunt amount not working for POS
|
2017-09-27 12:16:58 +05:30 |
|
tunde
|
567119170e
|
Merge branch 'develop' into payment-terms
|
2017-09-26 17:28:07 +01:00 |
|
tunde
|
9e4dcdfbc8
|
rename Payment Terms Schedule section break to Payment Terms
|
2017-09-26 09:44:23 +01:00 |
|
rohitwaghchaure
|
d4c2d77bba
|
[fix] POS not working if user clicks on back button from form view (#10912)
|
2017-09-26 13:27:06 +05:30 |
|
tunde
|
192587fe56
|
UI test cases
|
2017-09-26 01:32:08 +01:00 |
|
tunde
|
541d3f9567
|
fix ui tests
|
2017-09-25 18:15:47 +01:00 |
|
tunde
|
cd9bc6f795
|
fix failing test
|
2017-09-25 14:51:21 +01:00 |
|
tunde
|
94c3c13ba6
|
fix failing tests
|
2017-09-25 14:47:48 +01:00 |
|
tunde
|
cf42d1db5c
|
more tests
|
2017-09-22 17:20:33 +01:00 |
|
tunde
|
951092eecd
|
fix sales order and pricing rule failing tests
|
2017-09-21 11:14:53 +01:00 |
|
tunde
|
c02f332565
|
Merge branch 'develop' into payment-terms
|
2017-09-20 15:37:34 +01:00 |
|
Nabin Hait
|
b2dca79d89
|
Updated modified timestamp in sales/purchase transaction doctypes
|
2017-09-20 09:56:06 +05:30 |
|
tunde
|
3387d026b1
|
Merge branch 'develop' into payment-terms
|
2017-09-19 18:07:12 +01:00 |
|
Nabin Hait
|
2e4de83df6
|
Rounding Adjustment via a separate field, instead of last tax row (#10659)
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
|
2017-09-19 14:53:16 +05:30 |
|
rohitwaghchaure
|
850eaa73b0
|
Move subscription module to accounts (#10772)
|
2017-09-18 17:23:00 +05:30 |
|
tunde
|
9448f4b13c
|
codacy corrections
|
2017-09-18 12:08:34 +01:00 |
|