Nabin Hait
ff73646212
Made POS Profile mandatory and changed test order
2017-11-08 14:34:38 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Achilles Rasquinha
7fd20f303f
moved from MySQLdb to pymysql ( #11462 )
2017-11-08 11:33:24 +05:30
Manas Solanki
40ef7e7039
patch for renaming the pos profile and setting the pos profile name
2017-11-06 13:53:52 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Saurabh
1bc8e32f94
Merge pull request #11360 from manassolanki/fix-fee-patch
...
fix the fee patch
2017-10-27 17:00:11 +05:30
Manas Solanki
8637e52d4c
fix the fee patch
2017-10-27 11:55:15 +05:30
Saurabh
d6e67ce123
[fix] check for null date fields ( #11334 )
2017-10-25 17:44:22 +05:30
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +05:30
Manas Solanki
464289b726
copy the older total amount field and corrsp. changes in report ( #11322 )
2017-10-25 12:13:42 +05:30
Nabin Hait
1c1237537b
Subscription fixes ( #11292 )
...
* Subscription fixes
* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
tundebabzy
cba7a11d75
Make Variant does not copy UOM properties ( #10887 ) ( #11261 )
...
* add `uoms` to Item Variant Settings if not already added
* add new patch to patch list
* change uoms field to no_copy:0
2017-10-25 11:57:10 +05:30
Nabin Hait
7533101d4b
Merge branch 'master' into develop
2017-10-21 11:29:40 +05:30
Nabin Hait
c44290955e
Minor fix in patches ( #11268 )
2017-10-21 11:20:18 +05:30
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Saurabh
3173be9b17
[minor-fix] patch fix
2017-10-18 16:14:20 +05:30
Saurabh
8227422124
[fix] remove explicit variant save
2017-10-18 16:03:40 +05:30
Saurabh
a7d5f94d4a
[fix] Do not append description to variant if description already exists ( #11204 )
2017-10-18 16:02:08 +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
966b3c156a
[conflicts] resolved merge conflicts
2017-10-09 15:20:30 +05:30
rohitwaghchaure
e181dd4c24
[patch] To add healthcare domain ( #11105 )
2017-10-09 12:43:36 +05:30
Manas Solanki
f91ad75b5a
test, patch, docs for student admission ( #11075 )
2017-10-09 12:41:24 +05:30
Nabin Hait
5a834209d0
Cleanup of PO schedule date pull requests
2017-10-05 19:51:10 +05:30
Nabin Hait
395cf4689b
Cleanup of schedule date functionality in Material Request
2017-10-05 18:27:37 +05:30
Saurabh
444bfff1ff
[fix] resolved merge conflicts
2017-10-03 18:03:18 +05:30
Rohit Waghchaure
445e8a2e57
[Fix] Subscription end date, cancel issue, added from and to date
2017-10-03 17:45:11 +05:30
Sunny
38647ed832
move Purchase Order patch to v9
2017-10-02 11:37:48 +08:00
Sunny
9626ed79fa
Add patch to update schedule date of submitted Purchase Orders
2017-10-02 11:35:32 +08:00
Faris Ansari
8ac56b26e0
[Enhancement] Allow Multiple users in POS Profile
2017-09-29 16:15:15 +05:30
Sunny
3ec6960478
move Material Request patch to v9
2017-09-28 15:26:20 +08:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
65cd9f2284
Add patch to update schedule date of submitted Purchase Orders
2017-09-28 15:23:09 +08:00
Sunny
23a4b09d43
Add Material Request schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:48 +08:00
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
rohitwaghchaure
16645803f9
[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports ( #10872 )
2017-09-28 11:05:03 +05:30
Nabin Hait
fce14fdcf0
Fixed merge conflict
2017-09-27 17:21:21 +05:30
rohitwaghchaure
da8de2f0c7
Re-order patch sequence ( #10936 )
2017-09-27 17:11:40 +05:30
Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
0d0811ca14
reload print style
2017-09-25 16:33:45 +05:30
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
rohitwaghchaure
d02744b436
[fix] Subscription patch ( #10827 )
2017-09-18 17:23:00 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Utkarsh Goswami
bd0beb6c02
[fix] unknown column in production order ( #10828 )
2017-09-18 16:48:45 +05:30
Utkarsh Goswami
e78d5a240a
[fix] unknown column in production order ( #10828 )
2017-09-18 16:44:11 +05:30
