Charles-Henri Decultot
9c1db688d1
Ignore pricing rule for Travis
2018-12-26 10:33:42 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
Charles-Henri Decultot
899b9b1ea7
Codacy correction
2018-12-26 08:56:11 +00:00
Charles-Henri Decultot
9d31452c25
Remove ununsed variable
2018-12-26 08:38:42 +00:00
Charles-Henri Decultot
ed94317df9
Test cases
2018-12-26 08:36:32 +00:00
Suraj Shetty
33ba694f3a
Revert "Modify bench_init.sh"
...
Point back to original repo
This reverts commit d3530125dd
.
2018-12-26 11:32:06 +05:30
deepeshgarg007
a1d015cc2f
Initialized loyalty_point_details
2018-12-26 11:01:02 +05:30
Rohit Waghchaure
52a692ee08
[Fix] Not able to delete customer if contact is available
2018-12-26 02:34:13 +05:30
deepeshgarg007
64238ee91f
(Codacy Fix) Fixed indenttion
2018-12-25 16:28:39 +05:30
deepeshgarg007
12f5cefc12
Loyalty program issue fix in customer dashboard
2018-12-25 16:06:19 +05:30
rohitwaghchaure
136c4c4820
Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue
...
[Fix] Tax Withholding, TDS is applying on the tax
2018-12-25 14:49:05 +05:30
Suraj Shetty
488aa86f70
Skip some codacy warnings
2018-12-25 14:46:44 +05:30
Suraj Shetty
6684c1ebff
Merge branch 'permission-fixes' of https://github.com/surajshetty3416/erpnext into permission-fixes
2018-12-25 14:30:55 +05:30
Suraj Shetty
d3530125dd
Modify bench_init.sh
...
- to point frappe branch in my repo with
changes to check if any test fails due to the changes
2018-12-25 14:30:50 +05:30
rohitwaghchaure
deb96dab3e
[Fix] Salary structure not saving ( #16275 )
2018-12-25 13:58:20 +05:30
Rohit Waghchaure
94500a9d62
[Fix] TDS is applying on the tax
2018-12-24 15:13:52 +05:30
rohitwaghchaure
7ec5e80b70
[Fix] While making sales invoice from delivery note, system not remove the returned qty ( #16141 )
2018-12-24 14:55:31 +05:30
Nabin Hait
5a9579bae4
feat(quality): Check quality status before receipt/delivery ( #16169 )
2018-12-24 14:54:42 +05:30
Valmik
78bc405eeb
fix: set fieldname for frappe prompt ( #16198 )
2018-12-24 14:54:06 +05:30
Navdeep Ghai
c4d38c0afc
Fix the disappears of image bug after uploading and saving the employee ( #16217 )
...
* Fix image disappears of image after uploading and saving the employee
* Fix the codacy issue
2018-12-24 14:53:19 +05:30
KanchanChauhan
1790a6faaa
Set ignore_user_permission 1 for Company field in Item Default ( #16167 )
2018-12-24 14:48:09 +05:30
Rohan
349040db6d
fix(work_order): Set operations for Work Order when created from MREQ ( #16154 )
2018-12-24 14:42:34 +05:30
Charles-Henri Decultot
052033a76e
[Fix] Pos bugs ( #16256 )
...
* Remove hard-coded values
* Fix change pos profile + add campaign
* Test case for coveralls
* Remove unnecessary method
2018-12-24 14:39:30 +05:30
rohitwaghchaure
4265c5a772
Rename BOM and Work order fields ( #16209 )
...
* Rename BOM and Work order fields
* Rearranged BOM fields
2018-12-24 14:38:49 +05:30
Mangesh-Khairnar
70c5aa5f5d
[Enhancement] Pending SO Items for Purchase Request Report ( #16188 )
...
* deleted old purchase request query report
* [Enhancement] pending so items for purchase request report refactor
* comments and format fix
* test and minor fixes
* test fixes
2018-12-24 14:25:47 +05:30
Shreya Shah
91ddadeefa
fix: add currency to options ( #16199 )
2018-12-24 14:25:12 +05:30
Charles-Henri Decultot
083f1c5370
Safe decode project name for languages with special characters ( #16254 )
2018-12-24 14:21:33 +05:30
Shreya Shah
d2b9093ecc
fix: Check if items exist ( #16248 )
2018-12-24 14:21:07 +05:30
Charles-Henri Decultot
9100740ba9
[Fix] FEC: Correction of the export function ( #16252 )
...
* Correction of the export function
* Improve JS code
* Codacy corrections
* Codacy corrections
2018-12-24 14:20:35 +05:30
Raffael Meyer
ed3561279d
Update README.md ( #16224 )
2018-12-24 14:19:51 +05:30
rohitwaghchaure
1c1798c7f2
[Fix] Warehouse wise item balance age and value report not working ( #16258 )
2018-12-24 14:19:27 +05:30
Deepesh Garg
3ae2517867
Removed subscriber option form module page ( #16270 )
2018-12-24 14:16:57 +05:30
Faris Ansari
e095648810
Merge pull request #16269 from surajshetty3416/fix-daily-work-summary-patch
...
fix: daily_work_summary_settings migration patch
2018-12-24 11:58:13 +05:30
Suraj Shetty
772e8780b4
Merge branch 'staging-fixes' into permission-fixes
2018-12-24 10:35:12 +05:30
Suraj Shetty
b58c317abb
Fix daily_work_summary_settings migration patch
2018-12-24 10:26:39 +05:30
Frappe Bot
a509d4855b
Merge branch 'staging-fixes' into staging
2018-12-21 05:46:22 +00:00
Frappe Bot
7067727c0c
bumped to version 11.0.3-beta.31
2018-12-21 05:46:22 +00:00
Nabin Hait
e9a2d57357
Merge pull request #16249 from shreyashah115/error-fix-2
...
Purchase order validation sql error
2018-12-21 10:59:20 +05:30
Charles-Henri Decultot
813485023b
Filter cancelled and draft payments
2018-12-20 14:04:00 +00:00
Nabin Hait
16c3240ab7
Merge pull request #15973 from deepeshgarg007/accounts-receivable
...
Accounts receivable report based on payment terms
2018-12-20 14:16:22 +05:30
Nabin Hait
0866b2b75a
Update accounts_receivable.py
2018-12-20 14:11:20 +05:30
shreyashah115@gmail.com
ba8c041206
fix: Check if items exist
2018-12-20 13:23:51 +05:30
Suraj Shetty
7ed37ae6c3
Commonify code
...
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
deepeshgarg007
b645c2c75e
Rebase using staging-fixes and resolved conflicts
2018-12-19 18:47:36 +05:30
deepeshgarg007
530453e4fc
Added temp variables for outstanding, credit_note_amt instead of function calling
2018-12-19 18:43:07 +05:30
deepeshgarg007
5de603c6af
breaked up code into multiple functions
2018-12-19 18:43:06 +05:30
deepeshgarg007
4ac8fcf4af
Added test case for Accounts receivable report based on payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
a944f88b94
Removed column for pdc date
2018-12-19 18:43:06 +05:30
deepeshgarg007
17544d7ad6
Refactored accounts receivable report for payment terms
2018-12-19 18:43:06 +05:30
deepeshgarg007
e7a91b9526
Credit note fix
2018-12-19 18:43:06 +05:30