Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,353 Commits 3 Branches 0 Tags
Commit Graph

24353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zarrar
e83ff38c10 [Enhance] Deferred Expense (#15437) 
* added section for deferred expense in item master

* added default expense account field in Company master

* added deferred expense section in purchase invoice item

* validation and getter code added

* scheduler event to book expense every month

* codacy, import fix and other minor fixes

* rectify debit credit logic for expense

* commonify js code for deferred expense and revenue

* remove deferred calculation and validation

* common file to calculate deferred revenue and expense

* codacy fixes

* expense account root_type - Asset, specific method naming
 2018-09-21 15:45:40 +05:30
Aditya Hase
40880da280
fix(readme): Add coverage badge 2018-09-20 17:48:35 +05:30
Aditya Hase
6886c47251
fix(style): Center align badges as well 2018-09-20 17:46:53 +05:30
Aditya Hase
99c8fb19f7
fix(style): Put markdown for badges on separate lines 2018-09-20 17:43:04 +05:30
Saurabh
4ae3fb7a87 Merge branch 'staging-fixes' into staging 2018-09-20 13:30:46 +05:30
Saurabh
3ef12bb7f2 bumped to version 11.0.1 2018-09-20 14:00:46 +06:00
Saurabh
75d90b9d8f a[resolved] merge-conflicts 2018-09-20 13:28:23 +05:30
Saurabh
056ecdca6a Merge branch 'hotfix' 2018-09-20 13:22:36 +05:30
Saurabh
3b281a0a1b bumped to version 10.1.53 2018-09-20 13:52:36 +06:00
Saif
772dc6e82c Various permission fixes (#15448) 
* Removed test letter head from Consolidated Financial Statement

* Removed incorrect role permissions
 2018-09-20 13:20:17 +05:30
rohitwaghchaure
a60ab1af75 [Fix] Salary slip is not saving (#15449) 2018-09-20 13:18:49 +05:30
Nabin Hait
8fb04ff1b2 Merge branch 'develop' into staging-fixes 2018-09-20 12:51:26 +05:30
rohitwaghchaure
550fc695f1 [Fix] Precision issue in the accounts receivable report (#15440) 2018-09-19 19:03:40 +05:30
Ameya Shenoy
a2f0b34147 fix(item, item default): changed the modified date (#15442) 
The patch move_item_defaults_to_child_table_for_multicompany used to
fail since the doctypes Item and Item Defaults weren't reloaded properly

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-09-19 19:02:52 +05:30
Ameya Shenoy
28fd02e4a8 fix(desktop_icon): remove land unit icon if exists (#15430) 
* fix(desktop_icon): remove land unit icon if exists

Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>

* Update remove_land_unit_icon.py
 2018-09-19 13:15:52 +05:30
Faris Ansari
2ab6e0e39b fix(translations): Replace translations by keyword with indexed version (#15426) 
* fix(translations): Replace translations by keyword with indexed version

Keywords in the translation also gets translated which
results in an error because python cannot find the key

* Update buying_controller.py
 2018-09-19 13:13:59 +05:30
Mangesh-Khairnar
0374cc54ba [bug fix]:stopped orders in progress report (#15428) 2018-09-19 13:10:53 +05:30
Nabin Hait
63a58a6752 Merge branch 'staging' into develop 2018-09-18 11:44:42 +05:30
Shreya Shah
13761dde38 [Report] Lead Conversion Time (#15237) 
* New Report Lead Conversion Time

* Add column for support tickets and a row for Average
 2018-09-18 10:55:35 +05:30
Jamsheer
c07e8e5b0d [Fix] Healthcare minor fixes and field rename (#15413) 
* Healthcare practitoiner in Clinical Procedure

* Insert and Update Patient Medical Record from Healthcare DocTypes

* vital signs remove extra columns

* Rename Healthcare Field test_name

* Healthcare Util - get_drugs_to_invoice - fix

* Rename Healthcare Field test_code

* Rename Healthcare Field test_comment

* Rename Healthcare Field test_created

* Rename Healthcare Field test_template

* Rename Healthcare Field test_rate

* Rename Healthcare Field test_description

* Rename Healthcare Field test_groups

* Rename Healthcare Field test_group

* Rename Healthcare Field test_template_type

* Rename Healthcare Field test_uom

* Rename Healthcare Field test_normal_range

* Rename Healthcare Field test_event

* Rename Healthcare Field test_prescription

* Rename Healthcare Field test_particulars

* Patch - Rename healthcare fields

* Sales Invoice - Filter updated for get drugs to invoice

* Patient Appointment - fix - get_event
 2018-09-18 10:54:03 +05:30
RicardoJohann
267e806d7f added description field and changed to one filter datepicker (#15425) 2018-09-18 10:48:20 +05:30
JC
31f2c1c3d3 fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ (#15423) 2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816 [FIX] Remove deprecated gen_object.next() function (#15418) 
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
 2018-09-18 10:42:21 +05:30
Faris Ansari
aa856c474a fix(setup wizard): Validate FY dates (#15419) 
- start date should be less than end date
 2018-09-18 10:42:04 +05:30
Frappe PR Bot
db8c1f254e [Translation] Updated Translations (#15414) 2018-09-17 16:54:30 +05:30
Charles-Henri Decultot
d6bce7429e Bank statement import corrections (#15405) 
* Bank statement import corrections

* Bank statement corrections

* Missing semi-columns
 2018-09-17 12:34:11 +05:30
Zarrar
013493de7a lable for discount_amount should be configurable (#15408) 2018-09-17 11:06:49 +05:30
theopen-institute
ba1c0c900d Fix potential crash in payment_entry.py (#15411) 
The new code for cost center checking in payment_entry.py crashes if `voucher_type` is `None`, which is an explicit possibility if party type is Employee. This commit adds a simple check to make sure that voucher_type is not None before running `get_doc`.
 2018-09-17 10:59:39 +05:30
Zarrar
e79e4cb9b1 python 2-3 fix, *.keys() return dict_keys object in py3 (#15409) 2018-09-17 10:56:42 +05:30
Zarrar
ada13213c0 reload Patient Appointment doctype with added fields (#15397) 2018-09-14 15:32:04 +05:30
Faris Ansari
31e5431fe0 fix(urljoin): 2 and 3 compatible (#15401) 2018-09-14 15:31:35 +05:30
Zarrar
ae0168f1ba
Merge pull request #15399 from Zlash65/mfix 
[Minor] Fix Cash Flow report
 2018-09-13 12:57:34 +05:30
Zlash65
2619596917 pass filters as parameter 2018-09-13 12:56:04 +05:30
Nabin Hait
5be3968544 fix(add_file): added missing init file 2018-09-12 18:56:15 +05:30
Ameya Shenoy
ecac822613
Merge pull request #15393 from codingCoffee/hub 
fix(patch): delete hub documents
 2018-09-12 17:50:02 +05:30
Ameya Shenoy
18310c240f
fix(patch): delete hub documents 
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
 2018-09-12 17:46:58 +05:30
Doridel Cahanap
6d0ae5b23b Allow Rename for Custom Tariff (#15389) 2018-09-12 17:13:12 +05:30
Prateeksha Singh
31f2caf51e
Merge pull request #15391 from pratu16x7/hub-patch-fix 
[patch][fix] remove hub node module removing code
 2018-09-12 17:00:12 +05:30
Prateeksha Singh
5ba14fe685 [patch][fix] remove hub node module removing code 2018-09-12 16:59:17 +05:30
Prateeksha Singh
238ed98653
Re-add Hub Node module 2018-09-12 16:36:10 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Saurabh
b3737c812a Merge branch 'hotfix' 2018-09-12 14:44:25 +05:30
Saurabh
6d5a29af6a bumped to version 10.1.52 2018-09-12 15:14:25 +06:00
Zarrar
8dade79002 return blank if no data found (#15387) 2018-09-12 14:24:23 +05:30
Nabin Hait
6173e091ee fix(test): test cases fixed 2018-09-12 11:46:20 +05:30
Zarrar
2b6584a296 accounts table should be mandatory in budget (#15386) 2018-09-12 11:14:24 +05:30
Ahmed Madi
20d8c52d2a Update salary_slip.js (#15200) 2018-09-12 11:02:57 +05:30
Zarrar
ce6a09ca54 [Staging] Stock Reconciliation (#15382) 
* optimize query and some fixes

* add get_query to filter warehouses based on company

* minor changes
 2018-09-12 10:54:18 +05:30
Nabin Hait
0669a0e18a fix(bank account): import fixed 2018-09-12 10:50:10 +05:30