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

16337 Commits

Author SHA1 Message Date
Rushabh Mehta
77588ededb version: move to 12.x.x-develop 2018-09-30 23:02:05 +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
Alchez
6ecb2556b7 Add Delivery Settings + improve 'Notify Customers' functionality (#15322) 
* Add Delivery Settings + improve 'Notify Customers' functionality

* Minor improvements

* Add patch to create a default dispatch notification template

* Fix travis errors
 2018-09-30 21:38:47 +05:30
Neil Trini Lasrado
55a53e0bec Added ability to have a default return warehouse for Sales Returns (#15491) 2018-09-30 21:22:50 +05:30
Charles-Henri Decultot
4fd7a4e0d7 Lead notes (#15510) 
* Notes field in Lead

* Add notes to lead details report
 2018-09-30 21:20:55 +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
Saif
83c89346c3 set_item_default was referencing a variable company of "company" (#15534) 2018-09-30 21:12:25 +05:30
Faris Ansari
6575e52942 fix: Refactor Review Area according to new Text Editor (#15536) 
- depends on https://github.com/frappe/frappe/pull/6159
 2018-09-30 21:08:46 +05:30
rohitwaghchaure
1cf71d96b1
Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11 
[Fix] Consolidated Financial Statement report
 2018-09-28 17:06:57 +05:30
Rohit Waghchaure
ea0ef95539 [Fix] Consolidated Financial Statement report 2018-09-28 17:05:55 +05:30
Saif
c2dd9ab778 Fix the problem that naming series would remove trailing '-' from series prefix if ##### was not entered (#15514) 2018-09-27 15:48:04 +05:30
Frappe PR Bot
c1bc8d6066 [Translation] Updated Translations (#15518) 2018-09-27 15:47:52 +05:30
Suraj Shetty
4b404c4f1e Avoid multiple escapes (#15509) 2018-09-27 15:39:34 +05:30
Shreya Shah
0fc4917d81
Merge pull request #15516 from shreyashah115/product-page 
Fetch Item Group's name and image on website
 2018-09-27 15:12:42 +05:30
Shreya
5c335550e3 Fetch item_group's name and image on website if children 2018-09-27 13:55:59 +05:30
Nabin Hait
7d6d678e8d purchase receipt return entry in dashboard 2018-09-26 19:04:11 +05:30
Nabin Hait
c22ba2ec26 fix(sales return): validation message fix 2018-09-26 18:56:45 +05:30
Nabin Hait
183972f58f fix(stock_entry): allow creating stock entry against work order even if item rate is zero 2018-09-26 18:34:07 +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
RicardoJohann
171c7d4128 add filters on item prices report (#15495) 2018-09-26 15:58:06 +05:30
deepeshgarg007
c3772f1ac4 minor fix (#15503) 2018-09-26 15:55:43 +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
90197dd341 bumped to version 11.0.3-beta.2 2018-09-26 08:52:54 +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
b8a5fb7392 bumped to version 11.0.3 2018-09-26 07:32:44 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes 2018-09-26 07:28:53 +00:00
Ameya Shenoy
e04431ea5c bumped to version 10.1.54 2018-09-26 07:26:49 +00:00
deepeshgarg007
86152eb5c8 Sales person Commission Report and more (#15431) 
* Commission For Sales Person

* Changes Made

* Changes made in sales person dashboard and commission report

* Update sales_person_commission_summary.py
 2018-09-25 19:08:16 +05:30
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
Mohamed_Alsum
b9228fa443 show only submitted salary_structure and leave_policy in Employee Grade app (#15434) 
* update staff plan when add or delete job-opening

* Update job_opening.py

* filter default_salary_structure and default_leave_policy

* merge
 2018-09-25 18:56:17 +05:30
rohitwaghchaure
fe1e4a41e6 Validate negative stock serial number (#15492) 2018-09-25 18:36:32 +05:30
Faris Ansari
7a8c5b0c2c fix(setup wizard): Validate FY dates (#15473) 2018-09-25 18:34:33 +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
Zarrar
b113349f31 minor fix for auto-opt-in for customer (#15483) 2018-09-24 14:30:07 +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
Ameya Shenoy
cdedb27cf0 bumped to version 11.0.2 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
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
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
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
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
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
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
Faris Ansari
76b31deda5 Isomorphic marketplace (#15384) 
* feat: Make marketplace run on hub server in Guest mode

* fix: Skip page actions on server

* fix: Limit PageContainer to marketplace route

* fix(eslint): Add hub variable to globals
 2018-09-11 17:38:31 +05:30
Jamsheer
ede924c4a2 Remove print statements - Healthcare utils (#15363) 2018-09-11 17:32:52 +05:30
Sagar Vora
508189eaea Use default conversion factor if not found in Item (#15369) 2018-09-11 17:22:25 +05:30
Frappe PR Bot
157bdb71ca [Translation] Updated Translations (#15375) 2018-09-11 17:21:39 +05:30
Zarrar
2859300fe6 update modified date to reload doc (#15385) 2018-09-11 17:12:27 +05:30
Nabin Hait
84ddbc0ac9 fix(test): test cases fixed 2018-09-11 17:11:39 +05:30
Nabin Hait
2236f0aef0 fix(test): multiple test cases fixed 2018-09-11 16:50:46 +05:30
Nabin Hait
e11f299b21
Update production_order.py 2018-09-11 11:36:05 +05:30
Nabin Hait
2ce2d2ac02 fix(sales invoice): get value only if field exists 2018-09-10 13:16:25 +05:30
Faris Ansari
80e6cad7ac
Merge pull request #15360 from netchampfaris/marketplaces-fixes 
fix(image): New Image component to consistently handle broken images
 2018-09-10 12:29:50 +05:30
Zlash65
4b0e3741b2 job card patch use orm 2018-09-10 12:18:51 +05:30
Prateeksha Singh
3b3c80e6b5
Merge pull request #15371 from pratu16x7/marketplace-fixes 
[hub] add Item Manager permission to Hub Tracked Item
 2018-09-10 11:40:42 +05:30
Prateeksha Singh
62f5cd2dee [hub] add Item Manager permission to Hub Tracked Item 2018-09-10 11:39:48 +05:30
Zarrar
68000c66fc check if Data Migration Plan exists before deleting (#15368) 2018-09-09 19:19:13 +05:30
Zarrar
8448d9014d [Fix] Patch fixes (#15350) 
* fix typo in fieldname

* fallback for work_order/production_order in timesheet
 2018-09-09 19:18:41 +05:30
Ameya Shenoy
8b7fea5a8a
Merge pull request #15349 from sagarvora/py3-fixes 
[py3] print, StringIO import, and other fixes
 2018-09-09 02:25:10 +05:30
Saif Ur Rehman
423549e084 Fixed PDC data in AR/AP report: 
-Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared
-Get PDC data from submitted documents only
 2018-09-08 15:48:55 +05:00
Faris Ansari
9fb5e1c61b fix(image): New Image component to consistently handle broken images 
- psuedo element hack didn't work cross browser
 2018-09-07 23:17:29 +05:30
Nabin Hait
73165ebd33 fix(patch): create healthcare patch only if domain activated 2018-09-07 18:44:14 +05:30
Sagar Vora
538100148f [py3] print, StringIO import, and other fixes 2018-09-07 17:59:59 +05:30
Pawan Mehta
2cc7eb1e94 fix default settings (#15345) 2018-09-07 17:59:10 +05:30
Nagarajan
8be8345b65 Stock Projected Qty Item Group Filter (#15340) 
* Update stock_projected_qty.js

* Update stock_projected_qty.js

* Update stock_projected_qty.py

* Update stock_projected_qty.js
 2018-09-07 16:20:18 +05:30
rohitwaghchaure
3cc77b52e7 [Fix] Timeout error for bom update tool (#15343) 2018-09-07 16:16:58 +05:30
rohitwaghchaure
bd4348db10 [Enhance] Add additional cost of the manufacture stock entry in the project costing (#15341) 2018-09-07 16:16:23 +05:30
Nabin Hait
562d942a7d fix(patch): gst state number in address where number is less than 10 2018-09-07 16:14:44 +05:30
Nabin Hait
431e2e1c6d fix(payment entry): Changed modified 2018-09-07 14:31:34 +05:30
Nabin Hait
399f3ddf82 fix(sales invoice): Restored missing field group_same_items 2018-09-07 14:27:14 +05:30
Nabin Hait
3a342e8d93 fix(report): project filter in financial statement 2018-09-07 14:17:57 +05:30
Zlash65
635890187a remove console statement 2018-09-07 14:04:46 +05:30
Zarrar
525a005b78 TDS Monthly report & TDS Computation Summary report (#15204) 
* tds computation report added

* tds computation logic added

* minor changes to commonify code

* tds payable monthly report added

* initial logic for monthly tds calculation added

* added field for supplier type and pan

* changes related to pan and entity type

* date filter fix and cleanup
 2018-09-07 13:27:10 +05:30
rohitwaghchaure
eef5cda1a9 [Fix] Blanket order issue (#15339) 2018-09-07 13:19:45 +05:30
Zarrar
7737620ff4 [Staging] Patch fix - Shopify Settings (#15338) 
* keep enable_shopify in Shopify Settings disabled by default

* patch fix for shopify refactor

* minor fallback fix
 2018-09-07 13:19:33 +05:30
Nabin Hait
b479a87031 fix(report): Cost center filters in financial statements and general ledger 2018-09-07 13:17:23 +05:30
Rohit Waghchaure
e74a39752f [Fix] Patch 2018-09-06 22:38:03 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244) 
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
 2018-09-06 19:21:48 +05:30
Neil Trini Lasrado
6f77abe0dd Added ability to create a Return Sales Invoice/ Credit Note against a delivery note of type return (#15266) 
* Remove make subscription button on delivery note if it is of type returns

* Added 'issue_credit_note' checkbox on delivery note to pass a Sales Inv of type return if checked while creating a return delivery note

* Added logic to auto-create Return Sales Invoice/ Credit Note if issue_credit_note checkbox is checked while return delivey note is submited

* Update delivery_note.py
 2018-09-06 19:17:47 +05:30
Alchez
4b290e5561 Map details from Delivery Trip back to Delivery Note (#15261) 
* Map details from Delivery Trip back to Delivery Note

* Add pop-up to indicate changed Delivery Notes
 2018-09-06 19:08:19 +05:30
Alchez
f2fe0b2194 Keep Delivery Trip stops unique based on their Delivery Notes (#15264) 
* Keep Delivery Trip stops unique based on their Delivery Notes

* Pull single row when making a Trip from Delivery Note
 2018-09-06 19:05:09 +05:30
Bassam Ramadan
574cd46e41 Adding cashier closing feature (#15273) 
* adding cashier closing feature

cashier closing feature has been added as now the cashier can make a
closure to record every thing from his pos as the expenses which has
been paid and the custody which he had at the starting and the amount
which is in his save and the system will record the date and time and
the user and the total net amount automatically which supposed be equal
to all of his sales invoices totals

* add cashier closing link at pos menu

* add cashier closing link to accounts config file

adding cashier closing link at accounts config file to show it at the
accounts module page

* adding more features to cashier closing

adding from time to the cashier closing in case the cashier working more
than one shift also giving him the ability to add the type of payments
to his cashier closure ,
also adding validation to be sure the from time is less than to time.

* Update cashier_closing.py
 2018-09-06 19:02:25 +05:30
Nabin Hait
4fd1cebf95 fix(patch): Delete all documents from Hub Node module 2018-09-06 18:53:46 +05:30
Alchez
e52ae4eacb [Fix] 'To Bill' status even if the amount is zero (#14784) 
* Fix 'To Bill' status even if the invoice amount is zero

* Modify fix to only apply on Delivery Note documents
 2018-09-06 18:27:06 +05:30
Faris Ansari
b892cc8b02 fix(item): Remove Hub Category field (#15331) 2018-09-06 18:02:48 +05:30
Zarrar
203baa9a3a update modified date to load blanket order field (#15332) 2018-09-06 17:46:11 +05:30
Nabin Hait
a2a6568b7e fix(reports): Made gstr1 ready for govt portal 2018-09-06 17:44:31 +05:30
Sanjay Kumar
1b49f3a4e7 Allow cost center in entry of balance sheet accounts (#14972) 
* Allow Cost Center In Entry of Balance Sheet Account

* Add parent cost center in get payment entry

* Add Tests for Allow Cost Center In Entry of Balance Sheet Account

* Add tests for cost center wise account and party balance

* set parent cost center in taxes

* 1. Remove copy parent cost_center to child
2. Improve update party and account balance functionality on cost_center change
3. Add cost_center filter to get_outstanding_documents

* fix Codacy and Travis issue
 2018-09-06 14:39:35 +05:30
Nabin Hait
b94008dab3 fix(patch): reload loyalty program in healthcare patch 2018-09-06 14:27:03 +05:30
Nabin Hait
8652bce9e3
Update modules.txt 2018-09-06 14:18:49 +05:30
Faris Ansari
4e372a30fa fix(patch): Remove old Hub Page (#15328) 2018-09-06 14:08:31 +05:30
Prateeksha Singh
df327f2974 [remove-hub] delete hub module 2018-09-06 13:34:47 +05:30
Prateeksha Singh
3ccbb8f8b7 [remove-hub] delete hub_settings and hub_category 2018-09-06 13:28:47 +05:30
Zarrar
1b37186460 set POS Invoice format only if its enabled (#15326) 2018-09-06 13:25:52 +05:30
ahmad zaqout
2350dc26f6 fix syntax error HTTPError in amazon_mws_api (#15324) 2018-09-06 13:21:04 +05:30
Zarrar
0d931e1d7d fix uom & stock_uom print hide logic (#15327) 2018-09-06 13:08:58 +05:30
Nabin Hait
f846c43361 Merge branch 'ESS-LLP-healthcare_v11_wip' into develop 2018-09-06 13:07:08 +05:30
Nabin Hait
ffeff2d385 fix(tests): reset session user as administrator after running tests 2018-09-06 12:45:07 +05:30
Nabin Hait
e5a4037b57 minor fix in deferred revenue booking 2018-09-05 17:44:39 +05:30
Nabin Hait
aacb915cae Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip 2018-09-05 17:21:47 +05:30
Zarrar
2705af488d [Minor] [Staging] POS Profile (#15321) 
* update modified date to load field display_items_in_stock

* stop dialog from popping up if no loyalty program found

* warehouse not used for not is_pos type invoice
 2018-09-05 17:20:07 +05:30
Nabin Hait
ed643d5a12
fix(email digest): Income/expenses value in case of last period of a fiscal year (#15320) 2018-09-05 17:18:59 +05:30
Pawan Mehta
6010a10ad1 Amazon MWS Connector (#15061) 
* [fix] #15054

* [fix] #15058

* codacy issues

* Codacy fixes-1

* Travis Fix

* fix codacy

* fix codacy

* review changes 1

* Custom fields and fixes

* remove amazon id

* remove item.json and sales_order.json

* added back sales_order and item files
 2018-09-05 17:16:57 +05:30
Benji
6c9a92671b Minor bugfix (#15210) 
* Minor bugfix

Bugfix for https://github.com/frappe/erpnext/pull/15170

* Update project.py
 2018-09-05 13:24:53 +05:30
Nabin Hait
5122a8e0d7 Merge branch 'staging' into develop 2018-09-05 11:47:30 +05:30
johnhkelley1
431b4fba72 Allow for 0 valuation rate in Stock Reconciliation (#15313) 
Currently, a valuation rate of 0 gets treated the same as an omitted
valuation rate, and gets overwritten during validation. This hotfix
allows a Stock Reconciliation Item's valuation rate to be set to 0.
 2018-09-05 11:43:28 +05:30
Zarrar
3cea3c46b6 change modified date of account to reload fields (#15317) 2018-09-05 11:41:54 +05:30
Saif
8f00db58bd -Moved JE's User Remark on the top of the generated remarks (#15314) 
-Added a field in JE's Account entries to add remarks in specific JE Account entry
 2018-09-05 11:13:06 +05:30
rohitwaghchaure
bcaca85873 [Fix] Meta object has no attribute permissions (#15316) 2018-09-05 11:10:17 +05:30
KanchanChauhan
73bd3cb278 Moved daily event (update_latest_price_in_all_boms) to daily_long since it was timing out (#15253) 2018-09-05 11:01:35 +05:30
Charles-Henri Decultot
b07f482c0c Test case for contact references (#15077) 
* test case for contact references

* Add teardown
 2018-09-05 11:00:14 +05:30
Prateeksha Singh
8a160684b7 [fix] filter() result in list 2018-09-04 10:59:20 +05:30
Faris Ansari
f8af7e0b3d
Merge pull request #15309 from frappe/hub-multiuser 
fix: Revert skeleton in Sidebar
 2018-09-04 10:43:52 +05:30
Faris Ansari
7be9c381d8 fix: Revert skeleton in Sidebar 
- sidebar items repeating for some reason
 2018-09-04 00:12:47 +05:30
Faris Ansari
74a32e6ffe
Merge pull request #15305 from frappe/hub-multiuser 
feat: Add skeleton to Home and Sidebar
 2018-09-03 19:40:22 +05:30
Faris Ansari
66321e6af7 feat: Add skeleton to Home and Sidebar 2018-09-03 19:39:19 +05:30
Prateeksha Singh
76f2430152
Merge pull request #15303 from frappe/hub-multiuser 
Hub Multiuser
 2018-09-03 18:57:41 +05:30
Prateeksha Singh
1265a26c0c Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 18:50:25 +05:30
Prateeksha Singh
456c39336d [hub] update settings after publish, fix route_map 2018-09-03 18:49:33 +05:30
Faris Ansari
2b80bbbe16 Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:50:06 +05:30
Prateeksha Singh
6ba9b3f4de [hub] hide Contact Seller and Save Item in read-only 2018-09-03 17:49:11 +05:30
Faris Ansari
b592a76016 fix: Selling Messages 2018-09-03 17:49:11 +05:30
Prateeksha Singh
ad6948844e Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 17:32:17 +05:30
Prateeksha Singh
b2eadfe31d [hub] show become a seller button to all, but not dialog 2018-09-03 17:31:43 +05:30
Faris Ansari
49ccdd6f07 fix: Move image saving code to hub server 2018-09-03 17:24:17 +05:30
Faris Ansari
d4bba297c2 fix: Container title 2018-09-03 17:12:22 +05:30
Saurabh
1fe1884b73 Merge branch 'master' into develop 2018-09-03 17:00:17 +05:30
Saurabh
4bd562d669 bumped to version 10.1.51 2018-09-03 17:30:15 +06:00
Faris Ansari
28652baacc Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:54:04 +05:30
Faris Ansari
b296be041e fix: email in profile dialog 2018-09-03 16:53:56 +05:30
Prateeksha Singh
bffb707c17 [fix] add message for admin users before register dialog 
- use is_registered api for page routes
 2018-09-03 16:39:59 +05:30
Prateeksha Singh
8fe5e8adf8 Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-03 16:15:42 +05:30
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Saurabh
7b38d93e03 [fix] setup lang in patch 2018-09-03 16:07:40 +05:30
Frappe PR Bot
5c0a831ff2 [Translation] Updated Translations (#15299) 2018-09-03 15:58:04 +05:30
Faris Ansari
ad0be6aaa2 fix: Messages 
- update messages according to new doctype
- sync logo in seller registration
- hub.is_seller_registered() and hub.is_user_registered() api
- Add Users dialog
 2018-09-03 15:43:09 +05:30
Prateeksha Singh
18e3c61109 [marketplace] Disallow unregistered routes if not registered 2018-09-03 15:22:13 +05:30
Prateeksha Singh
47cc30da85 [hub] ask company description in dialog 2018-09-03 13:11:23 +05:30
Shreya Shah
bb88e964a4 Remove unnecessary code (#15296) 2018-09-03 13:01:12 +05:30
Nabin Hait
13109aef9d fix: validate only if service stop date 2018-09-03 12:18:17 +05:30
Jamsheer
8f808cbaf6 Patch - redesign healthcare billing work flow - fix 2018-09-03 11:26:19 +05:30
Jamsheer
34e561876a Test prescription in Sales Invoice - Patient Encounter in draft status 2018-09-03 11:26:19 +05:30
Jamsheer
0640b4794e Healthcare Practitioner - dashboard - updated 2018-09-03 11:26:19 +05:30
Jamsheer
a3b76fa40e Healthcare - Masters - allow import set to 1 2018-09-03 11:26:19 +05:30
Jamsheer
b0ea297cf8 Patient Appointment - department - reqd = 0 2018-09-03 11:26:19 +05:30
Ranjith
2e48337cd4 Patient Encounter - update fields patient_name, patient_age 2018-09-03 11:26:19 +05:30
Jamsheer
a0b3e0268b Healthcare - Doctype - field index = 1 2018-09-03 11:26:19 +05:30
Jamsheer
359bb512b4 Payment mode and Paid amount in Patient Appointment 2018-09-03 11:26:18 +05:30
Jamsheer
7cc205946c Restrict to Healthcare 2018-09-03 11:26:18 +05:30
Jamsheer
363deb67c3 Automate - Patient Apointment Invoicing 2018-09-03 11:26:18 +05:30
Jamsheer
4371c7e492 Healthcare Service Unit - Tree View Updated 2018-09-03 11:26:18 +05:30
Jamsheer
c64880b578 Invoice - lab prescription from submitted Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
0ae100b035 Configuration - Create Lab Test on Sales Invoice Submit 2018-09-03 11:26:18 +05:30
Jamsheer
61574d18bf Fix - Create Multiple Lab Test from Sales Invoice or from Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
858e026fc0 Lab Test - Create Multiple from Sales Invoice or from Patient Encounter 2018-09-03 11:26:18 +05:30
Jamsheer
80468bec31 Lab Test - Remove unused methods 2018-09-03 11:26:18 +05:30
Jamsheer
2ae06d3a35 Healthcare Service Unit - rename field - occupied to occupancy status 2018-09-03 11:26:18 +05:30
Jamsheer
b19993b5bc Codacy - fixes 2018-09-03 11:26:18 +05:30
Jamsheer
25dda3a91a Invoice inpatient occupancy - Qty updated 2018-09-03 11:26:18 +05:30
Jamsheer
9b9518eaaa Healthcare Service Unit Type - Validation and Item price updation 2018-09-03 11:26:18 +05:30
Jamsheer
c8f827be66 Healthcare Service Unit Type - Field - UOM Conversion in Hours 2018-09-03 11:26:17 +05:30
Jamsheer
ee5f9c7b80 Healthcare Invoice - Practitioner Specific Service Item 2018-09-03 11:26:17 +05:30
Jamsheer
e1d215352b Healthcare Practitioner - Service Item Fields - Filter and Validation 2018-09-03 11:26:17 +05:30
Jamsheer
1dbfd5c1e7 Healthcare Settings - Heathcare Service Item - Validation 2018-09-03 11:26:17 +05:30
Jamsheer
e82f27ac10 Healthcare - Invoice Drug Prescription 2018-09-03 11:26:17 +05:30
Jamsheer
197cd88d36 Lab Test Template - rate updation - fix 2018-09-03 11:26:17 +05:30
Jamsheer
a5c3fc69b8 Patch - Healthcare - Invoice - fix 2018-09-03 11:26:17 +05:30
Jamsheer
8da6f4e30c Healthcare - Invoice - Redesign 2018-09-03 11:26:17 +05:30
Jamsheer
25e535c66f Clinical Procedure Item - Remove field invoiced 2018-09-03 11:26:17 +05:30
Jamsheer
1646010059 Clinical Procedure - Consumables Invoice Separately 2018-09-03 11:26:17 +05:30
Jamsheer
0eb64ca38b Healthcare Settings - Filter For Service Items 2018-09-03 11:26:16 +05:30
Jamsheer
edf8821a4e Healthcare Settings - fields - service items 2018-09-03 11:26:16 +05:30
Jamsheer
b2a615b8e8 Healthcare Practitioner - new field - Inpatient Visit Charge 2018-09-03 11:26:16 +05:30
Jamsheer
7f51ffa5eb Patch - Healthcare - Redesign Billing - fix 2018-09-03 11:26:16 +05:30
Jamsheer
eafb046fce Healthcare Utils - prescription - invoice - fix 2018-09-03 11:26:16 +05:30
Jamsheer
fd2879c077 Patch - Healthcare - Redesign Billing 2018-09-03 11:26:16 +05:30
Jamsheer
c6974a79a8 Sales Invoice - show Healthcare Fields - Healthcare in active Domains 2018-09-03 11:26:15 +05:30
Jamsheer
94efed161a Fee Validity - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
146683bbff Fee Validity - invoice reference 2018-09-03 11:26:14 +05:30
Jamsheer
f7a6531fb3 Inpatient Record - Test - Updated 2018-09-03 11:26:14 +05:30
Jamsheer
54ae74eb28 Inpatient Billing 2018-09-03 11:26:14 +05:30
Jamsheer
8cb142bf29 Field Changes - Healthcare Invoice Work Flow Redesign 2018-09-03 11:26:14 +05:30
Jamsheer
bab55390f8 Sales Invoice in Patient Dashboard 2018-09-03 11:26:14 +05:30
Jamsheer
ba11972302 Healthcare Service - Invoice Work Flow - Redesign 2018-09-03 11:26:14 +05:30
Frappe PR Bot
3921660747 [Translation] Updated Translations (#15285) 2018-09-03 11:14:57 +05:30
Saurabh
0754ece288 Patch fixes (#15295) 
* patch fixes

* [Fix] disable shopify if any exception occured while
 2018-09-03 10:44:40 +05:30
Prateeksha Singh
85563ddfd3 [hub] update publish hub api 2018-09-03 02:44:27 +05:30
Prateeksha Singh
5511e06f06 [hub][api] Update save and view api to be user specific 2018-09-03 02:25:41 +05:30
Prateeksha Singh
2cf52e53dd Merge branch 'develop' of https://github.com/frappe/erpnext into hub-multiuser 2018-09-02 19:46:30 +05:30
Prateeksha Singh
a094c0f3f1 [fix] encrypted password in Hub User child record by frappe/frappe#6048 
- use save() instead of insert()
 2018-09-02 19:45:56 +05:30
Faris Ansari
68129df74c feat: Add add_user dialog and methods 
- wip
 2018-09-02 18:29:00 +05:30
Nabin Hait
41b630759c fixed type 2018-09-01 18:37:07 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +05:30
Prateeksha Singh
b2b745fc7a [hub] simplify marketplace settings, remove company fields 
- Company attributes will be fetched/calculated to send to server
- removed them as fields in settings
- Added description in company, with existing logo field
- TODO: for things like logo and description, ask user to set in master
 2018-09-01 17:20:08 +05:30
Faris Ansari
255dd0e03d feat: Add new registration flow 2018-09-01 14:30:46 +05:30
Prateeksha Singh
4e1fd0b417 [hub] register_seller -> register_marketplace 
- resgister_seller will be for subsequent users
- make username and password readonly
- check if password present before trying to create connection
 2018-09-01 09:55:43 +05:30
Prateeksha Singh
810ae01832 [hub] make client connection for first registered user 
- remove usage of Hub Connector
 2018-09-01 01:14:29 +05:30
Prateeksha Singh
1801cc8962 [fix] hub_url -> marketplace_url 2018-09-01 00:39:08 +05:30
Prateeksha Singh
747c464248 [fix] save() -> insert() for single doc, use doc.append in child table 2018-09-01 00:12:17 +05:30
Prateeksha Singh
a8065ff725 [hub] move register_seller to api, remove old code 2018-08-31 22:41:26 +05:30
Prateeksha Singh
c726fce4b1 [hub] set first user's password in marketplace users 2018-08-31 20:42:48 +05:30
Prateeksha Singh
3588486e5b
[fix] hub_settings -> marketplace_settings in call 2018-08-31 20:12:33 +05:30
Prateeksha Singh
ea2b9cbd1c [hub] add user selection in register 2018-08-31 17:56:50 +05:30
Faris Ansari
dc1a2e2a37 fix: Allow read permission to everyone on Marketplace Settings 2018-08-31 17:31:22 +05:30
Nabin Hait
f1a3fbdb6b minor fixes in dropship 2018-08-31 17:05:20 +05:30
Fisher Yu
2e5c776293 Update sales_order.py 
1. filter out the suppliers by which the dropship purchase order already created
2. allow create multi dropship draft purchase orders
 2018-08-31 17:05:20 +05:30
Fisher Yu
102bc7f5cf Update sales_order.js 
for creating dropship purchase orders, allow the user to leave supplier field empty, it will auto create all dropship purchase orders for multi suppliers assigned to sales order items.
 2018-08-31 17:05:20 +05:30
Rohit Waghchaure
12b4096e68 [Minor] Don't validate on cancelled budgest 2018-08-31 16:54:59 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3 
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
 2018-08-31 16:52:26 +05:30
Valmik
2175b90b8d Added feature to optimize routes, also cleaned up code (#15193) 2018-08-31 16:39:29 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +05:30
Rushabh Mehta
a2288ff8e7 fix(assessment_result): student must be in group (#15255) 
* fix(assessment_result): student must be in group

* fix(test_student_group): raise correct exception

* fix(unused-import): assessment-plan.py

* fix(tests)

* fix(tests)

* fix(test)

* fix(tests)
 2018-08-31 16:12:49 +05:30
Faris Ansari
25f509ebd3 feat: Add disable marketplace option in Hub Settings 2018-08-31 15:35:32 +05:30
Nabin Hait
1b73505391
Update sales_invoice.py 2018-08-31 14:56:16 +05:30
Nabin Hait
3c56aa9c1d minor fixes 2018-08-31 14:51:01 +05:30
Nabin Hait
9cc28a77c9 minor fixes 2018-08-31 14:49:20 +05:30
Ameya Shenoy
203152d67e indentation: fixes 2018-08-31 14:33:48 +05:30
Nabin Hait
e033df2757 minor fixes 2018-08-31 13:30:03 +05:30
Nabin Hait
b259e3eb06 Merge branch 'defer-stop-date' of https://github.com/Zlash65/erpnext into Zlash65-defer-stop-date 2018-08-31 12:39:46 +05:30
Saurabh
5c3590fa8d Merge branch 'master' into develop 2018-08-31 11:29:14 +05:30
Saurabh
648191b9e8 bumped to version 10.1.50 2018-08-31 11:59:13 +06:00
Shreya Shah
ee8f8281b4 [py3] Convert filter object to list (#15260) 2018-08-30 19:22:22 +05:30
Faris Ansari
91ac26c2ff fix(seller dialog): Email should be session user email (#15270) 2018-08-30 19:19:57 +05:30
rohitwaghchaure
624927bf0b [Fix] Not able to export the Supplier-Wise Sales Analytics report (#15271) 2018-08-30 19:19:14 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Bassam Ramadan
8d7c1868d6 fix for fields names at sales invoice return payments and verifying the payment amount (#15245) 
* fix for payments field names in sales invoice return

* add verification for payment amount at sales invoice return

adding verification to be sure the payment amount is negative at sales
invoice return

* correction for precision field name
 2018-08-30 19:15:15 +05:30
KanchanChauhan
0cd5313c69 Validate Completed Qty and Produced qty in Stock Entry for Manufacture (#15248) 2018-08-30 19:11:15 +05:30
Nabin Hait
9983d41fb0 Fixed divison error 2018-08-30 19:10:36 +05:30
Faris Ansari
00f6aef947 fix(publish items): Filter out disabled items (#15268) 2018-08-30 18:54:28 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Nabin Hait
f6b784e39e Test fixes 2018-08-30 18:42:35 +05:30
Shreya Shah
68348d4130 [Attendance-Tool] Filter employees based on date of joining (#15262) 2018-08-30 17:25:58 +05:30
Shreya Shah
3df2639a32 Optimize patch (#15263) 2018-08-30 17:24:03 +05:30
Prateeksha Singh
75ae844d70
Merge pull request #15247 from frappe/hub-redesign 
[encore] MarketPlace
 2018-08-30 17:12:41 +05:30
Prateeksha Singh
ecad873d19 [hub] remove item.js, fix seller decription condition 2018-08-30 16:21:26 +05:30
Nabin Hait
2390da647f GSTR-1 minor fixes 2018-08-30 16:16:48 +05:30
Prateeksha Singh
5797565dd0 Merge with upstream 2018-08-30 16:15:27 +05:30
Prateeksha Singh
ff52e93e69 [hub] Merge conflicts 2018-08-30 16:11:41 +05:30
Prateeksha Singh
997bfa4916 [hub] add review timeline element 2018-08-30 16:08:52 +05:30
Faris Ansari
f3034ae262 feat: Add Report Item dialog 2018-08-30 16:05:15 +05:30
Faris Ansari
8e04487253 fix: Rename 'Product' to 'Item' 2018-08-30 15:35:17 +05:30
Prateeksha Singh
dc36d52ef9 [hub] fix review send 2018-08-30 15:12:18 +05:30
Faris Ansari
6b695d32b2 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 14:36:14 +05:30
Faris Ansari
90265aec24 fix: Page container routing 2018-08-30 14:36:05 +05:30
Faris Ansari
062cd62484 fix: Add restrictions for session user who is not hub seller 2018-08-30 14:35:56 +05:30
Prateeksha Singh
bff2bdc858 [hub] UI and empty state in 'your products' to guide on publishing 2018-08-30 12:58:46 +05:30
Prateeksha Singh
47f5f0e608 [hub] remove See All from non expandable sections 2018-08-30 12:16:08 +05:30
Prateeksha Singh
a4c24bda65 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 12:01:39 +05:30
Prateeksha Singh
b20c4e3184 [hub] remove client hub_settings scripts 
- multiline to single line messages to translate
 2018-08-30 12:01:04 +05:30
Faris Ansari
d32e7f8d02 fix: Administrator cannot register on marketplace 2018-08-30 11:53:46 +05:30
Faris Ansari
95e4141bf2 fix: Remove unused imports 2018-08-30 11:46:14 +05:30
Zlash65
80f5cb05cc fixes in setting end_date and manual provision of start&end date 2018-08-30 10:39:48 +05:30
Zlash65
91eae54383 manually provide start and end date 2018-08-30 10:39:48 +05:30
Zlash65
d0e37327e6 start date logic fix 2018-08-30 10:39:48 +05:30
Zlash65
7b3fd85943 end date / stop date calc fix 2018-08-30 10:39:48 +05:30
Zlash65
4ce8c7f383 end date should reset if start date is changed 2018-08-30 10:39:48 +05:30
Zlash65
d676a67769 validate changing service stop date once its set 2018-08-30 10:39:48 +05:30
Zlash65
339c2e9f15 book last gl_entry based on service stop date 2018-08-30 10:39:48 +05:30
Zlash65
243863a290 validation for stop date added 2018-08-30 10:39:48 +05:30
Zlash65
33cff7735e service stop date field added 2018-08-30 10:39:48 +05:30
Rushabh Mehta
20fd2ddd1c ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
Prateeksha Singh
04d051bb73 [hub] add review area 2018-08-30 02:42:13 +05:30
Prateeksha Singh
89ed2d9b34 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-30 02:33:28 +05:30
Prateeksha Singh
a6f184bcb7 [hub] remove old post and preprocess, log with minimal info 2018-08-30 02:30:40 +05:30
Faris Ansari
114d595de9 fix: Set hub_url in Hub Settings 
- add patch to set the value
 2018-08-29 18:24:49 +05:30
Faris Ansari
e4c7729089 fix(Hub Settings): Set site_name before seller registration 2018-08-29 17:13:43 +05:30
Faris Ansari
b7126c23f7 fix(Hub Settings): Remove unused fields 2018-08-29 17:13:16 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Nabin Hait
28f9b0a9ab (fix)test case: loyalty program, course schedule and more 2018-08-29 17:05:11 +05:30
Faris Ansari
458cf6fcc5 style: remove trailing spaces 2018-08-29 16:19:39 +05:30
Faris Ansari
8683bd82ed fix: Base64 extraction 
- use requests to fetch the image without storing it anywhere
- only read local files
 2018-08-29 16:18:36 +05:30
Faris Ansari
ff8f1c6120 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-29 15:02:47 +05:30
Faris Ansari
64202ad416 fix: Only a System Manager can register as a seller 
- every other user has read only access
 2018-08-29 15:02:39 +05:30
Prateeksha Singh
02c176c0e6 [hub] fix code lint issues, styles 2018-08-29 14:27:47 +05:30
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Nabin Hait
af497ef669 bumped to version 10.1.49 2018-08-29 13:43:53 +06:00
Nabin Hait
6b539d65d7 Restored missing rounded_total fields 2018-08-29 12:41:23 +05:30
Faris Ansari
8bc954ecc6 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 18:29:08 +05:30
Faris Ansari
b26381e6b8 fix: Scroll to top when route changes 2018-08-28 18:29:01 +05:30
Prateeksha Singh
bd7d964848 [hub] Merge Develop 2018-08-28 18:25:07 +05:30
Zarrar
34208cc89d
Revert "Google maps settings" 2018-08-28 17:25:21 +05:30
Prateeksha Singh
2d45373f33 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:25:01 +05:30
Prateeksha Singh
1e02f00075 [hub] record views, update favourite api 2018-08-28 17:24:31 +05:30
Faris Ansari
6df06cac97 fix: Show empty state if there are no items 2018-08-28 17:19:35 +05:30
Faris Ansari
c12f48da2d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-28 17:17:36 +05:30
Faris Ansari
811a2deb0f fix: Load and save base64 image in publish 2018-08-28 17:17:29 +05:30
Faris Ansari
5689494f9c chore: Remove old messages page 2018-08-28 16:52:17 +05:30
Saurabh
5b398f293a [fix] typo fix 2018-08-28 16:28:12 +05:30
Nabin Hait
a626d967c0 [fix] naming series refactor patch 2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895 [fix] naming series refactor patch 2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7 [fix] naming series refactor patch 2018-08-28 15:44:46 +05:30
Saurabh
f2caacdf74 [fix] fix google map imports (#15240) 2018-08-28 15:23:35 +05:30
Nabin Hait
2d28eccdcf [fix] naming series refactor patch 2018-08-28 15:18:48 +05:30
Suraj Shetty
b92403fbed Add 'Become Seller' as a primary key 
- Also remove some unwanted code
 2018-08-28 15:04:33 +05:30
Suraj Shetty
f994e3ec6b Remove 'Become Seller' option from sidebar 2018-08-28 15:03:01 +05:30
Nabin Hait
2b9186da5a [fix] naming series patch 2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307 [fix] for python 3 2018-08-28 14:39:47 +05:30
Nabin Hait
04bca58fb7 [fix] missing functions related to google maps 2018-08-28 14:21:48 +05:30
Aditya Hase
e3ac5ff9e3 erpnext: refactor async to is_async (#15231) 2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c minor fix 2018-08-28 14:09:36 +05:30
Saurabh
79f3ea4094 [minor][fix] call update_percent_complete via validate (#15235) 2018-08-28 14:01:34 +05:30
Shreya Shah
e0a47aeb2f Improve performance for warehouse tree (#15207) 
* Fix conflicts

* Modify query structure

* Remove whitespaces
 2018-08-28 13:46:22 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
Saurabh
1898e11585 patch sequence fix 2018-08-28 13:04:40 +05:30
Suraj Shetty
ec12b34a79 Add margin below publish area 2018-08-27 20:37:06 +05:30
Suraj Shetty
49c37d5a8e Add strip html filter 2018-08-27 20:31:29 +05:30
Faris Ansari
a4dcb6f548 fix: Add empty state in Selling 2018-08-27 19:57:12 +05:30
Faris Ansari
725603c0a9 feat: Selling Page 
- common Messages page for both buying and selling
 2018-08-27 19:51:36 +05:30
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +05:30
Prateeksha Singh
bc859cbf1d Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-27 15:16:53 +05:30
Prateeksha Singh
872768d89f [hub] merge conflicts 2018-08-27 15:16:19 +05:30
Suraj Shetty
dc7e8e6a26 Replace hub_item_code -> hub_item_name 2018-08-27 14:11:48 +05:30
Zarrar
93577665f2 [Enhance] Multiselect for Cost Center and Project (#15208) 
* add filter for Cost Center, make CC & Project multiselect field

* update queries according to project/cost_center multiselect

* add multiselect filter for cost_center and project

* update query according to multiselect
 2018-08-27 12:08:53 +05:30
Maxwell Morais
a2c1d92374 Revert "Fix shipping_address for DropShipping" (#15218) 
* Revert "Cleaned up welcome email code (#15175)"

This reverts commit 771fbb8f01.

* Revert "[Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187)"

This reverts commit 2b72d09948.

* Revert "[Enhance] Provision to backflush raw materials from WIP warehouse (#15184)"

This reverts commit c5cf428d00.

* Revert "[Minor] Create default department on country setup (#15206)"

This reverts commit 2b2712bb9e.

* Revert "Permissions issue in BOM tree"

This reverts commit 8fe8d1758a.

* Revert "Fix indentation accounts_receivable.py (#15203)"

This reverts commit fbc3df3247.

* Revert "Fix shipping_address for DropShipping (#15202)"

This reverts commit 4a394bcbf4.
 2018-08-27 12:05:41 +05:30
Ahmed Madi
1516b8d54a Update asset_category.js (#15222) 2018-08-27 12:04:12 +05:30
Zarrar
b94c7075d8 rectify item price route (#15223) 2018-08-27 11:44:13 +05:30
rohitwaghchaure
e33047250e [Fix] Speacial character issue in searching project in sales invoice (#15220) 2018-08-27 11:43:57 +05:30
Prateeksha Singh
fa26899cd0 [hub] added DetailHeaderItem to detail pages, contact seller button 2018-08-27 10:49:42 +05:30
Prateeksha Singh
d0a952bcda [hub] Register components, init Item Page 
- commonly used components are pre-registered
- add DetailHeaderItem component
- begin ItemPage
 2018-08-27 10:12:45 +05:30
Faris Ansari
f089dad7c7 feat: Sidebar in vue 2018-08-26 22:20:16 +05:30
Faris Ansari
d37108d18e fix: Add back link to Buying 2018-08-26 22:19:56 +05:30
Faris Ansari
23e45ada69 chore: Remove old messages files 2018-08-26 22:19:29 +05:30
Faris Ansari
ea82fb9f80 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 20:09:12 +05:30
Faris Ansari
caebd4a9b9 feat: Buying and BuyingMessages in vue 2018-08-26 20:09:02 +05:30
Faris Ansari
019bfd3940 feat: Add helper directives 
- v-route
  automatically route to a valid frappe route
- v-img-src
  handle img loading and error handling
 2018-08-26 20:08:40 +05:30
Faris Ansari
bf5cc7d823 feat: SectionHeader component 2018-08-26 20:00:42 +05:30
Faris Ansari
4a2ea993fd fix(search-input): submit on enter 2018-08-26 19:49:20 +05:30
Faris Ansari
fad623eb27 feat: Add dynamic routes in PageContainer 2018-08-26 19:48:52 +05:30
Prateeksha Singh
fad0f64c94 [hub][vue] add action object in empty state, make NotFound page 2018-08-26 18:27:04 +05:30
Prateeksha Singh
5c9b13f5e5 [hub][vue] add skeleton state to DetailView 2018-08-26 18:06:25 +05:30
Prateeksha Singh
9e8d7bbeda [hub][vue] Seller Page 2018-08-26 16:29:32 +05:30
Prateeksha Singh
80a8dfd6ba Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-26 13:09:52 +05:30
Prateeksha Singh
5e30beec86 [hub][vue] DetailView and Profile page 2018-08-26 13:09:19 +05:30
Faris Ansari
888dd606ff feat: Add PageContainer 2018-08-26 12:41:02 +05:30
Suraj Shetty
0e59ec3ed2 Update messages UI 2018-08-26 10:07:00 +05:30
Suraj Shetty
88700cf2b9 Separate links for selling and buying messages 
- Add separate UI for selling messages
- Remove some redundant code messages
 2018-08-26 10:06:27 +05:30
Prateeksha Singh
de426cb543 [hub][vue] Home page, add section title in item key in v-for 2018-08-25 21:54:49 +05:30
Prateeksha Singh
53fada1ae9 [hub][vue] search page 2018-08-25 20:31:48 +05:30
Prateeksha Singh
0be2859f5b [hub][vue] Category and Published Products pages 2018-08-25 15:54:43 +05:30
Prateeksha Singh
c31e5c0013 [hub][vue] replace page files, fix item 'seen' prop 2018-08-25 14:09:01 +05:30
Prateeksha Singh
00175eab8e [hub][vue] Saved Products Page, remote item card 
- also undo unfavouriting items
 2018-08-25 13:18:30 +05:30
Prateeksha Singh
fe41713974 [hub][vue] add import 2018-08-24 16:53:34 +05:30
Prateeksha Singh
40f7c4663a [hub][vue] Publish Page 2018-08-24 16:38:34 +05:30
Neil Trini Lasrado
771fbb8f01 Cleaned up welcome email code (#15175) 2018-08-24 15:15:56 +05:30
rohitwaghchaure
2b72d09948 [Fix] Raw materials are not showing in the stock entry if skip transfer is enabled and backflush is based on stock entry (#15187) 2018-08-24 11:28:34 +05:30
rohitwaghchaure
c5cf428d00 [Enhance] Provision to backflush raw materials from WIP warehouse (#15184) 2018-08-24 11:27:41 +05:30
Zarrar
2b2712bb9e [Minor] Create default department on country setup (#15206) 
* make default department when creating new company

* remove departments and tds entry for the company
 2018-08-24 11:26:51 +05:30
Prateeksha Singh
67e0374261 [hub] add data-driven notification message 2018-08-23 23:55:04 +05:30
Prateeksha Singh
b696b2965d [hub][vue] add empty state and dynamic publish button 2018-08-23 21:25:53 +05:30
Nabin Hait
8fe8d1758a Permissions issue in BOM tree 2018-08-23 16:25:51 +05:30
Prateeksha Singh
d7d2bb261b [hub] add SearchInput 2018-08-23 13:52:41 +05:30
Prateeksha Singh
6e5b9a8f9b Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-23 12:23:09 +05:30
Prateeksha Singh
ff616b8845 [hub][vue] init item card container in vue 2018-08-23 12:22:20 +05:30
Mario Monroy
fbc3df3247 Fix indentation accounts_receivable.py (#15203) 2018-08-23 11:10:15 +05:30
Faris Ansari
c4e38ffd4d Remove hub page (#15195) 2018-08-23 11:09:31 +05:30
Maxwell Morais
4a394bcbf4 Fix shipping_address for DropShipping (#15202) 
This stretch of javascript go against the address definition for DropShipping.
When we create an PO from SO with dropshipping items, the backend code update fine the shipping address, but this stretch of code, replace the customer address to the Company address.

To reproduce that behavior, pick one sales order with Drop Shipping Items, make and purchase order, and take a look into the delivery address.
 2018-08-23 11:08:37 +05:30
Charles-Henri Decultot
25712f8d65 Sales order correction (#15190) 2018-08-23 10:51:44 +05:30
Benji
363dd2773e Update email_digest.py (#15144) 2018-08-22 21:57:51 +05:30
Suraj Shetty
341386e3a7 Add list view for messages 2018-08-22 21:31:16 +05:30
Suraj Shetty
d94701e5cc Add recent message block to item_card 2018-08-22 16:47:50 +05:30
Suraj Shetty
b361c234b1 Remove unused message to avoid confusion 2018-08-22 16:44:55 +05:30
Valmik
6ad16db88c check for existing task before appending to child table (#15183) 2018-08-22 14:46:33 +05:30
Shreya Shah
be7703387d Fetch reserved qty (#15182) 
* Fetch reserved qty

* Update get_item_details.py
 2018-08-22 14:45:22 +05:30
Faris Ansari
427a1301b7 Issues on the Portal should be editable (#15181) 2018-08-22 14:43:32 +05:30
Suraj Shetty
7ee79498fc Hide review option for unregistered user 2018-08-22 12:09:40 +05:30
Suraj Shetty
831ff42101 Stop event bubbling on clicking edit item 2018-08-22 11:52:20 +05:30
Suraj Shetty
12de0aec11 Fix publish button alignment 2018-08-22 11:50:23 +05:30
Suraj Shetty
fc7b7b6b97 Allow item list for System Manager 2018-08-22 11:32:49 +05:30
Suraj Shetty
7a040c4dd8 Show favorite button only for registered user 2018-08-22 11:32:49 +05:30
Suraj Shetty
f9e4cca334 Throw error if hub_url is not present in site_config 2018-08-22 11:32:49 +05:30
Suraj Shetty
3cd0c54438 Fix pyhton 3 compatibility 2018-08-22 11:32:49 +05:30
Prateeksha Singh
631c170ccf [hub] fix merge conflicts 2018-08-21 21:00:53 +05:30
Prateeksha Singh
caadd8af4e [Hub] sync with insert_many, Remove Data Migration Run 💥 
- Use FrappeClient insert_many to publish items
- We will be syncing small amounts of items anyway
- Also, we need only the insert action in bulk
 2018-08-21 19:59:15 +05:30
Faris Ansari
e745e85d98 feat: route to message room page after contact seller dialog 2018-08-21 19:48:42 +05:30
Faris Ansari
e7af44f1a6 fix: remove items with invalid image 2018-08-21 19:48:06 +05:30
Faris Ansari
a22aa60a17 Merge with upstream 2018-08-21 19:17:25 +05:30
Faris Ansari
ff189b6853 fix: publish items 
- Pass image data as a json
- ignore duplicates while creating Hub Tracked Item
 2018-08-21 19:14:44 +05:30
Faris Ansari
d29a3b3567 Highlight links with part route or full route 2018-08-21 19:12:10 +05:30
Zlash65
4d462d637f indentation fix 2018-08-21 18:19:26 +05:30
Rushabh Mehta
9a29bfa49e fix(indentation): sales_and_purchase_return.py 2018-08-21 17:53:25 +05:30
Prateeksha Singh
b0a3a106fc [hub] profile email uneditable, style additions, base64 sync enable 2018-08-21 17:43:30 +05:30
Faris Ansari
d17aedb719 Add BuyingMessages page 2018-08-20 18:33:46 +05:30
Bassam Ramadan
1ff2315899 Trial balance and payable accounts reports and sales return fixes (#15000) 
* adding supplier type filter to payable accounts and payable accounts summary reports

adding supplier type filter to payable accounts and payable accounts
summary reports as customer group at receivable accounts and summary
reports as its important and easier to put this filter

* fix trial balance opening and closing values

the removed mathematical operations was causing showing incorrect values
at opening and closing columns where the total row was correct so the
operation deleted to view the correct values to be equal to the total
row and to stop confusing the user due to different values between the
total row and the the values in front of each account

* fix for supplier type filter field on payable accounts reports

rename the supplier type filter field to supplier group in payable
accounts and summary reports

* fix for paid amount in returned sales invoice

the current paid amount not change from source value if you deleted any
item if the invoice contain for example 3 items and you only need to
return on item the current steps is to open the original invoice and
press on make return then you delete the unwanted items but in this case
the paid amount will not change and you will get an alert from the
system until you change it manually but with this modification it works
very well.

* fixing trial balance values and totals

fixing trial balance opening and closing ( DR - CR ) values and totals
 2018-08-20 17:58:28 +05:30
Saif
15636a3b98 Problem: Making a PE from PO led to incorrect values in PE form since PO's default party_account_currency is the company's currency (#15153) 
Fix: PO will set party_account_currency to supplier's default currency on validation.
 2018-08-20 17:57:00 +05:30
Saif
a09a8c3bf7 Fixed missing DocType info for Purchase Items (#15152) 
* Made Purchase Invoice Items' Batch No and Serial No fields non copyable.

* Added appropriate currency field options to Purchase...Items DocFields:
-Landed Cost Voucher Amount
-Billed Amt
 2018-08-20 17:55:18 +05:30
rohitwaghchaure
8cca61f1ba [Fix] Removed roles for Eway bill report (#15157) 2018-08-20 17:53:56 +05:30
rohitwaghchaure
b800382abf [Fix] Due to incorrect conversion factor user not able to make purchase return entry (#15163) 2018-08-20 17:50:31 +05:30
rohitwaghchaure
e689a903d8 Allowed data import for Assessment Result (#15168) 2018-08-20 17:50:04 +05:30
Saif
e3947296e8 Group by Voucher fix in General Ledger Report (#15169) 
* -Group by Voucher requires ordering the query not grouping the query
-Summing fields is not necessary since grouping by 'name' is the same as getting individual entries

* Group by Voucher show groups with totals at the end of group
 2018-08-20 17:49:29 +05:30
Benji
299185fe24 Improved task weight calc (#15170) 
* Improved task weight calc

Removed the requirement to have total of task weights to be exactly 1.

* Update project.py
 2018-08-20 17:41:56 +05:30
rohitwaghchaure
ecc6af9d2a [Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171) 2018-08-20 17:39:54 +05:30
Nabin Hait
c95153f83b Offer date mandatory in job offer 2018-08-20 16:58:06 +05:30
Faris Ansari
8de6380648 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 15:58:58 +05:30
Prateeksha Singh
71b41b4771 [hub] response data in hub call event trigger 2018-08-20 15:42:48 +05:30
Prateeksha Singh
e72a2fa9de [hub] emit hub call event to set category options while publishing 2018-08-20 14:18:07 +05:30
Prateeksha Singh
6faffa5007 [feat] new component: ItemPublishDialog 2018-08-20 14:02:33 +05:30
Prateeksha Singh
4ce54b0011 [feat] new component: NotificationMessage 2018-08-20 13:07:23 +05:30
Zarrar
2b0ecbed2b python3 based fix for sorted (#15159) 2018-08-20 11:15:06 +05:30
Prateeksha Singh
42be665412 Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign 2018-08-20 10:08:49 +05:30
Prateeksha Singh
96fdbd467d [hub][feat] stateful publishing area 2018-08-20 10:07:56 +05:30
Prateeksha Singh
fe67508d60 [hub][feat] Edit your Profile, recycle profile dialog 2018-08-20 01:18:41 +05:30
Prateeksha Singh
305f7375d1 [hub] Register in a dialog instead of Page 
- in order to recycle it for Edit Profile
- Also, the register page had too much custom code
 2018-08-20 00:25:26 +05:30
Prateeksha Singh
a525d12f69 [hub] sync multiple image urls 
- using a simple multiselect currently
 2018-08-19 22:31:33 +05:30
Prateeksha Singh
0a60d1cd96 [hub] Publishing Dialog, Sync category 
- Hub Category selection
- Recycled
 2018-08-19 19:39:00 +05:30
Faris Ansari
2ce2e1b6b0 feat(messages): split messages into buying and selling 
- messages will be organized by their purpose, i.e Buying and Selling
- on clicking the buying item, the message room page will be opened
where sellers can communicate
- invalidate cache using event key
 2018-08-17 18:39:36 +05:30
Faris Ansari
335c0f200f feat: custom cache invalidation for hub calls 
In some cases, we know when to invalidate the cache.
This feature allows to do just that.
erpnext.hub namespace is now an EventEmitter instance.
 2018-08-17 16:04:14 +05:30
Faris Ansari
c1fe1c45c7 feat: empty states for favourites and search page 2018-08-17 14:29:42 +05:30
Faris Ansari
aa46567439 refactor: rename hub-card-container to hub-items-container 2018-08-17 14:29:22 +05:30
Rushabh Mehta
5f33b69f2f fixes(minor): clean item group html and hide image 2018-08-16 14:48:02 +05:30
Nabin Hait
9409eddf28
Update __init__.py 2018-08-16 13:58:44 +05:30
rohitwaghchaure
5c5688b374 Added provision to disabled in stock in products settings (#15133) 2018-08-16 10:33:28 +05:30
Charles-Henri Decultot
bd06a5b0ee Small python 3 compatibility correction (#15151) 2018-08-16 10:32:49 +05:30
Shreya Shah
80f30094fb Fix error msg (#15146) 2018-08-16 10:29:16 +05:30
rohitwaghchaure
6fb2117767 Allow to make budget for the same cost center with different account (#15149) 2018-08-16 10:22:06 +05:30
Rushabh Mehta
8705371ef0 fix(product-listing): fix variant selection in website 2018-08-16 09:22:45 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report 
[Fix] Consolidated balance sheet report
 2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85 [Fix] Consolidated balance sheet report 2018-08-15 16:18:46 +05:30
Zarrar
3523b779aa rounding off fixes and conversion fix (#15140) 2018-08-14 16:28:14 +05:30
Ameya Shenoy
338dfcfb63 monkey patching for demo (#15141) 2018-08-14 16:27:47 +05:30
Prateeksha Singh
460e2798cd [hub] Favourites UI 
- remove from listing
- add to favourites
 2018-08-14 11:42:40 +05:30
Faris Ansari
4809f86035 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) 2018-08-14 10:56:18 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124) 
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
 2018-08-14 10:51:48 +05:30
rohitwaghchaure
88b0a1305f Code optimization for accounts receivable report to avoid timeout error (#15114) 
* Code optimization for accounts receivable report to avoid timeout error

* Added index for party_type
 2018-08-14 10:51:13 +05:30
Prateeksha Singh
1a0fb5b63a Add detail page favourited state 2018-08-14 01:31:03 +05:30
Prateeksha Singh
c5a9972785 [refactor][major] Separate out Components 
- item_card
- item_card_container
- detail_view
- search_bar
- reviews
- skeleton_state
- empty_state
- empty_state
 2018-08-13 21:36:07 +05:30
Nabin Hait
3b5f18231a fix(item_defaults): Item name was overwriting by child name 2018-08-13 17:45:29 +05:30
Saurabh
ddbf3aaccb Merge branch 'master' into develop 2018-08-13 13:15:58 +05:30
Saurabh
cd6b955b99 bumped to version 10.1.48 2018-08-13 13:45:56 +06:00
Rohit Waghchaure
18960c7757 Project task custom field not copying and error on project 2018-08-13 11:40:11 +05:30
Zarrar
a4d06fc881
replace cur_frm with frm 2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b
replace department group to department 2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9
replace customer to department 2018-08-11 21:54:56 +03:00
Nabin Hait
c35271aef5 fix(various) 2018-08-10 19:01:13 +05:30
Saurabh
20fb443f0c [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
Saurabh
57d3c93e6b bumped to version 10.1.47 2018-08-10 17:37:01 +06:00
Prateeksha Singh
b777f3dbfd [layout][iterate] item detail page actions 2018-08-10 10:38:28 +05:30
Nabin Hait
8bf52fef42 minor fixes 2018-08-09 19:45:33 +05:30
Nabin Hait
c13960ddc9 minor fix 2018-08-09 18:25:03 +05:30
Nabin Hait
e07bf15de2 minor fix 2018-08-09 17:38:04 +05:30
rohitwaghchaure
a0b846fb88 [Minor] Added condition for get_bank_cash_account (#15112) 2018-08-09 15:51:38 +05:30
rohitwaghchaure
8356d4b892 [Fix] disable_rounded_total not found error (#15113) 2018-08-09 15:51:11 +05:30
rohitwaghchaure
ba62013cbb [Fix] Not able to delete the task even if task removed from the project (#15105) 
* [Fix] Not able to delete the task even if task removed from the project

* [Fix] Custom field's data in task not updating from the project
 2018-08-09 15:50:23 +05:30
Nabin Hait
2a774fa0ac minor fix 2018-08-09 11:50:34 +05:30
Nabin Hait
6a5695fe17 minor fix 2018-08-09 11:30:21 +05:30
rohitwaghchaure
59de1dae6a [Fix] Math domain error (#15107) 2018-08-09 10:58:37 +05:30
Nabin Hait
9a33bc6417 optimizing transactions by caching 2018-08-09 10:47:09 +05:30
Nabin Hait
50238c3049 [optimize] tree conditions for pricing rule 2018-08-08 18:43:04 +05:30
Himanshu Mishra
859d942b22 Cached calls (#15109) 
* [optimize]: bin updates

* [optimise]: use frappe.get_cached_value instead of get_value for item

* [fix]: change db.get_cached_value to get_cached_value
 2018-08-08 18:33:50 +05:30
Himanshu Mishra
f56aac65e1 [optimize]: bin updates (#15108) 2018-08-08 18:32:03 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
Rushabh Mehta
4d0b8da0e5 fix(style): modal for website 2018-08-08 14:48:02 +05:30
Nabin Hait
84c7c77009 [optimize] Get defaults from item group based on doc 2018-08-08 14:30:44 +05:30
Nabin Hait
3f142b874a item defaults based on caching 2018-08-08 13:02:59 +05:30
ahmad zaqout
63a741e5c8 fix throw_overlap_error in Shift Assignment (#15103) 
fix throw_overlap_error in Shift Assignment
 2018-08-08 10:36:40 +05:30
Solufyin
3be899caff Item Alternate Image Features in e-commerce site. (#15044) 
* [ADD] Added Item Alternate Image Features in e-commerce site.

* [IMP] Improved Code for Item Alternate Image Feature.

* [IMP] Improved code for Item alternative image functionality.

* Remove .css file and make a build for erpnext-web.css

* Cleanup styling for item alternate image, also add delegated handler

* Spaces -> Tabs

* Spaces -> Tabs in item.html
 2018-08-07 18:28:39 +05:30
rohitwaghchaure
8f0acf30bf
Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet 
[Fix] 'ascii' codec can't encode error in balance sheet report
 2018-08-07 16:53:21 +05:30
Rohit Waghchaure
9a9974f5c3 [Fix] 'ascii' codec can't encode error in balance sheet report 2018-08-07 16:51:56 +05:30
Ameya Shenoy
c63e0f9902
Merge pull request #15100 from codingCoffee/splitissue2 
[fix] Split issue
 2018-08-07 16:43:35 +05:30
Ameya Shenoy
f2e73dd687 [fix] Split issue 
take reference name from communication
 2018-08-07 16:34:37 +05:30
Meritsystems
1ad8eca4e8 Point of sale will list only items that are in stock based on option "Display Items in stock" in POS Profle. (#14895) 
* Update point_of_sale.py

* Update point_of_sale.py

Add custom field(Display Items In Stock) to POS Profile Doctype of type Check.

* New field " Display Items in Stock" added

* Update point_of_sale.py

* Update point_of_sale.py

ORM used instead of SQL
used Bin to find actual quantity balances.

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py

* Update point_of_sale.py
 2018-08-07 14:38:50 +05:30
Saurabh
824b388631 Resolved merge conflicts 2018-08-07 13:01:11 +05:30
Prateeksha Singh
28d52dfe0c [hub][fix] Category page api call 2018-08-07 12:56:56 +05:30
Saurabh
6ec558bd59 bumped to version 10.1.46 2018-08-07 13:25:51 +06:00
Prateeksha Singh
318cca8cae [hub] Add 'See All' for Category items 
- Also remove special `cursor: pointer` style
- Set it for all elements having a data-route
 2018-08-07 12:41:21 +05:30
Prateeksha Singh
82b9508622 Add Products by Seller 2018-08-07 12:02:14 +05:30
Faris Ansari
796ca56f85 Use frappe.utils.md_to_html instead of manual import (#15087) 2018-08-07 11:53:36 +05:30
Prateeksha Singh
658d1bbae2 Fix product header styles 2018-08-06 19:13:10 +05:30
Prateeksha Singh
d3da401ef4 Home: Category-wise Items 2018-08-06 18:31:26 +05:30
Prateeksha Singh
b614ece991 [hub] Move sync, correct legacy code 2018-08-06 17:48:45 +05:30
Zarrar
2cadb1e12e add tax withholding & loyalty program in explore view (#15074) 2018-08-06 14:46:16 +05:30
Doridel Cahanap
59e4c32e9f Allow Disabling Batch and edit Validations (#15076) 2018-08-06 14:45:18 +05:30
Shreya Shah
11dd3ffdb5 Force delete item on deletion of Lab test template (#15079) 2018-08-06 14:43:00 +05:30
Shreya Shah
f0ef673498 Accounts receivable aging based on supplier due date (#15080) 
* Accounts receivable aging based on supplier due date (#13801)

* Remove spaces
 2018-08-06 14:42:35 +05:30
Charles-Henri Decultot
614959d5f8 Correction of the get_price method for pricing rules (#15082) 
* Addition of currency arg in get_price

* Change Price to Rate
 2018-08-06 14:42:04 +05:30
Jignesh Greycube
ef961746c1 Spelling updated from Maxiumm to Maximum (#15093) 
Spelling updated from Maxiumm to Maximum
 2018-08-06 14:32:46 +05:30
rohitwaghchaure
57d07d6b8e
Merge pull request #15097 from rohitwaghchaure/incorrect_tax_amount_in_report 
[Fix] Incorrect tax amount calculation because of same fieldname in the code
 2018-08-06 14:32:44 +05:30
Jignesh Greycube
56027e3799 Spelling updated from Maxiumm to Maximum (#15092) 
Spelling updated from Maxiumm to Maximum
 2018-08-06 14:32:31 +05:30
Jignesh Greycube
cb66f6904f Spelling updated from Maxiumm to Maximum (#15091) 2018-08-06 14:32:19 +05:30
Jignesh Greycube
b2d16aca74 Updated Spelling Maxiumm to Maximum (#15090) 2018-08-06 14:32:05 +05:30
rohitwaghchaure
fc682c86c6 [Fix] Inactive student validation issue while disabling the student group (#15095) 2018-08-06 14:29:46 +05:30
Rohit Waghchaure
15f52e7b71 [Fix] Incorrect tax amount calculation because of same fieldname in the code 2018-08-06 14:29:34 +05:30
KanchanChauhan
7fb8540b70 Get item defaults from item group (#15089) 2018-08-06 14:29:14 +05:30
Prateeksha Singh
a5f6e54b70 fix merge conflict 2018-08-06 13:56:53 +05:30
Prateeksha Singh
0c796229dc
prevent jinja exec in search title 2018-08-06 12:33:34 +05:30
Ameya Shenoy
26bfede116
Merge pull request #15078 from rohitwaghchaure/task_email_alert_not_working_from_project 
Fix] Task's email alert on status change not working if we change the task status from the project form
 2018-08-06 12:33:07 +05:30
Ranjith Kurungadam
752fd5a7a0 Tests SO for Serial No based delivery (#15072) 
* fix remove SO from Serial No only when voucher SE

* SO tests - delivery by Serial No
 2018-08-03 10:39:51 +05:30
Rohit Waghchaure
86217ca96c [Fix] Task email alert on status change not working if we change the task status from the project form 2018-08-02 16:41:53 +05:30
Prateeksha Singh
106856b1ab Show View count on items 2018-08-02 02:07:04 +05:30
Prateeksha Singh
32a2148651 [hub] Company (Seller) page 2018-08-02 01:42:23 +05:30
Faris Ansari
eeedc3bb47 Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 19:19:58 +05:30
Faris Ansari
2a81b4acd6 Messages: first cut 2018-08-01 19:19:53 +05:30
KanchanChauhan
e1f0be6da5 Delivery Date Change based on Delivery Date change in child table (#15068) 2018-08-01 18:11:58 +05:30
rohitwaghchaure
ae4ff5a403 [Fix] In words showing grand total instead of rounded total (#15065) 2018-08-01 18:09:51 +05:30
Nabin Hait
041a5c2d3b
Get Advances and auto allocate (#14970) 2018-08-01 18:07:39 +05:30
Ranjith Kurungadam
d54991d624 Delivery by Serial No (#15030) 
* fields added for delivery by Serial No

* SO - validate item for delivery by Serial No

* Stock Entry - add Serial No on production, validate reserved consumption

* add item by reservation to transaction if delivery by Serial No

* SLE - validate reserved Serial No by SO in Delivery Note, Sale Invoice

* Sales Order - validate Ensure Delivery by Serial No

* Serial No -  remove SO ref on cancel
 2018-08-01 17:47:07 +05:30
rohitwaghchaure
0452b405f4 [Fix] Not able to submit the expense claim (#15057) 2018-08-01 17:45:51 +05:30
Zarrar
7f8024c516 [Enhancement] Tax Withholding Category (#15064) 
* add single, cumulative threshold, remove checkboxes

* remove tds child table from supplier & add tds link field

* add description field in tax withholding category

* add tax withholding data for indian setup, some fixes

* add a checkbox for tax withholding in purchase invoice

* remove supplier's child table for tds

* enable tds field if supplier has tds set inits master

* move rates data to child table - adding fiscal year support

* change bootstrap data according to child table config of tds

* show category name in list view

* loyalty program fixes

* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry

* add fiscal year dependency in company test

* minor loyalty program fix

* minor tier calculation fix

* minor handling duplicate exception

* toggle apply_tds according to supplier, code rectify

* minor fixes for loyalty program

* test case for single and cumulative threshold

* codacy fix
 2018-08-01 17:45:05 +05:30
Nabin Hait
e45ec661ea
Additional fields in Item Price (#14540) 
* [IMPROVEMENT] Item Price New Fields and Features

* [IMPROVEMENT] Item Price

 - Item Price insert against Qty, Supplier/Customer, Validup/Validfrom
 - Stock Setting to accept Default Price List for Purchase or Sales Item
 - Move Item Section in Item Price

* Fetch default Item Price based on Customer as null

* test fixes

* Code cleanup and fixed the issue of incorrect item price fetched against the customer

* Removed min qty from packing_increment calculation

* Removed auto_update_price_list_rate from the stock settings

* Revert sales_order.json changes

* Removed sales, purchase price list from stock settings because this fields are already available in selling, buying settings

* Removed unnecessory file

* Fixed item price validation code
 2018-08-01 17:44:34 +05:30
Prateeksha Singh
3aed5c219f [hub] make get_items generic, add legacy.py 2018-08-01 17:32:13 +05:30
Prateeksha Singh
4d4791ab39 [chore] remove imports 2018-08-01 16:42:09 +05:30
Prateeksha Singh
b4e9ec33cb Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign 2018-08-01 16:39:10 +05:30
Prateeksha Singh
6495d532a6 [restructure] make api.py 2018-08-01 16:38:39 +05:30
Faris Ansari
5249307f27 Prevent access of registered routes 2018-08-01 16:29:40 +05:30
Faris Ansari
2de046fbed Add generic action handler to subpage 2018-08-01 15:57:28 +05:30
Faris Ansari
de85f24383 Rename base_page to subpage 2018-08-01 15:57:13 +05:30