Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Frappe Bot
1fa3f7d81e
Merge branch 'staging-fixes' into staging
2018-12-26 12:04:55 +00:00
Frappe Bot
23beec2bd1
bumped to version 11.0.3-beta.32
2018-12-26 12:04:55 +00:00
deepeshgarg007
22e05b24f3
Fix for NoneType comparison with int error
2018-12-26 17:16:34 +05:30
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
Frappe Bot
23ee3c6fbe
Merge branch 'hotfix'
2018-12-26 11:09:34 +00:00
Frappe Bot
9a9c9c2ba3
bumped to version 10.1.76
2018-12-26 11:09:34 +00:00
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields
...
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:25:44 +05:30
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
Himanshu
0209ef0fc5
Quality Management System ( #15893 )
...
* Added QMS to ERPNext
* changes
* fixed
* code refracted
* refracted
* some bugs fixed
* changes
* changes
* test case
* bug fix unit test
* bug fix
* refracted code
* test warning fix
* test case bug fix
* removed whitespace
* indentation bug fix
* unit test bug fix
* fixed Tree
* bug fix
* bug fix
* code refactor
* fixed procedure tree
* removed unnecessary fields
* hide fields
* removed depricated unit test method
* sql injection bug fix
* code refactor and added mandatory fields
* Removed Add Child from TreeView
* Unit Test crashes Fix
* code refactor
* Fixed Status of Action
* removed add button from Chart of Procedure
* Fixed Unit Test for Quality Action
* Chamged Measurement Unit to UOM
* Changed Measurement Unit to UOM
* Quality Action Unit Test Fix
* Renamed Chart of Procedures to Tree of Procedures
* Changes Objective input type to Text
* Code Refactor
* Quality Action Status option changed to "Close" for consistency
* fixed action status indicator
* Removed vscode folder
* unit tests optimization
* unit test fixes
* code refactor
* gitignore
* bug fixes and code refactor
* code refactor
* unit test changes
* changed quality action unit test
* code refactor
* code refactor
* code refactor
* indentation
* code refactor
* corrected typo
* Removed jQuery hide()
* code refracted
* remove grid elements
* Removed unnecessary conditions
* onload fixed in feedback
* code refracted
* Removed add row button from Review and Customer Feedback
* made autofill feild read only
* automated scheduling of review
2018-12-25 17:42:31 +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
Suraj Shetty
19f8e6bcf8
Fix typo
2018-12-25 15:30:09 +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
8775204d63
Merge branch 'develop' into general-ui-fixes
2018-12-25 14:36:43 +05:30
Suraj Shetty
9180c48262
Fix patch entry
2018-12-25 14:34:38 +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
Suraj Shetty
8d9960bdad
Fix patch entry
2018-12-25 12:33:37 +05:30
Saurabh
ce49f40b26
Merge pull request #16274 from rmehta/fix-child-qty-rate
...
fix(test): for update_child_qty_rate method
2018-12-25 11:19:47 +05:30
Suraj Shetty
bcd8f31e43
Add an entry of a patch in patches.txt
2018-12-25 11:16:49 +05:30
Rushabh Mehta
fafbb0278f
fix: reload parent after setting children
2018-12-24 22:09:15 +05:30
Rushabh Mehta
c9b1a35ac3
fix: set explicit idx for new item in update_child_qty_rate
2018-12-24 20:55:35 +05:30
Suraj Shetty
b763893f22
Fix quotes issue in item.js
2018-12-24 19:43:31 +05:30
Suraj Shetty
a3f28d40b0
Remove _label
2018-12-24 19:39:45 +05:30
Suraj Shetty
9c3dcfea76
Add a patch to rename accounts desktop icon to accounting
2018-12-24 17:00:40 +05:30
Suraj Shetty
67b311e95e
Make -> Create
2018-12-24 16:16:13 +05:30
Suraj Shetty
146be9f6a6
Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes
2018-12-24 16:08:43 +05:30
Rushabh Mehta
5d11abb0a2
fix(escaping): accounts_receivable.py
2018-12-24 16:03:24 +05:30
Suraj Shetty
242b16fdfd
Rename Accounts -> Accounting
2018-12-24 15:47:23 +05:30
frappe-pr-bot
67121f6c91
[Translation] Updated Translations
2018-12-24 11:57:19 +02:00
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
