Ameya Shenoy
7d929c508f
Merge branch 'master' into staging-fixes
2018-10-04 09:25:07 +00:00
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
Zlash65
9d159ab95e
remove db.escape as back tick already used
2018-10-03 17:26:28 +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
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
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
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
Rohit Waghchaure
ea0ef95539
[Fix] Consolidated Financial Statement report
2018-09-28 17:05:55 +05:30
Suraj Shetty
6ea3de9521
Fix quote issues ( #15497 )
...
* Fix quotes issues
* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
2018-09-26 18:15:53 +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
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
rohitwaghchaure
0cf0ebf08b
[Refactored] Asset Depreciation Ledger report based on GL entries ( #15415 )
...
* [Refactored] Asset Depreciation Ledger report is based on GL entries
* Provision to make manual JV from the asset if Calculate Depreciation is disabled
2018-09-26 15:24:49 +05:30
Ameya Shenoy
b635a71247
Merge branch 'staging' into develop
2018-09-26 08:53:03 +00:00
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
...
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop
2018-09-26 07:32:45 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes
2018-09-26 07:28:53 +00:00
rohitwaghchaure
fafc277666
[Fix] BOM update tool, too many writes in one request. Please send smaller requests ( #15432 )
2018-09-25 18:59:20 +05:30
Aditya Hase
a38b77cbfd
feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion ( #15457 )
...
* feature(chart-of-accounts): Rebuild HSM Tree after bulk insertion
* Update chart_of_accounts.py
2018-09-25 18:10:50 +05:30
Rohit Waghchaure
c699b2a98a
[Fix] Key error while saving sales invoice
2018-09-24 11:57:48 +05:30
Ameya Shenoy
63ebeb432c
Merge branch 'staging' into develop
2018-09-21 11:04:20 +00:00
Suraj Shetty
dabaec0dc5
Revert bench-init changes ( #15463 )
...
* Revert bench-init changes
* Fix test
* Remove debug flag
2018-09-21 15:46:44 +05:30
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
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Saurabh
75d90b9d8f
a[resolved] merge-conflicts
2018-09-20 13:28:23 +05:30
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
550fc695f1
[Fix] Precision issue in the accounts receivable report ( #15440 )
2018-09-19 19:03:40 +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
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
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
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
Zlash65
2619596917
pass filters as parameter
2018-09-13 12:56:04 +05:30
Nabin Hait
9fde97cdd2
Fixed merge conflict
2018-09-12 15:45:20 +05:30
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
Nabin Hait
0669a0e18a
fix(bank account): import fixed
2018-09-12 10:50:10 +05:30
Nabin Hait
13beb3a008
fix(test): test cases fixed
2018-09-11 19:37:08 +05:30
rohitwaghchaure
713cfc786f
[enhance] Payment order ( #15056 )
2018-09-11 17:40:37 +05:30
Zarrar
2859300fe6
update modified date to reload doc ( #15385 )
2018-09-11 17:12:27 +05:30
Nabin Hait
2236f0aef0
fix(test): multiple test cases fixed
2018-09-11 16:50:46 +05:30
