Makarand Bauskar
|
eaf0abedd4
|
[hotfix] ignore if student email address field value is None (#11116)
|
2017-10-09 12:42:18 +05:30 |
|
rohitwaghchaure
|
6f5853b97a
|
Merge pull request #11092 from rohitwaghchaure/pos_total_issue
Show total instead of net total
|
2017-10-06 11:17:24 +05:30 |
|
Rohit Waghchaure
|
62ce218fc2
|
Show total instead of net total
|
2017-10-06 11:16:46 +05:30 |
|
rohitwaghchaure
|
1b0f3ec666
|
Merge pull request #11089 from rohitwaghchaure/offline_pos_v9
[Fix] Discount field not displaying in offline POS
|
2017-10-06 09:51:30 +05:30 |
|
Rohit Waghchaure
|
beeba8b37a
|
[Fix] Discount field not displaying in offline POS
|
2017-10-06 09:50:43 +05:30 |
|
rohitwaghchaure
|
d7636b2b19
|
Merge pull request #11083 from rohitwaghchaure/pos_print_format_issue
[fix] Online print format in pos profile field not displaying
|
2017-10-06 09:44:27 +05:30 |
|
Rohit Waghchaure
|
b870d0081b
|
[fix] Online print format in pos profile field not displaying
|
2017-10-06 09:31:40 +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 |
|
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 |
|
Makarand Bauskar
|
f23788bb7d
|
[hotfix] Show Make button only for Email communication (#10876)
|
2017-10-05 14:19:45 +05:30 |
|
mbauskar
|
671c6610de
|
Merge branch 'hotfix'
|
2017-10-05 13:36:49 +05:30 |
|
mbauskar
|
8c3d19e2ab
|
bumped to version 9.1.1
|
2017-10-05 14:06:49 +06:00 |
|
rohitwaghchaure
|
4a5ac7cea6
|
Merge pull request #11066 from rohitwaghchaure/pos_loading_issue
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
|
2017-10-05 13:34:22 +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
|
7d4fd35aa3
|
Add POS Settings link in Accounts module (#11060)
|
2017-10-05 12:20:33 +05:30 |
|
rohitwaghchaure
|
e87a076f1d
|
Update link in the pos for offline and online mode from pos settings (#11061)
|
2017-10-05 12:20:20 +05:30 |
|
Nabin Hait
|
ff689a658f
|
Merge branch 'staging'
|
2017-10-04 18:21:35 +05:30 |
|
Nabin Hait
|
b290e3a4e7
|
bumped to version 9.1.0
|
2017-10-04 18:51:34 +06:00 |
|
Nabin Hait
|
77f0822abe
|
Merge branch 'develop' into staging
|
2017-10-04 18:11:16 +05:30 |
|
Nabin Hait
|
f83bc51e81
|
Merge branch 'master' into staging
|
2017-10-04 18:05:21 +05:30 |
|
Nabin Hait
|
fc712aea32
|
Merge branch 'master' into develop
|
2017-10-04 18:05:20 +05:30 |
|
Nabin Hait
|
7105c4b76c
|
Merge branch 'hotfix'
|
2017-10-04 18:05:19 +05:30 |
|
Nabin Hait
|
54c725dcd1
|
bumped to version 9.0.9
|
2017-10-04 18:35:19 +06:00 |
|
rohitwaghchaure
|
1e2c554e61
|
[Fix] Stock entry multi uom batch validation issue (#11049)
|
2017-10-04 17:52:49 +05:30 |
|
tundebabzy
|
65dfd09947
|
fix wrong variable name (#11050)
|
2017-10-04 17:51:44 +05:30 |
|
Javier Wong
|
61287e3c53
|
[fix] Change Sample Item Error Message to Zero Valuation Rate (#10935)
Change Sample Item Error Message to Zero Valuation Rate
|
2017-10-04 16:01:34 +05:30 |
|
Makarand Bauskar
|
1b67d71139
|
[minor] add the Lead in email account -> append_to field (#10983)
|
2017-10-04 15:55:56 +05:30 |
|
Doridel Cahanap
|
32456b0f14
|
[minor edits] BOM Stock Report (#11012)
* HTML for BOM Stock Report to show filters in PDF
* Added BOM Stock Report in Manufacturing Config under Report
|
2017-10-04 15:54:44 +05:30 |
|
Nabin Hait
|
3d0d4b2157
|
update subscription period only if relevant date field exists (#11046)
|
2017-10-04 15:51:55 +05:30 |
|
Nabin Hait
|
7e5a9f5c0e
|
Update new bom rate while replacing BOM (#11045)
|
2017-10-04 15:51:34 +05:30 |
|
KanchanChauhan
|
d3e21fff66
|
[Minor] Employee name as standard filter (#11043)
|
2017-10-04 15:20:34 +05:30 |
|
Nabin Hait
|
5171956646
|
Merge branch 'master' into staging
|
2017-10-04 14:52:33 +05:30 |
|
Nabin Hait
|
0cc93538ed
|
Merge branch 'hotfix'
|
2017-10-04 14:52:32 +05:30 |
|
Nabin Hait
|
b779644493
|
Merge branch 'master' into develop
|
2017-10-04 14:52:32 +05:30 |
|
Nabin Hait
|
c83e793ce8
|
bumped to version 9.0.8
|
2017-10-04 15:22:31 +06:00 |
|
Revant Nandgaonkar
|
4d68e03a97
|
[Fix] Job Opening Web Form breadcrumb (#11029)
|
2017-10-04 14:35:21 +05:30 |
|
Makarand Bauskar
|
eaec4695f7
|
[hotfix] filter doctype if the doctype has subscription field (#11038)
|
2017-10-04 14:34:45 +05:30 |
|
rohitwaghchaure
|
5049edb494
|
[Fix] Discount and serial no search issue (#11040)
|
2017-10-04 14:33:12 +05:30 |
|
Makarand Bauskar
|
d17bea0a31
|
[hotfix] check minimum actual start time and actual end time before updating PO Operations (#11041)
* [hotfix] check minimum actual start time and actual end time before updating PO Operations
* Update production_order.py
|
2017-10-04 14:30:12 +05:30 |
|
Saurabh
|
444bfff1ff
|
[fix] resolved merge conflicts
|
2017-10-03 18:03:18 +05:30 |
|
Saurabh
|
ee4a2dd26f
|
[fix] resolved merge conflicts
|
2017-10-03 18:02:09 +05:30 |
|
Saurabh
|
f6580268e6
|
Merge branch 'hotfix'
|
2017-10-03 18:00:32 +05:30 |
|
Saurabh
|
e3a468ed1b
|
bumped to version 9.0.7
|
2017-10-03 18:30:31 +06:00 |
|
rohitwaghchaure
|
9e6f2a49e8
|
Merge pull request #11033 from rohitwaghchaure/subscription_next_data_fix
[Fix] Subscription next schedule date, cancel issue, added from and to date
|
2017-10-03 17:48:53 +05:30 |
|
Rohit Waghchaure
|
445e8a2e57
|
[Fix] Subscription end date, cancel issue, added from and to date
|
2017-10-03 17:45:11 +05:30 |
|
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 |
|
rohitwaghchaure
|
c26e3f1569
|
Merge pull request #11024 from rohitwaghchaure/payment_issue_in_pos
[Fix] Old invoice payment amount showing in the payment modal while making payment
|
2017-10-02 22:29:49 +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
|
1f10d693e9
|
Don't set currency as company currency if default currency is different (#11011)
|
2017-10-02 13:20:51 +05:30 |
|