Rohit Waghchaure
18678696db
Fix issue after merging hotfix into staging-fixes
2018-10-04 16:33:43 +05:30
Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes
2018-10-04 09:25:07 +00:00
Ameya Shenoy
65652071ff
Merge branch 'hotfix'
2018-10-04 09:11:50 +00:00
Ameya Shenoy
79dc8ac9cc
bumped to version 10.1.55
2018-10-04 09:11:50 +00:00
rohitwaghchaure
8b42bf57cd
Merge pull request #15581 from rohitwaghchaure/work_order_item_has_no
...
[Fix] WorkOrderItem object has no attribute operation
2018-10-04 13:27:00 +05:30
Rohit Waghchaure
9f2859701e
[Fix] WorkOrderItem object has no attribute operation
2018-10-04 13:25:49 +05:30
Zarrar
897d1baf74
Merge pull request #15577 from Zlash65/min-min
...
[Minor] Purchase Invoice - stop date editable after submit
2018-10-04 09:31:50 +05:30
Zlash65
6e3b1a58a1
service_stop_date should be editable after submit
2018-10-04 09:30:27 +05:30
rohitwaghchaure
f9930ff2a4
Merge pull request #15573 from rohitwaghchaure/cost_center_issue_while_saving
...
[Fix] Cost center issue
2018-10-03 18:47:28 +05:30
Shreya Shah
3204c94fdd
Merge pull request #15570 from shreyashah115/fix-filter-error
...
[Bug] Item wise sales register filters
2018-10-03 17:38:41 +05:30
Shreya
cbb112f2db
Fix filter error
2018-10-03 17:37:40 +05:30
rohitwaghchaure
15e7646edd
Merge pull request #15569 from rohitwaghchaure/stock_adjustment_to_cost_of_goods_sold
...
Book cost of goods sold instead of stock adjustment
2018-10-03 17:36:29 +05:30
Rohit Waghchaure
8bf9f377dd
[Fix] Cost center issue
2018-10-03 16:59:43 +05:30
Rohit Waghchaure
d1b87ba41c
Book cost of goods sold instead of stock adjustment
2018-10-03 16:29:43 +05:30
rohitwaghchaure
d6cacbe565
Merge pull request #15567 from rohitwaghchaure/fix_payment_request
...
[Fix] Payment request not working
2018-10-03 16:03:48 +05:30
Rohit Waghchaure
210f4984f7
[Fix] Payment request not working
2018-10-03 15:55:51 +05:30
Charles-Henri Decultot
75fa6b3ee8
[Enhancement] Improvement to the sales pipeline ( #15524 )
...
* Additions to sales pipeline
* Codacy corrections
* Codacy corrections
* Codacy corrections
* Replace _ with dummy for unused variable
* Performance + dates corrections
* Itertuples modification
* Removing trailing whitespaces
* Sales stage doctype
* Divide sales stages fixtures in separate functions
* Remove duplicate fixtures
* Add newline after method
* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
efd776da46
Events in timeline ( #15485 )
...
* Events in timeline
* Namespace correction
* Codacy correction
* Addition of sales partners in participants
* Correct json indent
2018-10-03 10:41:26 +05:30
rohitwaghchaure
a5576f5b21
[Fix] Stock difference between gl entry and stock ledger entry booked in stock adjustment ( #15374 )
2018-10-03 10:39:50 +05:30
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Shreya Shah
7d115183e4
Improvise and fix indicators in Portal list ( #15552 )
2018-10-02 12:46:26 +05:30
Charles-Henri Decultot
3b11debcd2
Gocardless correction ( #15554 )
2018-10-02 12:46:15 +05:30
Charles-Henri Decultot
b2281cc1fd
Lead to customer UX enhancement ( #15525 )
...
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
2018-10-02 11:25:00 +05:30
Shreya Shah
5a2aced586
Merge pull request #15551 from Zlash65/minor-fix
...
[Minor] Delivery trip test fix
2018-10-02 11:12:51 +05:30
Rushabh Mehta
11e2119670
style(icon): revert to old icon
2018-10-02 11:06:55 +05:30
Zlash65
6a5e6ed2ff
delivery trip notification to customer fix
2018-10-01 17:28:42 +05:30
Zlash65
9e67b8ec4d
fix driver name selection
2018-10-01 17:27:12 +05:30
Zlash65
622bd10946
add date data [mandatory]
2018-10-01 15:37:31 +05:30
rohitwaghchaure
8976ad5ca1
Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue
...
[Fix] Attendance tool
2018-10-01 15:07:49 +05:30
Rohit Waghchaure
c7f8b82fff
[Fix] Attendance tool
2018-10-01 12:30:58 +05:30
rohitwaghchaure
6b62b86bbf
Merge pull request #15545 from rohitwaghchaure/salary_slip_not_creating_because_of_the_date_issue
...
[Fix] Salary slip
2018-10-01 12:03:26 +05:30
Rohit Waghchaure
8fbf856618
[Fix] Salary slip
2018-10-01 12:00:45 +05:30
Saif
90cf2ddc01
Make pricing rule from Supplier and Customer Doc ( #15533 )
...
* Make pricing rule from Supplier and Customer Doc
* Make sure the "+" button also works the same way as the "Make" button
2018-09-30 22:16:31 +05:30
Alchez
6ecb2556b7
Add Delivery Settings + improve 'Notify Customers' functionality ( #15322 )
...
* Add Delivery Settings + improve 'Notify Customers' functionality
* Minor improvements
* Add patch to create a default dispatch notification template
* Fix travis errors
2018-09-30 21:38:47 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
Zarrar
e4c9ac3961
[Minor] Cash Flow report - custom ( #15522 )
...
* python 2-3 fix for filter
* pass filters while fetching data to financial statement report
2018-09-30 21:19:01 +05:30
rohitwaghchaure
90f9f9d3d8
Code optimization for deferred revenue ( #15527 )
2018-09-30 21:12:50 +05:30
Faris Ansari
6575e52942
fix: Refactor Review Area according to new Text Editor ( #15536 )
...
- depends on https://github.com/frappe/frappe/pull/6159
2018-09-30 21:08:46 +05:30
rohitwaghchaure
1cf71d96b1
Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11
...
[Fix] Consolidated Financial Statement report
2018-09-28 17:06:57 +05:30
Rohit Waghchaure
ea0ef95539
[Fix] Consolidated Financial Statement report
2018-09-28 17:05:55 +05:30
Saif
c2dd9ab778
Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered ( #15514 )
2018-09-27 15:48:04 +05:30
Shreya Shah
0fc4917d81
Merge pull request #15516 from shreyashah115/product-page
...
Fetch Item Group's name and image on website
2018-09-27 15:12:42 +05:30
Shreya
5c335550e3
Fetch item_group's name and image on website if children
2018-09-27 13:55:59 +05:30
Nabin Hait
7d6d678e8d
purchase receipt return entry in dashboard
2018-09-26 19:04:11 +05:30
Nabin Hait
c22ba2ec26
fix(sales return): validation message fix
2018-09-26 18:56:45 +05:30
Nabin Hait
183972f58f
fix(stock_entry): allow creating stock entry against work order even if item rate is zero
2018-09-26 18:34:07 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more ( #15475 )
...
* fix(payroll): multiple minor fixes related to salary structure
* Added GSTR-1 and GSTR-2 report in Accounts module page
* delete asset movement records on cancellation of Purchase Receipt
* Update consolidated_financial_statement.py
* minor fix
* minor fix
* add filters on item prices report (#15495 )
2018-09-26 18:01:00 +05:30
deepeshgarg007
c3772f1ac4
minor fix ( #15503 )
2018-09-26 15:55:43 +05:30
Aditya Hase
e20b7cc47d
fix(python3): super() backwards compatibility fix ( #15498 )
2018-09-26 15:39:02 +05:30
Shreya Shah
352e6494f3
Contact and email fields in Payment Entry ( #15490 )
...
* Add contact_person and contact_email fields to Payment Entry
* Minor fix
* Map contact details while making Payment Entry
* Update payment_entry.py
2018-09-26 15:38:34 +05:30
