Saurabh
61f85a8dbd
Merge pull request #12691 from frappe/codingCoffee-patch-1
...
conflict fix
2018-01-29 17:08:49 +05:30
Ameya Shenoy
471e27559f
conflict fix
2018-01-29 17:07:57 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
...
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11
[Fix] Subscription send notification issue
2018-01-29 16:53:37 +05:30
Zarrar
5bf77beb83
precision while checking qty ( #12688 )
2018-01-29 16:47:52 +05:30
Nabin Hait
1e1b2364ab
Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment ( #12689 )
2018-01-29 16:45:43 +05:30
Cesar
58c040cffb
Revert "Sort by account name"
...
This reverts commit 5cf01d9702
.
2018-01-29 11:57:15 +01:00
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Saurabh
4d50fac869
Merge branch 'hotfix'
2018-01-29 16:24:55 +05:30
Saurabh
05eed01eec
bumped to version 10.0.15
2018-01-29 16:54:55 +06:00
Cesar
5cf01d9702
Sort by account name
...
Trial balance not sorted .. by adding those changes fixes the problem.
2018-01-29 11:54:12 +01:00
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
rohitwaghchaure
c385017056
Merge pull request #12638 from adityaduggal/develop
...
Resolves Issue #12630 -Added Filters to AR
2018-01-29 12:37:39 +05:30
rohitwaghchaure
d36ac27f94
Update accounts_receivable.py
2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708
Update accounts_receivable.py
2018-01-29 12:34:19 +05:30
tundebabzy
c7c1defe64
after adjusting stock_qty for expired, set in_stock flag
2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b
adjust stock_qty for expired quantities
...
adjust based on warehouse
add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
2018-01-27 12:16:13 +01:00
tundebabzy
186bea6e95
Merge pull request #12674 from tundebabzy/issue-12673-1
...
Batch List Shows Wrong Expired Status For Batches #12673
2018-01-27 07:50:12 +01:00
tundebabzy
794ecda618
corrected wrong get_diff arguments
2018-01-27 05:54:40 +01:00
tundebabzy
2d4b99917d
Merge pull request #12664 from chdecultot/fec2
...
[Hotfix] Doc file rename
2018-01-26 23:17:46 +01:00
Charles-Henri Decultot
241b09ee11
Addition of index.txt
2018-01-26 07:53:59 +00:00
Charles-Henri Decultot
d0c2f7b754
Doc file rename
2018-01-26 07:09:11 +00:00
Vishal Dhayagude
c463c0684d
[Report] GSTR - 1 CDNR Report ( #12554 )
...
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
2018-01-26 11:27:22 +05:30
Manas Solanki
8985077652
Assessment Module Report ( #12605 )
...
* updated course wise assessment report
* added new report Final assessment grades
2018-01-26 11:20:33 +05:30
Andy Villiger
567623654b
Resolve issue #10914 - Error when making Sales Invoice ( #12656 )
...
* Resolve issue #10914
An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code.
* Update sales_order.py
2018-01-26 11:11:19 +05:30
tundebabzy
db4fd7f5b6
Improvements to batch auto naming ( #12496 )
...
* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method
* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method
* add documentation and rename some functions
* PEP 8 compliance
* test
2018-01-26 11:00:20 +05:30
rohitwaghchaure
bfa898ff9b
[Fix] System pull the valuation rate even if allow zero valuation rate is enabled ( #12537 )
2018-01-26 10:59:00 +05:30
tundebabzy
0a33a359ca
Merge pull request #12659 from tundebabzy/issue-12658
...
set batch number only in Sales Invoice and Delivery Note - #12659
2018-01-26 06:10:13 +01:00
tundebabzy
f9b5c74871
set batch number only in Sales Invoice and Delivery Note
2018-01-25 19:21:05 +01:00
Prateeksha Singh
4c58299eb0
[fix] encode if letterhead
2018-01-25 17:29:57 +05:30
Saurabh
aaaf5c62b6
[Mod] Minor changes in 'primary_address' field's property
2018-01-25 17:28:57 +05:30
rohitwaghchaure
fc318ebeff
Merge pull request #12642 from mntechnique/fix-to-issue-#12512
...
Fix to issue #12512
2018-01-25 17:13:05 +05:30
rohitwaghchaure
3574c96c8c
Update item_dashboard_list.html
2018-01-25 17:11:52 +05:30
rohitwaghchaure
ec3052cc8f
Merge pull request #12652 from shreyashah115/patch-fix
...
Patch fix for Leave Application Workflow
2018-01-25 17:08:50 +05:30
Shreya
1416567139
patch fix for leave-workflow
2018-01-25 17:06:14 +05:30
Vinayak Jethe
5743ce2b6b
Made changes as per suggestions
2018-01-25 13:37:20 +05:30
Saurabh
6614d8aa01
Multiple changes:
...
[Mod] Added 'primary_address_and_contact_detail' in toggle_display
[Mod] Added a description for 'primary_address_and_contact_detail'
2018-01-25 12:27:00 +05:30
Saurabh
5a2354149c
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-01-25 11:56:36 +05:30
rohitwaghchaure
8d4e63c1fd
Merge pull request #12639 from shreyashah115/workflow-patch-fix
...
Leave Workflow patch fixes
2018-01-24 22:36:34 +05:30
Shreya
5f264fa364
fixes
2018-01-24 20:39:30 +05:30
Vinayak Jethe
84f7727432
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512
2018-01-24 19:48:24 +05:30
Vinayak Jethe
549c196beb
Fixes issue #12512
2018-01-24 19:47:59 +05:30
Shreya
61cf49dd07
workflow patch fix
2018-01-24 18:50:01 +05:30
rohitwaghchaure
1bf4015567
Merge pull request #12632 from mntechnique/solves_issue_#12588
...
Solves issue #12588
2018-01-24 18:26:39 +05:30
Aditya Duggal
2136a7bded
Resolves Issue #12630 -Added Filters to AR
...
- Added Territory Filter to AR report
- Added Sales partner filter
- Added Sales person filter
-Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column
-Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.
2018-01-24 18:16:08 +05:30
Saurabh
cadd31cb0c
[Fix] Solves issue #12588
2018-01-24 16:38:22 +05:30
rohitwaghchaure
8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
...
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Shreya
a8a952deff
check if workflow_state_name already exists
2018-01-24 15:00:54 +05:30
Rushabh Mehta
29bc14d242
[fix] ficher_des_ecritures patch
2018-01-24 14:39:04 +05:30
Vinayak Jethe
46c82c45e0
Revised changes for codacy
2018-01-24 14:24:58 +05:30