rohitwaghchaure
4d2e782e42
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10148 )
2017-07-28 15:21:22 +05:30
Saurabh
6f9ef5b890
bumped to version 8.6.3
2017-07-27 18:20:27 +06:00
Makarand Bauskar
145393b12f
[hotfix] set the account name in GL entry instead of warehouse ( #10134 )
2017-07-27 16:46:40 +05:30
Makarand Bauskar
9c6e2c3637
[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends ( #10127 )
2017-07-27 16:23:57 +05:30
mbauskar
448d919cc1
bumped to version 8.6.2
2017-07-27 12:48:15 +06:00
tundebabzy
87ec6a12ef
adds options to currency fields ( #10118 )
2017-07-27 11:38:17 +05:30
rohitwaghchaure
059f99e621
[Fix] Wrong avg. buying rate in the Gross Profit report ( #10110 )
2017-07-27 11:37:30 +05:30
Saurabh
394dbca0e4
bumped to version 8.6.1
2017-07-25 18:32:58 +06:00
Saurabh
4c1caa7e98
[hot][fix] updated modified date for sales order
2017-07-25 17:35:14 +05:30
Saurabh
bb5812cf0f
bumped to version 8.6.0
2017-07-25 17:12:26 +06:00
Saurabh
36645e4e2f
Merge branch 'master' into staging
2017-07-25 16:15:51 +05:30
Saurabh
e7c14fcc3d
bumped to version 8.5.5
2017-07-25 16:45:49 +06:00
Rohit Waghchaure
d62fa84ed9
[Fix] Calendar view for sales order
2017-07-25 15:34:20 +05:30
Rohit Waghchaure
baa937aa52
[Fix] Negative amount showing in the grand total for multicurrency if discount has applied
2017-07-25 15:26:01 +05:30
Frappe PR Bot
3b128cabb2
[Translation] Updated Translations ( #10047 )
2017-07-25 11:46:16 +05:30
Makarand Bauskar
dfc5a454b3
[minor] fixed the delivery date issue in Ordered Item to be Dellivered report ( #10028 )
2017-07-25 10:48:43 +05:30
bcornwellmott
1c32f5ace9
Whitelist method for adding production orders ops ( #9997 )
2017-07-24 22:43:44 +05:30
Prateeksha Singh
283d5550e6
[fix] set sales base field as base_grand_total ( #10008 )
2017-07-21 14:21:35 +05:30
Rushabh Mehta
dda608dd00
[fix] update_company_current_month_sales in company.py ( #10005 )
2017-07-21 11:58:14 +05:30
Faris Ansari
e355f99786
Remove ellipsis in title and description ( #9992 )
2017-07-20 17:51:19 +05:30
mbauskar
6c8d4678db
Merge branch 'master' into develop
2017-07-20 16:49:30 +05:30
mbauskar
ea50c9d1be
bumped to version 8.5.4
2017-07-20 17:19:30 +06:00
Rushabh Mehta
35da7d1fb4
[minor] we buy is also checked by default
2017-07-20 15:58:20 +05:30
Rushabh Mehta
ced14cc789
[fix] setup-wizard
2017-07-20 15:55:54 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
mbauskar
a919be111a
bumped to version 8.5.3
2017-07-20 14:46:57 +06:00
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
rohitwaghchaure
79d6266c7b
[Fix] Unable to create production order from the sales order for the bundle items ( #9976 )
2017-07-20 10:35:51 +05:30
tundebabzy
11d23f84d7
Can't set Start and End Dates in Salary Slip ( #9513 ) ( #9944 )
...
* remove trigger from end_date
* adds new function `get_end_date`:
- it tries to calculate the appropriate end date for a given frequency
- returns an empty string if frequency is 'biweekly'
- adds test cases
* changes logic in `set_start_end_dates`:
- if start_date is empty in form, call process_payroll.get_start_end_dates
- else, call process_payroll.get_end_date
* `get_end_date` should return a dict
* changed "biweekly" to "bimonthly"
* change the behaviour of process payroll start and end date:
- when payroll frequency is changed, change start/end date as usual
- if start date is manually changed, use the frequency to calculate the end date
* clean up
* further cleanup
* in `get_end_date`, if `frequency` isn"t given, "monthly"
* remove end_date from cscript and introduce `set_end_date`
* fix tests
* removed whitespaces
2017-07-20 10:33:03 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Makarand Bauskar
ac9b1332d2
[minor] set no copy to sales goal fields ( #9956 )
2017-07-19 18:55:12 +05:30
Doridel Cahanap
7b021e0fac
Show Expected End Date in Project List View ( #9964 )
2017-07-19 18:21:31 +05:30
KanchanChauhan
d6dd25a666
Added indicators on Project Tasks ( #9952 )
2017-07-19 18:06:52 +05:30
rohitwaghchaure
f86100a734
[Fix] Calendar view not working for leave application ( #9963 )
2017-07-19 17:09:30 +05:30
_JG_
96bb6099d6
[fix] correctly choice 'Credit Limit' ( #9932 )
...
* [fix] correctly choice 'credit limit'
If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings
* Update party.py
* [fix] correctly choice 'Credit Limit'
2017-07-19 10:27:09 +05:30
Nabin Hait
e6c2ae3682
Merge pull request #9940 from rmehta/workstation-form
...
[ux] workstation form layout
2017-07-19 10:24:28 +05:30
Nabin Hait
8d56f2959b
Merge pull request #9942 from bcornwellmott/bix_bom_qty
...
Update qty from stock_qty before validate materials
2017-07-19 10:22:00 +05:30
Rushabh Mehta
d2d24554b3
[ux] workstation form layout
2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott
c7d2bc67e8
Update qty from stock_qty before validate materials
2017-07-18 08:56:25 -07:00
Rushabh Mehta
1283f6308d
[fix] company graph based on base currency
2017-07-18 18:22:16 +05:30
mbauskar
d36c136fc6
Merge branch 'master' into develop
2017-07-18 16:38:24 +05:30
mbauskar
75e65e7079
bumped to version 8.5.2
2017-07-18 17:08:23 +06:00
Saurabh
7f95d587b2
[fix] escape company filter ( #9924 )
2017-07-18 16:09:34 +05:30
Makarand Bauskar
75b145fe2c
[hotfix] used frappe.db.set value instead of frappe.set_value ( #9923 )
2017-07-18 16:05:52 +05:30
Nabin Hait
bc3acdd0ba
Merge pull request #9510 from tundebabzy/issue-9166
...
Unable to create Manual Depreciation of Asset due to Error #9166
2017-07-18 15:44:18 +05:30
mbauskar
823b3ca540
bumped to version 8.5.1
2017-07-18 15:40:19 +06:00
Makarand Bauskar
5e75e3ba03
[hotfix] set_restrict_to_domain_for_module_def patch fixes ( #9921 )
2017-07-18 15:09:30 +05:30
mbauskar
113df55e64
Merge branch 'develop'
2017-07-18 13:07:01 +05:30
mbauskar
3e4b2743c6
bumped to version 8.5.0
2017-07-18 13:37:00 +06:00
