mbauskar
51a76885b8
Merge branch 'hotfix'
2017-07-20 14:16:57 +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
3951f6971e
Merge branch 'hotfix'
2017-07-18 16:38:23 +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
8f42f60dc9
Merge branch 'hotfix'
2017-07-18 15:10:19 +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
Nabin Hait
338c28e78e
Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn
...
[Fix] Sales invoice serial no validation issue
2017-07-18 13:05:50 +05:30
Rohit Waghchaure
7e14996995
[Fix] Sales invoice serial no validation issue
2017-07-18 12:59:55 +05:30
Makarand Bauskar
6e30f04181
[domainify] patch to set the restrict to domain for module_def ( #9912 )
2017-07-18 12:30:57 +05:30
Nabin Hait
4a10f18ee3
Merge pull request #9913 from mbauskar/quotation
...
[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)
2017-07-18 12:20:47 +05:30
Nabin Hait
f37d43d0c1
Remove newline from serial no values
2017-07-18 12:15:16 +05:30
pratu16x7
aea60f349f
[minor] default qty 0, fixes frappe/erpnext#9880
2017-07-18 12:15:16 +05:30
pratu16x7
90bd5681d1
[batch modal] bind serial_no field in onchange
2017-07-18 12:15:16 +05:30
mbauskar
30e03cc4c8
[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)
2017-07-18 11:45:53 +05:30
Nabin Hait
4c40a416e6
Merge pull request #9900 from frappe/fixes_9899
...
[fix] #9899
2017-07-18 11:17:45 +05:30
Nabin Hait
3020c8086c
Update stock_balance.py
2017-07-18 11:17:32 +05:30
Nabin Hait
8b3ef1e70a
Merge pull request #9896 from rohitwaghchaure/rejected_expense_claim_issue
...
[Fix] Expense claim status issue
2017-07-18 11:10:52 +05:30
Makarand Bauskar
c446bf6117
Merge branch 'develop' into rejected_expense_claim_issue
2017-07-18 10:54:13 +05:30
Rushabh Mehta
660de515b5
[fix] filters for calendars frappe/erpnext#9850 ( #9870 )
2017-07-18 10:50:30 +05:30
Prateeksha Singh
e012e24423
Sales Goal by Company ( #9723 )
...
* [sales goal] in company; dashboard, graph, notifs, wiz
* [test] target notifications
* cache past year monthly sales of every company daily, patch
* [minor] query fixes
* update sales goal docs
2017-07-18 10:35:12 +05:30
Nabin Hait
e2d0d0a0c1
Merge pull request #9904 from nabinhait/hotfix777
...
Removed a deprecated function call
2017-07-17 20:29:55 +05:30
Nabin Hait
22e82dff20
Removed a deprecated function call
2017-07-17 20:28:30 +05:30
tunde
78d2f542d0
code fix as per review
2017-07-17 15:00:45 +01:00
Nabin Hait
b962fc1573
Show hsn code in tax breakup for India and render via template ( #9866 )
...
* Show hsn code in tax breakup for India and render via template
* tax breakup if gst_tax_field does not exists
* Fixed tax-breakup test cases
2017-07-17 18:02:31 +05:30
tunde
1ee534889f
Revert "adds if statement for reference_type === "Asset""
...
This reverts commit c7e3a09cfb
2017-07-17 13:27:59 +01:00
Frappe PR Bot
fa04236c8d
[Translation] Updated Translations ( #9898 )
2017-07-17 17:50:36 +05:30
pawan
36025468a1
[fix] #9899
2017-07-17 17:28:44 +05:30
Rohit Waghchaure
0e376a464b
test cases
2017-07-17 16:47:01 +05:30
Rohit Waghchaure
8333b5754b
[Fix] Expense claim status issue
2017-07-17 16:38:20 +05:30
