Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Manas Solanki
36e2fb8d58
minor fixes in the fee module for print and permission, delete redundant doctype ( #11430 )
2017-11-06 17:44:59 +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
Faris Ansari
79be8f969f
Add to patches.txt
2017-10-30 14:46:09 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
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
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Saurabh
a7d5f94d4a
[fix] Do not append description to variant if description already exists ( #11204 )
2017-10-18 16:02:08 +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
tunde
e27f5dee1f
Merge branch 'develop' into payment-terms
2017-10-09 10:11:05 +01:00
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
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
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
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01: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
tunde
567119170e
Merge branch 'develop' into payment-terms
2017-09-26 17:28:07 +01:00
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
tunde
82de375ba0
Merge branch 'develop' into payment-terms
2017-09-21 11:21:05 +01:00
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
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Saurabh
2222f10720
[patch] remove employee name salary structure ( #10817 )
...
* [patch] remove employee name salary structure
* Update remove_employee_from_salary_structure_parent.py
2017-09-18 15:05:18 +05:30
Nabin Hait
bc9006ff30
Delete GST related doctypes and reports if account is from outside India ( #10808 )
2017-09-18 13:16:04 +05:30
mbauskar
ea832b8157
resolved merge conflicts
2017-09-14 15:32:10 +05:30
Nabin Hait
45dce89cae
Print Settings for printing taxes with zero amount ( #10782 )
...
* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9
2017-09-14 15:17:38 +05:30
Rushabh Mehta
bf8e331135
[fix] unset default customer group ( #10689 )
...
* [fix] unset default customer group
* added __init__.py file for patch v8.9 directory
2017-09-14 15:03:45 +05:30
Prateeksha Singh
242218d2b7
Progress fixes ( #10710 )
...
* [progress] sales target slide
* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
