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
Faris Ansari
fbe9a46d51
Add Marketplace link to user dropdown in toolbar
2018-08-01 15:56:39 +05:30
Nabin Hait
7d9a1db97a
Update buying_settings.json
2018-08-01 15:26:40 +05:30
Faris Ansari
709a4a3f4e
Break marketplace.js into multiple files
2018-08-01 14:09:07 +05:30
Faris Ansari
c0a22a689e
Item Menu dropdown
2018-08-01 13:35:32 +05:30
Faris Ansari
a12076e0fd
Convert image to base64 before sending Item to sync
2018-07-31 23:06:00 +05:30
Faris Ansari
057839298c
fix get_category call
2018-07-31 19:06:11 +05:30
Nabin Hait
06029194cb
Patch fixes
2018-07-31 18:16:11 +05:30
Faris Ansari
300c07c3d9
Use hub.call for categories and favourites
2018-07-31 18:02:13 +05:30
Faris Ansari
1ff25279bf
Remove old hub styles
2018-07-31 17:59:03 +05:30
Faris Ansari
c1438c6169
refactor(hub connection): read only connection
...
- Seller activity in Activity Log
- Move hub_url to site_config
2018-07-31 17:51:45 +05:30
Nabin Hait
14ad9f70b5
Patch fixes
2018-07-31 17:33:14 +05:30
rohitwaghchaure
dc7004e083
[Fix] Patient Appointment Calendar not showing data properly ( #15052 )
2018-07-31 16:01:02 +05:30
Faris Ansari
b1d6f94cdf
Merge branch 'hub-redesign' into hub-redesign-contact-seller
2018-07-31 14:54:58 +05:30
Fisher Yu
13aec3aecb
Simplified Chinese Translation Update ( #14992 )
...
* delete the old version to be replaced by a new one
* New version of the translated simplified Chinese
2018-07-31 13:29:35 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
Nabin Hait
e9afbfde76
bumped to version 10.1.45
2018-07-31 12:48:22 +06:00
Faris Ansari
2ae80fd000
wip
2018-07-31 12:02:20 +05:30
Prateeksha Singh
425356c21c
[hub] remove test code
2018-07-31 10:45:53 +05:30
Nabin Hait
d53c2c031d
more payroll improvements and tests fixes
2018-07-30 20:17:15 +05:30
rohitwaghchaure
1fa5698798
[minor] Freeze the screen to avoid multiple time clicks ( #15047 )
2018-07-30 19:11:43 +05:30
rohitwaghchaure
086da451ca
Removed academic term from validation to check duplicate program enrollement ( #15046 )
2018-07-30 19:11:14 +05:30
Nabin Hait
d305a7a959
Made leave application importable
2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805
Payroll entry ux improvements and processing via background jobs
2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754
Fixed conflict
2018-07-30 16:37:07 +05:30
Prateeksha Singh
46df72d55d
[hub] test progress trigger
2018-07-30 13:24:01 +05:30
Shreya
21ce5e0609
Fix typo in label
2018-07-30 12:07:46 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs ( #15026 )
2018-07-30 10:58:49 +05:30
Zarrar
89c87fd6a6
[Minor] Patch fix ( #15041 )
...
* update modified date
* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Zarrar
6004b66797
[Minor] Job Offer UX improvise ( #15042 )
...
* job offer ux improv
* Update job_offer.js
2018-07-30 10:57:13 +05:30
Nabin Hait
cce7c5c245
Fixed salary structure employee patches
2018-07-30 10:52:51 +05:30
rohitwaghchaure
91d2ace9bb
Account no + account name in trial balance and financial statements reports ( #15038 )
2018-07-30 10:38:51 +05:30
Prateeksha Singh
efbd2ee3f5
[hub] Realtime Sync Progress
...
- Show progress from the migration plan
- Show products being synced
- Disallow publishing in sync state
2018-07-30 09:17:14 +05:30
Prateeksha Singh
811cc3f78f
[hub] resolve merge conflicts
2018-07-29 18:05:07 +05:30
Prateeksha Singh
d27b27f88a
Hub Seller Profile and Timeline
...
- profile details fetched from server
- timeline updates on publishing items
2018-07-29 16:52:16 +05:30
Prateeksha Singh
6f05ea124e
[hub] Track Hub Sync on the Server
...
- Create a Hub Seller activity on start of Hub Sync
- Store its name as remote_id in the Run
- Update that activity remotely once the Run here is complete, status
2018-07-29 14:40:52 +05:30
Faris Ansari
296848cb69
Publish Page
...
- Code cleanup
- Separate local item card and hub item card
- Use make_search_bar
2018-07-28 16:14:22 +05:30
Faris Ansari
abcc8ab8e5
Push review area to bottom
2018-07-28 13:57:16 +05:30
Prateeksha Singh
d0a1a4fe90
[hub] differentiate self-published items
2018-07-28 13:16:09 +05:30
Prateeksha Singh
f6f429fb10
[hub] Item page skeleton
2018-07-28 12:25:14 +05:30
Shreya Shah
91a9ee5179
Merge accounts functionality ( #14993 )
...
* Add dialog to merge accounts
* Add conditions and merge functionality
* Fix travis
* Add test case
* Add more test scenarios
2018-07-28 10:26:11 +05:30
Prateeksha Singh
dd8045759f
[hub] Published Products Page
2018-07-28 01:54:51 +05:30
Prateeksha Singh
83d60ffa1d
[hub] update hub item mapping
2018-07-28 00:07:25 +05:30
Prateeksha Singh
6e7fb71f1f
[hub][patch] reset publish_in_hub for all items
2018-07-27 22:02:47 +05:30
Faris Ansari
19d40cafba
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-07-27 21:51:31 +05:30
Faris Ansari
b7a63ab81e
Homepage
...
- show random items from each hub seller
- show items from country
- move add_review method on hub
2018-07-27 21:51:26 +05:30
Prateeksha Singh
f4fbf5215b
[hub][search] empty search and route fallback
2018-07-27 21:07:56 +05:30
Faris Ansari
44f7d2e62b
SearchPage
2018-07-27 15:33:00 +05:30
Shreya Shah
749094dd52
Translatable UOMs ( #15024 )
2018-07-27 12:54:34 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Nabin Hait
584153a1b1
bumped to version 10.1.44
2018-07-27 13:05:42 +06:00
Shreya Shah
eed0a4e2df
Do not copy remarks field while duplicating ( #15023 )
2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd
f5cc1bd44c
Created Eway Bill Report ( #14926 )
...
* Created Eway Bill Report
* Field value changes
* Changed module from Stock to Regional
* Added comments and minor fix
* minor fix
2018-07-27 11:21:42 +05:30
Yaqin Shurrab
cc56ff5c37
Get the correct Summation of Closing Balances ( #14990 )
...
Fix total raw values for Closing Credit and Closing Debit
2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3
[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report ( #14994 )
2018-07-27 11:03:53 +05:30
mist-01
9821d51e31
Updated appointment availability to consider appointment duration in healthcare domain ( #15011 )
...
* Updated appointment availability to consider appointment duration in healthcare domain.
Fix bug - must clone moment before adding time to avoid updating original moment
* Add spaces after comments
2018-07-27 11:02:03 +05:30
Shreya Shah
1f4c263a63
[minor] Program Enrollment Tool ( #15013 )
...
* Make academic term field mandatory
* Add disabled field to Student Group
* Mandatory check in Education Settings for Academic Term
* Fix as per review
2018-07-27 10:59:14 +05:30
Shreya Shah
f71d18a35a
Increase margin ( #15016 )
2018-07-27 10:57:32 +05:30
Nabin Hait
d0a2b1619b
Optimization for marking student attendance
2018-07-27 10:51:55 +05:30
rohitwaghchaure
0fe6ced99d
[Fix] Valuation rate for serialized items ( #15017 )
2018-07-27 10:33:30 +05:30
Zarrar
4282729c72
delete version log while deleting company transaction ( #15021 )
2018-07-27 10:32:17 +05:30
Faris Ansari
24d5f17255
NotFound page for marketplace
2018-07-26 19:22:58 +05:30
Faris Ansari
9d1b7d493a
[patch] Delete old hub page
2018-07-26 18:54:58 +05:30
Faris Ansari
b5ce1976b8
Move marketplace code back to marketplace.js
2018-07-26 18:46:38 +05:30
Faris Ansari
521fe4d01d
Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign
2018-07-26 18:39:34 +05:30
Faris Ansari
cae856cbda
Add marketplace back to hub_listing
2018-07-26 18:39:28 +05:30
Faris Ansari
f4884f8108
Marketplace
...
- Cache hub calls
- call_hub_method using FrappeClient connection
- Become a seller UX fixes
2018-07-26 18:37:01 +05:30
Faris Ansari
2ca5afa214
Move marketplace ui to marketplace.js
2018-07-26 18:35:04 +05:30
Prateeksha Singh
d885248309
[hub] remove sync_in _progress set
2018-07-26 18:21:33 +05:30
Prateeksha Singh
bcd7077342
[hub] remove sync_in_progress set
2018-07-26 18:20:58 +05:30
Prateeksha Singh
d450c0ac08
[hub][publish] in_progress/empty state
2018-07-26 17:24:33 +05:30
Prateeksha Singh
b750425288
[hub] sync in progress
2018-07-26 16:25:22 +05:30
Ranjith Kurungadam
e555b5bcf2
Salary Slip tests for tax calc on benefits, additional salary ( #14985 )
...
* tests for tax calc on benefits, additional salary
* fix tests - remove created additional salary
2018-07-26 14:39:59 +05:30
Prateeksha Singh
d1224ca662
[hub][init] add profile page
2018-07-26 13:39:06 +05:30
Nabin Hait
8173d9f17a
Update additional_salary.json
2018-07-26 12:20:05 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections
...
Gocardless improvement and payment request correction
2018-07-26 11:41:43 +05:30
Faris Ansari
195436093d
Merge pull request #15004 from netchampfaris/hub-factory-syntax
...
Fix Syntax Error in hub_factory.js
2018-07-26 10:57:02 +05:30
Prateeksha Singh
f26177bdbc
[hub] setup publish items flow
2018-07-26 10:38:11 +05:30
Prateeksha Singh
1d1696080e
[hub][publish] add search, fix multiple append
2018-07-26 08:36:33 +05:30
Prateeksha Singh
505f6f14e9
[hub][publish] select/deselect all items
2018-07-26 08:06:21 +05:30
Prateeksha Singh
9685d7c37a
[hub] registered vs read-only views
2018-07-26 01:12:00 +05:30
Prateeksha Singh
cf2d2a5c75
[hub][init] add publish items page
2018-07-25 20:02:12 +05:30
Nabin Hait
22fa99d040
Payroll Fixes
2018-07-25 18:21:39 +05:30
Nabin Hait
e50e0e4b30
Update repost_reserved_qty_for_production.py
2018-07-25 17:49:47 +05:30
Faris Ansari
6b07898ef0
semicolon
2018-07-25 17:07:26 +05:30
Faris Ansari
ed1190126e
Fix Syntax Error in hub_factory.js
2018-07-25 16:51:01 +05:30
Prateeksha Singh
bc8caefc19
[hub] add register as a seller page
2018-07-25 11:08:23 +05:30
Faris Ansari
0fbaa72504
Add review area
2018-07-25 00:49:11 +05:30
Zlash65
617532b2cb
Factory: class.extend -> es6 class
2018-07-24 14:20:10 +05:30
Nabin Hait
90bb5f43d5
Added more status in task web form
2018-07-24 11:33:05 +05:30
Ranjith Kurungadam
e51c175aca
Fix tests ( #14991 )
...
* minor improv in fetching account
* pass name field while creating tds doc
* create tds fixture after creating tds account
* Inpatient Record - Test - Fix
* fix batch query
2018-07-24 11:07:28 +05:30
Faris Ansari
ea2d1b0a19
New page: marketplace
...
- subpages: home, favourites, item, category
2018-07-23 18:44:46 +05:30
Nabin Hait
4037915b3c
Update setup.py
2018-07-23 18:05:55 +05:30
Nabin Hait
797497d22e
Fixed web form perm for tasks
2018-07-23 17:58:40 +05:30
Prateeksha Singh
ebb5662cb7
[revert] modules dropdown
2018-07-23 17:04:34 +05:30
Ameya Shenoy
218f2f841e
Merge pull request #14920 from codingCoffee/split_issue
...
Split a given Issue into 2
2018-07-23 16:09:05 +05:30
Ameya Shenoy
769054e00d
Split a given Issue into 2
...
Bugs encountered:
Once the dialog pops up, filling in the subject and pressing RETURN
doesn't work. It fails to read the subject. The primary button needs to
be clicked on. This is a generic issue, not related to this PR
Behaviour:
-[x] Add button on communication to split thread
-[x] Popup asks for new subject
-[x] Copy "Customer", "Sender" and other relevant fields to this issue
-[x] Move thread and replies to new issue
fixes #14600
2018-07-23 10:31:38 +00:00
Nabin Hait
0c0c345678
Added index on SLE based on batch_no, item and warehouse
2018-07-23 14:38:50 +05:30
yimesgen
20a80fee45
Update batch.py ( #14905 )
...
* Update batch.py
Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and".
* Update batch.py
2018-07-23 14:36:50 +05:30
Charles-Henri Decultot
6321a6b908
use standard dict method
2018-07-23 08:56:38 +00:00
Alchez
56bd5d8aaa
Fix finance book getter error when book doesn't exist ( #14987 )
2018-07-23 14:16:35 +05:30
Shreya Shah
cd717e422f
Modify renaming process of Account ( #14839 )
...
* Disable renaming for Account Master
* Update account name along with account number
* Fix as per suggestions
* Update account.js
* Fix typo
* Remove after_rename and before_rename methods
* Modify test case
* Modify field placement
* Remove unused method
2018-07-23 14:15:20 +05:30
Jamsheer
425fb4c5f4
[Feature][Enhance] Healthcare Inpatient ( #14940 )
...
* New DocTypes - Inpatient Record and Healthcare Service Unit Type
* Patient Appointment - Button - Get Prescribed Procedure - hide after save
* Patient Encounter - Schedule Inpatient button
* Inpatient - Healthcare Fields and references
Conflicts:
erpnext/healthcare/doctype/lab_test/lab_test.json
erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
erpnext/healthcare/doctype/vital_signs/vital_signs.json
* Healthcare Service Unit Type - Item Creation - UOM Fix
* Healthcare Service Unit - healthcare service unit type fix
* Inpatient Record - Admission Scheduled and Discharge Scheduled status
* Patient - rename field inpatient to inpatient_status
* Inpatient Record - rename field inpatient to status
* Refactor - Inpateint Occupancy
* Remove unused imports
* Healthcare service unit - patch - fix
* Healthcare IP - Codacy Fix
* Inpatient Record - Encounter and Practitioner References
* Patch - add healthcare service unit tree - enhance
* Healthcare Setup - Remove - Lab Test and Item creation
* Discharge note in Inpatient Record
* Codacy fix
* Inpatient Record - Update transfer service unit filter
* Inpatient Record - Test
2018-07-23 13:05:35 +05:30
rohitwaghchaure
6b862fcae5
[Fix] Rounded total is not working in the purchase receipt ( #14984 )
2018-07-23 13:02:07 +05:30
Saurabh
a638400e5d
Merge pull request #14707 from chdecultot/stripe_improvements_4
...
Stripe Subscriptions
2018-07-23 12:11:58 +05:30
Faris Ansari
f585197045
Cleanup homepage
2018-07-23 11:55:07 +05:30
darthguru
f2d4e33eb5
Fixed IGST ISSUE ( #14975 )
...
* Fixed IGST ISSUE
the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it
* Update gstr_2.py
2018-07-23 11:52:26 +05:30
Ranjith Kurungadam
1e90dafef8
fixes Benefit Application, Additional Salary ( #14971 )
...
* fix - add Additional Salary if multiple in one slip
* fix - Benefit Appication, None comparison
2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371
fix - assigned Salary Structure query ( #14965 )
2018-07-23 11:31:46 +05:30
Zarrar
a22e0d0c99
return empty if no stock ledger entry found ( #14968 )
2018-07-23 11:31:04 +05:30
Shreya Shah
83dfc0a2b1
Add Priority field in issue webform and portal ( #14967 )
2018-07-23 11:14:00 +05:30
Faris Ansari
789ad180ea
Merge pull request #14969 from netchampfaris/financial-statement-reports
...
Financial Reports fixes
2018-07-21 12:28:31 +05:30
Faris Ansari
b23d15fba9
Fix typo
2018-07-20 18:16:31 +05:30
Faris Ansari
5e096df5ae
columnDef => column
2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd
Return early if filters not initialized
2018-07-20 16:31:01 +05:30
Prateeksha Singh
abca510f9a
Update conf.js
2018-07-20 16:07:50 +05:30
Faris Ansari
5986d59b01
Financial Reports
...
- Update formatter for use with DataTable
- Fetch Currency from filters and fallback to company currency
2018-07-20 15:11:55 +05:30
Charles-Henri Decultot
39418b1532
CSS correction due to latest version of develop
2018-07-20 09:37:22 +00:00
KanchanChauhan
0c3d345a9f
[Minor] Moved mandatory Company field from More Information section to top ( #14950 )
2018-07-19 14:39:31 +05:30
Ranjith Kurungadam
dff2ba72d3
test TDS calculation ( #14919 )
...
* test TDS calculation
* fix failing test cases
* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
a8e24cba46
Merge patch and delete fields from subscription ( #14941 )
...
* Delete subscription records after migrating all records to auto-repeat
* delete old fields from subscription
2018-07-19 14:33:31 +05:30
Saurabh
139d165258
Merge pull request #14962 from saurabh6790/staging_version_1
...
Update staging version to support semantic versioning
2018-07-19 13:38:34 +05:30
Saurabh
dfdad651ea
Update staging version to support symentic versioning
2018-07-19 13:36:32 +05:30
Nabin Hait
9c5afc3620
website permission for support portal
2018-07-19 13:02:36 +05:30
Nabin Hait
47ce481394
Minor fix
2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property
2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707
[fix] format fiscal year docname to proper date before using 🤦 ( #14955 )
2018-07-18 18:03:27 +05:30
Saurabh
0bfbf8aa6f
[minor] remove conflicts
2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Saurabh
6c46b4edc4
bumped to version 10.1.43
2018-07-18 16:54:54 +06:00
Shreya Shah
8395a7ad6f
Modifications in last purchase rate button ( #14948 )
...
* Make last purchase rate button visible until submitted
* Move buttons
- Get last purchase rate and link to material request buttons moved to toolbar under Tools button
* Remove disable fetch last rate functionality
* Make last purchase rate field read_only
2018-07-18 12:27:27 +05:30
Shreya Shah
9baa3bef8b
[Portal] Display issues raised by all users of a customer ( #14947 )
...
* Display issues raised by all users of a customer
* Fixed as per review
2018-07-18 12:25:38 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57
Gocardless improvement and payment request correction
2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832
Defaults in Item Group ( #14874 )
...
* Add Defaults table in Item Group
* Fetch defaults from Item group if not found in Item
* Add patch
* Remove default fields from Item Group
* Set query for defaults
* Fix Codacy
* Modify test records
* Modify budget.py and sales_order.py
* Remove join from query
* Else condition to avoid error if no defaults found
* refrain from making item test records before item_group
* default cost center fetch correction
* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790
Naming series increase even if there is an exception while saving the invoice from the backend ( #14938 )
2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1
[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order ( #14899 )
...
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order
* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
af479c8192
set valid delivery date ( #14890 )
...
* set valid delivery date
* calculate delivery date based on diffrence in transation date and delivery date of ref doc
2018-07-17 16:49:32 +05:30
rohitwaghchaure
216f9373c9
Provision to select the cost center in the asset ( #14934 )
2018-07-17 16:47:51 +05:30
Shreya Shah
663b435919
Update modified time to fix patch ( #14931 )
2018-07-17 16:47:18 +05:30
Saurabh
e78a877202
patch fixes ( #14936 )
2018-07-17 16:38:11 +05:30
Nabin Hait
1e693fe6c9
Replaced spaces with tabs
2018-07-17 16:08:39 +05:30
Nabin Hait
26786bd35d
minor route fix for general ledger
2018-07-17 15:59:15 +05:30
rohitwaghchaure
5fe88ea93e
[Fix] Not able to update the current value of the prefixes which are defined in the autoname field ( #14918 )
2018-07-17 12:45:25 +05:30
Shreya Shah
fbeab5bf73
Show opening balance of leaves ( #14925 )
...
* Show opening balance of leaves
* Update employee_leave_balance.py
2018-07-17 11:59:51 +05:30
Ameya Shenoy
8ba1310915
[fix] Location test ( #14921 )
2018-07-17 11:57:49 +05:30
Zarrar
fc0a5833a5
run set query if doctype exist ( #14929 )
2018-07-17 11:57:06 +05:30
Suraj Shetty
a6f984366a
Fix typo
2018-07-16 18:39:01 +05:30
Zarrar
26c9b94cc6
[ Improv ] Loyalty Program more fixes and test case ( #14888 )
...
* remove console statements
* set account & cost center for redemption
* add test case for single/multi tier & is_return scenario
* reset tier when changing loyalty program
* make loyalty fields non copy type
* fix test case - delete si after every test to avoid interference
2018-07-16 18:11:53 +05:30
rohitwaghchaure
a3e070bc6b
[Fix] Invoices not showing in the gross profit report against which sales return entry has created ( #14914 )
2018-07-16 18:11:19 +05:30
Suraj Shetty
6dfc165193
Add patch to skip user perm check for doctype ( #14873 )
...
* Add patch to skip user perm check for doctype
Skip user permission check for doctypes where
department link field was recently added
* Remove new doctype entries
* Skip doctypes if department field already exists (custom field)
* Add patch to set department value based on employee
* Update set_department_for_doctypes.py
* Update skip_user_permission_check_for_department.py
2018-07-16 18:10:16 +05:30
Jamsheer
f926911399
[Enhance][Fix] Healthcare - DocType and Fields renaming ( #14861 )
...
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot
* Role name change
* Rename DT - Physician Schedule to Practitioner Schedule
* Rename DT - Physician Service Unit Schedule
* Rename DT - Physician to Practitioner
* Lab Test Template - field disabled in standard filter
* Patient - customer creation fix
* Rename DT - Consultation - Encounter
* Patches.txt updated for rename doctypes and fields in Healthcare
* Patch - Rename doctypes and fields in Healthcare Domain
* Fix - Patch - rename_healthcare_doctype_and_fields
* Vital Signs - New Fields - Abdomen, Tongue and Reflexes
* Web Form - Patient - Personal Details
* Rename DocType Physician to Healthcare Practitioner
* Rename DocType Consultation to Patient Encounter
* Web Form - Personal Details - Fix
* Web Form - Personal Details - Codacy Fix
* Healthcare patch run for all domain
* Rename label Practitioner to Healthcare Practitioner
* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Ranjith Kurungadam
14e94f824e
fix - HRA India ( #14911 )
2018-07-16 16:12:46 +05:30
Shreya Shah
ffd2254944
Make item defaults non-collapsible ( #14908 )
2018-07-16 14:55:54 +05:30
Nabin Hait
656016b4e0
Reloaded location doctype in patch
2018-07-15 20:10:23 +05:30
rohitwaghchaure
526ab2ca30
[enhance] Allow transfer for manufacture in the BOM ( #14891 )
...
* [enhance] Allow transfer for maufacture in the BOM
* Added patch
* Fix codacy
* Fixed typo and added test cases
2018-07-15 20:04:41 +05:30
Zarrar
f579a2bd5d
[Minor] Fix Crop Cycle test record ( #14901 )
...
* fix crop cycle test record
* load crop cycle doc if not yet loaded
* create test records for location
* land unit -> location , update in patch for tree index
2018-07-15 20:04:24 +05:30
Charles-Henri Decultot
3fa3104dcc
Debug cleanup
2018-07-13 14:00:42 +00:00
Charles-Henri Decultot
c047bf88db
Rebase following Subscription corrections
2018-07-13 13:25:53 +00:00
Charles-Henri Decultot
7722b81c8e
Variable correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a0b7236f66
Corrections following Saurabh's comments
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
90669a03b3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
da8b11fd12
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
8b3e841fbf
Travis correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
cde1f08af6
Review corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
5a2ee41af3
Test correction
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
19a47c3e0a
Codacy corrections
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
bbed5d41ca
Remove remaining images
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
63e1dd5993
Remove doc
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
244b638fe3
Dev cleanup
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
a8d766f5f7
Remove payment plan reference
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
0134e13631
Subscription integration
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
f7ca908ea9
Corrections to Subscriptions
2018-07-13 13:15:59 +00:00
Charles-Henri Decultot
ba6f6d976d
Stripe integration corrections
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a45ea63b5d
Codacy correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6c2ad66522
Codacy corrections
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
a27673ecfe
Travis correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
79380c6a74
Travis correction
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
30da37fbb8
Move Stripe to ERPNext
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
e25d2ee66d
Update Stripe Documentation
2018-07-13 13:05:54 +00:00
Charles-Henri Decultot
6a40164dad
Payment Request modifications
2018-07-13 13:05:54 +00:00
Nabin Hait
03b597418a
Patch order fixed
2018-07-13 17:45:27 +05:30
Saurabh
3d825e5689
Subscription test and fixes ( #14875 )
...
* Add dashboard on subscriber screen
* Add Subscription and Subscription Plan to Account Dashboard
* Fetch customer name while creating subscriber
* [fix] add section for Subscription Period
* minor fixes
* optimization
2018-07-13 17:41:36 +05:30
rohitwaghchaure
3ffe89659a
[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice ( #14879 )
2018-07-13 17:40:48 +05:30
Nabin Hait
b2da082798
Fixed logic and tests
2018-07-13 17:02:08 +05:30
Doridel Cahanap
6f06cc27e6
Update Qty and Rate in PO and SO
2018-07-13 17:02:08 +05:30
Alchez
df1eae8981
Merge the Land Unit doctype with the Location doctype ( #14613 )
...
* Merge Land Unit with the Location doctype
* Fix patch
* [minor] modification to Location structure
- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
2018-07-13 12:50:04 +05:30
Ameya Shenoy
5c3b69476d
shift to self-hosted frankfurter api ( #14792 )
2018-07-13 12:46:07 +05:30
KanchanChauhan
09e680b4aa
[Fix] Should not get approvers for disabled Departments ( #14868 )
2018-07-13 12:26:56 +05:30
Nabin Hait
da17ceea73
patch fixes
2018-07-13 12:04:06 +05:30
Ameya Shenoy
a559b0de5a
Role modifications for Shareholder ( #14872 )
...
- Added roles: Accounts User, Accounts Manager, Sales Manager, Sales
User, Sales Master Manager to Shareholder, Share Type and Share
Transfer doctype
2018-07-13 11:34:19 +05:30
Saurabh
b6d5f1fea1
[fix] add staging version ( #14871 )
2018-07-13 11:33:31 +05:30
rohitwaghchaure
2d84945839
[Fix] Stock reconciliation wrong difference amount calculation ( #14893 )
2018-07-13 11:07:27 +05:30
Prateeksha Singh
0c51d40ad0
Merge pull request #14889 from pratu16x7/support-portal
...
[fix][minor] search help alignment
2018-07-12 16:06:49 +05:30
Prateeksha Singh
4cc7957a2a
[fix][minor] search help alignment
2018-07-12 16:05:57 +05:30
Shreya Shah
8dc4c945dc
Fix UX ( #14862 )
2018-07-11 14:36:49 +05:30
Zarrar
5899d98077
[ Major ] Loyalty Program Fixes ( #14863 )
...
* fix checking of customer_group & territory of customer in loyalty program
* fetch and set applicable loyalty program
- in customer.py if found 1 program, set it or show a message to set it manually
- in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options
* removed disabled field, added from_date & to_date
* loyalty program section made collapsible, added redeem check in it
* setting loyalty program improvised, manual selection if multiple found
* get_query added, amount calculation updated
* args passed rectified for expiry_date
* get loyalty_points logic improv, redemption_details logic added
* improv based on from/to date and other rectification
* code rectified based on different scenarios
- is_return, cancel, make loyalty points entry improv
2018-07-11 14:35:43 +05:30
Zarrar
9a3b785a03
[Minor] Employee Separation Fix ( #14867 )
...
* delete associated task & project forcefully
in Employee Seapration cancel trigger
* remove leftover print statement
* remove console statements
2018-07-11 14:34:55 +05:30
Saurabh
e8345f9ae0
add key to trace beta version ( #14859 )
2018-07-10 19:05:38 +05:30
rohitwaghchaure
cc9c7d5e2a
[Fix] GSTIN not displaying in the address print ( #14855 )
...
* [Fix] GSTIN not displaying in the address print
* Made changes in the patch and set Patch as False
* Update update_address_template_for_india.py
2018-07-10 15:41:42 +05:30
Alchez
9155e40bc7
[Fix] Set default CF in case none exist ( #14829 )
2018-07-09 16:57:42 +05:30
Frappe PR Bot
b48c769588
[Translation] Updated Translations ( #14849 )
2018-07-09 16:56:49 +05:30
rohitwaghchaure
07d0e9a2b2
Don't show disabled items in the stock balance report ( #14851 )
2018-07-09 16:56:41 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
Saurabh
07bb1811af
bumped to version 10.1.42
2018-07-09 16:23:50 +06:00
rohitwaghchaure
f07462860b
Merge pull request #14846 from shreyashah115/fix-digest
...
Filter out pending orders based on company
2018-07-09 14:48:13 +05:30
Ranjith Kurungadam
ea089d67ce
Employee Benefit Application - fix ( #14837 )
2018-07-09 14:01:18 +05:30
rohitwaghchaure
720b06495c
[Fix] Not able to save project ( #14848 )
2018-07-09 13:57:16 +05:30
Shreya
83ad646af4
Filter out pending orders based on company
2018-07-09 12:14:03 +05:30
rohitwaghchaure
8179bcbabd
[Fix] Code cleanup ( #14843 )
2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a
[Fix] Unable to print Salary Register ( #14844 )
2018-07-09 09:28:56 +05:30
rohitwaghchaure
6be8bea934
Provision to view return entries in Sales Person-wise Transaction Summary ( #14830 )
2018-07-08 19:25:13 +05:30
Shreya Shah
21d3352aa2
Merge pull request #14835 from shreyashah115/print-hide
...
Print hide loyalty program related fields
2018-07-06 18:36:47 +05:30
Zarrar
8111705f82
Merge pull request #14833 from Zlash65/min-ac-fix
...
[Minor] Change field name in Accounts utils
2018-07-06 18:24:55 +05:30
Shreya
9bcb959f81
Print hide loyalty program related fields
2018-07-06 18:17:02 +05:30
Shreya Shah
c8c17ff5cf
Return if Item Defaults exist ( #14834 )
2018-07-06 18:07:28 +05:30
Zlash65
1aeca1d349
change name that fetches numbered value from acc & cc
2018-07-06 17:15:33 +05:30
Zarrar
17705f932d
[ Minor ] Cost Center Number field added in field's dialog ( #14781 )
...
* cost center number field when creating new
added field in the tree's dialog, necessary changes in the autoname function
* rename function's name appropriately
2018-07-06 14:44:44 +05:30
Alchez
8f2a0f3d79
[Fix] Incorrect assignment of Serial No in POS Invoice ( #14772 )
...
* Fix incorrect assignment of serial no in Sales Invoice through POS
* Add conversion factor to quantity check
2018-07-06 14:36:52 +05:30
Ranjith Kurungadam
6429ba9ed9
Payroll Entry - fix query, get assignment by end date ( #14827 )
2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
Saurabh
778e06d0ee
bumped to version 10.1.41
2018-07-06 13:32:57 +06:00
rohitwaghchaure
3f5e80ebe3
Allow bulk edit for the sales invoice item ( #14826 )
2018-07-06 12:39:04 +05:30
Manas Solanki
da486eeebd
Loyalty Program ( #12631 )
...
* First Cut for the Loyalty Program
* finished the collection part
* redmeption for the loyalty point
update the loyalty point entry in the FIFO style
make the accounting entry knocking the debtors account against the expense account selected in the loyalty program
update the outstanding balance in the client side
* completed for the desk viewe
* wrap up for the desk and shopping cart
* pos
* fix and test the travis
2018-07-06 12:36:57 +05:30
rohitwaghchaure
ea943c6fe4
[Fix] Due date validate issue in the POS ( #14825 )
2018-07-06 12:28:58 +05:30
Ranjith Kurungadam
5d134e0465
TDS Calculate tax for whole period on deduct checkboxes ( #14824 )
...
* Tax Exemption Proof Submission - fields submission_date, exemption_amount
* Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary
* Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes
2018-07-06 11:57:32 +05:30
rohitwaghchaure
839320dca5
[Fix] Original Invoice outstanding is not updating after making Debit Note ( #14821 )
2018-07-06 10:42:15 +05:30
Andrew McLeod
686284261d
Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. ( #14811 )
2018-07-06 10:41:37 +05:30
rohitwaghchaure
82a9fde921
Added compact print option for the material request ( #14799 )
2018-07-06 10:40:51 +05:30
bobzz-zone
58236ffc1e
Update budget_variance_report.py ( #14798 )
...
Make sure GL Entry only called once in each row
2018-07-06 10:39:00 +05:30
Saurabh
f403031449
[fix] Add Overdue status in Project Task
2018-07-05 19:38:59 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes ( #14787 )
...
* [cleanup] add dashboard to leave policy, employee form cleanup
* [test] first_name in employee
* [fix] tests
* [fix] tests
* [fix] tests
* [hr] add more dashboards
* [minor] fixes + ux
2018-07-05 15:19:28 +05:30
Rushabh Mehta
c1b430c8bd
[enhance] added priority to issue ( #14815 )
2018-07-05 11:38:02 +05:30
Zarrar
a3f6856d81
python 3 fix for sorted ( #14814 )
2018-07-05 10:37:39 +05:30
Nabin Hait
d4453aef68
Fixed permission issue
2018-07-04 16:38:10 +05:30
rohitwaghchaure
25f36489b3
Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online
...
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 16:26:48 +05:30
Rohit Waghchaure
5005e467a0
[Fix] POS Profile ignore pricing rule not working for online pos
2018-07-04 12:37:38 +05:30
Shreya Shah
430810f64c
Fix typo ( #14802 )
2018-07-04 10:17:36 +05:30
Aditya Hase
69711d2df2
Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) ( #14803 )
...
This should also fix #13909 as a side effect.
2018-07-04 10:17:17 +05:30
Zarrar
68a148e293
half_day enable/disable check ( #14795 )
2018-07-03 17:00:38 +05:30
rohitwaghchaure
205eae322b
[Fix] BOM replace timeout issue ( #14782 )
2018-07-03 15:06:38 +05:30
Nabin Hait
24ee7e5eb1
Patch fix
2018-07-03 13:15:47 +05:30
Nabin Hait
9911309631
Patch fixes
2018-07-03 13:06:49 +05:30
Nabin Hait
f4660d2479
Ignore calculating tds if amount/formula is mentioned in salary structure
2018-07-03 13:06:49 +05:30
Ameya Shenoy
935f4a474b
Prevent creation of more than 500 item variants ( #14790 )
2018-07-03 10:48:59 +05:30
Zarrar
c1225a84cc
fix css for coa dialog in setup wizard ( #14793 )
2018-07-03 10:35:31 +05:30
Britlog
4412f10918
Add missing fields in select, the same as in get_product_list_for_group ( #14789 )
2018-07-03 10:33:49 +05:30
Charles-Henri Decultot
6d97ab6f78
Make fields translatable ( #14786 )
2018-07-03 10:32:53 +05:30
Shreya Shah
aa62a62bb0
Add VAT related fields after printing settings fields ( #14773 )
2018-07-03 10:28:20 +05:30
Vishal Dhayagude
0e027a14a7
[minor] Link to Employee Separation template and Onbording template added in HR Module Page ( #14748 )
...
* [minor] Link to Employee Separation template and Onbording template added in HR Module Page
* [minor] Employee templated added in Employee Life Cycle Section
2018-07-03 10:20:02 +05:30
Shridhar Patil
4987c4ef53
on delete contact update issue ( #14770 )
...
* on delete contact update isuue
remove contact from issue if the deleted contact exists
* moved issue update function to issue.py
* Update formatting and comment
2018-07-03 10:10:04 +05:30
Suraj Shetty
27067b34e1
Rename ( #14771 )
...
- Daily Work Summary Settings to Daily Work Summary Group
in hr.py
2018-07-03 10:08:45 +05:30
Shreya Shah
93d60869ed
Fix patch ( #14769 )
...
Income account instead of expense account
2018-07-03 10:07:32 +05:30
Ranjith Kurungadam
273e8e59ca
fix Salary Component ( #14783 )
2018-07-03 10:05:01 +05:30
Pawan Mehta
e734b7c17b
Add filters to show Draft salary slips in salary register ( #14780 )
...
* [fix] #14778
* replace if-elif block with inline block
2018-07-03 10:01:19 +05:30
Frappe PR Bot
1baa811a40
[Translation] Updated Translations ( #14776 )
2018-07-03 09:59:57 +05:30
rohitwaghchaure
afe764264d
[Fix] Employee advance issues ( #14750 )
2018-07-01 16:48:00 +05:30
Charles-Henri Decultot
f02bef78f0
FEC report corrections ( #14741 )
...
* Report corrections to match government requirements
* Untranslatable headers
* Remove unused onchange logic
2018-07-01 16:46:48 +05:30
Zarrar
dfe897b888
[ Fix ] UOM Conversion fix ( #14768 )
...
* increase precision for conversion value
* inverse the conversion data
* update uom data
* rectify conversion logic according to inversion of values
* rectify test case for uom conversion
* patch improv to correct conversion data
2018-07-01 16:45:53 +05:30
Ranjith Kurungadam
4dc5721ba5
fix - Benefit Application query ( #14767 )
2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen
8662a4f677
POS - Translate some text & numpad ( #14765 )
...
* make label & placeholder translatable
* numpad translatable
* Update point_of_sale.js
remove debugger
2018-07-01 16:44:09 +05:30
Nabin Hait
e3daaa63f0
Payroll fixes ( #14758 )
...
* Ignore calculating tds if amount/formula is mentioned in salary structure
* [fix] Paid amount in Journal Entry from Payroll Entry
* fix codacy
2018-07-01 16:43:34 +05:30
Ranjith Kurungadam
b1a756cc9f
HRA Indian regional - field basic in company, calc changes ( #14757 )
2018-07-01 16:42:38 +05:30
rohitwaghchaure
1501a6e58e
[Fix] Data missing issue in stock ledger report ( #14755 )
2018-07-01 16:42:00 +05:30
rohitwaghchaure
01fe4a3726
[Fix] Consider the cancelled purchase receipt in backflush raw materials ( #14753 )
2018-07-01 16:41:39 +05:30
Ranjith
69b03a3b53
fix typo
2018-06-29 20:14:20 +05:30
rohitwaghchaure
c5183b7c2a
Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties
...
[Fix] Patch
2018-06-29 19:02:38 +05:30
Rohit Waghchaure
4178030c99
[Fix] Patch
2018-06-29 17:54:25 +05:30
Ranjith Kurungadam
fd7ef2e15c
Salary Component - field display, value dependency ( #14747 )
2018-06-29 16:53:56 +05:30
Ranjith Kurungadam
b402ccc0b5
Payroll Entry - make only one JE, separate JE for Flexi ( #14752 )
2018-06-29 16:48:49 +05:30
Nabin Hait
b192a4af77
reload doc in patch
2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540
Set user permissions for new departments based on company
2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d
Set salary component properties in existing components and salary structures
2018-06-29 14:36:45 +05:30
Manas Solanki
ee32a78e9f
Update bom_stock_calculated.py
2018-06-29 13:33:32 +05:30
Nabin Hait
104f62090d
Add filters for cost center in Budget Variance report
2018-06-29 12:25:03 +05:30
Himanshu Mishra
7aabef2026
Add configurable frequency in Selling Settings for update of project … ( #14670 )
...
* Add configurable frequency in Selling Settings for update of project and company
* remove redundant code
* remove redundant code, only trigger calculation if order/invoice is present
* removed dangling commas as per common convention in hooks
* fix:handling multiple documents
* Update selling_settings.json
2018-06-28 23:43:23 +05:30
Nabin Hait
d0c6184e24
minor patch fixes
2018-06-28 23:42:55 +05:30
rohitwaghchaure
191876f51b
[Fix] Bank Account mandatory ( #14734 )
2018-06-28 23:28:58 +05:30
Ranjith Kurungadam
a10f118ddd
Payroll Entry - Validate Attendance ( #14738 )
2018-06-28 23:28:07 +05:30
Nabin Hait
7324815fdb
map payment terms template from SO to SI
2018-06-28 23:12:02 +05:30
Charles-Henri Decultot
52fb43fc4f
Add no copy to payment terms template ( #14725 )
2018-06-28 23:06:30 +05:30
Charles-Henri Decultot
97fa94e77d
Journal and Entry number correction ( #14720 )
2018-06-28 23:05:58 +05:30
Cadmandata
d673afccf2
Updated comment in make_stock_entry() function ( #14726 )
...
Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.
2018-06-28 23:05:32 +05:30
Ranjith Kurungadam
f6e654eccc
Payroll Entry - fix deduct taxes ( #14730 )
2018-06-28 23:04:51 +05:30
rohitwaghchaure
cae945e743
Added validation and fixes UX for asset ( #14727 )
2018-06-28 23:04:25 +05:30
Ranjith Kurungadam
6ceed038e6
Fix benefits ( #14735 )
...
* Employee Benefit Application - fix typo
* Employee Benefits - fix field renamed
2018-06-28 23:02:58 +05:30
Manas Solanki
3ff7f79cc7
Merge pull request #14740 from manassolanki/fix-20
...
[minor] fix for the args in the frm.call
2018-06-28 20:47:25 +05:30
Manas Solanki
89e7f8b387
[minor] fix for the args in the frm.call
2018-06-28 20:44:53 +05:30
Rohit Waghchaure
ed71c36748
[Fix] Not able to save subcontracted purchase receipt
2018-06-28 18:36:35 +05:30
Ranjith Kurungadam
b66bde32f8
Payroll Entry - fix only one employee fetched ( #14718 )
2018-06-28 14:40:29 +05:30
Charles-Henri Decultot
8b22310d66
Allow auto repeat update ( #14706 )
...
* Allow auto repeat update
* Allow auto-repeat reference update
2018-06-28 14:27:58 +05:30
Zarrar
254ce645b1
[ Enhance ] Setup Wizard - Chart of Accounts ( #14698 )
...
* enable selection of coa for user
Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart
* read chart from file and make a tree render-able dict of it
* tree method to return node data for coa setup wizard
2018-06-28 14:15:34 +05:30
Shreya Shah
2fbc8509f5
Fix error message ( #14716 )
2018-06-28 14:14:28 +05:30
Pawan Mehta
c7897e491d
[fix] #14714 ( #14715 )
2018-06-28 14:13:56 +05:30
KanchanChauhan
168e66b107
Blanket Order translation fix for DE ( #14711 )
2018-06-28 14:13:24 +05:30
rohitwaghchaure
e27b85de4f
Added test cases for Overproduction against Work Order / Sales Order ( #14704 )
2018-06-28 12:48:28 +05:30
rohitwaghchaure
4c23be1821
Added test cases for subcontract ( #14702 )
2018-06-28 11:18:37 +05:30
Prateeksha Singh
5d227c9028
Revert "[hub] add link in modules"
2018-06-28 09:59:46 +05:30
Prateeksha Singh
84d358bd0a
Merge pull request #14708 from pratu16x7/hub-fixes
...
[hub] add link in modules
2018-06-28 03:23:03 +05:30
Prateeksha Singh
2e0b5140e7
[hub] add link in modules
2018-06-28 03:17:39 +05:30
Manas Solanki
4933e6bfeb
Update test_finance_book.py ( #14703 )
2018-06-27 17:30:09 +05:30
Ranjith Kurungadam
23e235395e
Salary Slip - remove check query limited to one ( #14699 )
2018-06-27 17:29:40 +05:30
Shreya Shah
f2f54e741b
Merge pull request #14701 from shreyashah115/testing-1
...
[minor] Blanket order
2018-06-27 16:00:02 +05:30
Shreya
32b57da335
Make supplier_name and customer_name fields read only
2018-06-27 15:20:33 +05:30
Shreya
18bed504dc
Set target qty 0
...
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
2018-06-27 15:14:43 +05:30
Manas Solanki
b912374b96
[test] check the finance book via the journal entry
2018-06-27 15:07:15 +05:30
rohitwaghchaure
67d87e29e3
[Fix] Wrong rate calculation in Itemwise sales register report for multi uom ( #14690 )
2018-06-27 11:22:03 +05:30
Ranjith Kurungadam
53cdbe960e
Salary Slip - fix query ( #14693 )
2018-06-27 11:15:39 +05:30
Jamsheer
86aed90a5c
[Fix] - Get payroll period days ( #14686 )
...
* Fix - get_payroll_period_days
* Fix - get_payroll_period_days
2018-06-27 11:13:20 +05:30
Deepak kumar
55cf6c5f7e
Membership ( #14688 )
...
* Correct the label and field name
* Update membership.json
2018-06-27 09:17:33 +05:30
rohitwaghchaure
f3cf15fa0d
[Fix] While saving project getting timeout error ( #14672 )
2018-06-26 17:06:00 +05:30
Nabin Hait
e2a8120ef8
ignore user permissions for some fields
2018-06-26 15:27:34 +05:30
Prateeksha Singh
34aeefc0a1
[fix] yet another python attribute fetch
2018-06-26 12:18:29 +05:30
Manas Solanki
7707cee6b7
Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo
...
Allow only submitted Blanket Order in PO/SO
2018-06-26 11:46:23 +05:30
Manas Solanki
860e169081
Update sales_order.js
2018-06-26 11:45:04 +05:30
Manas Solanki
0ebd0f0d62
Update purchase_order.js
2018-06-26 11:44:29 +05:30
Kanchan Chauhan
bddebb52d6
Allow only submitted Blanket Order in PO/SO
2018-06-26 09:31:27 +05:30
Rushabh Mehta
096b943b0c
[minor] fixes to moment.defaultDateFormat and daily work summary eplies
2018-06-25 22:38:20 +05:30
Frappe PR Bot
5c13cb3221
[Translation] Updated Translations ( #14669 )
2018-06-25 15:08:15 +05:30
mnaim-cloude8
56e4346ead
To fixed if if no schedule and disposal is NOT within the period. ( #14637 )
...
* To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included.
If no schedule, and disposal is within period, accumulated dep is the amount eliminated.
* Update asset_depreciations_and_balances.py
2018-06-25 15:05:26 +05:30
Jamsheer
4f8deb92cc
[Fix] - Leave Perid - Grant Allocations ( #14668 )
...
* Leave Perid - Grant Allocations - Fix
* Codacy - string statement has no effect
2018-06-25 14:49:54 +05:30
Shreya Shah
d8031d1a53
Clear child table before appending ( #14648 )
2018-06-25 10:34:55 +05:30
rohitwaghchaure
34c187706d
[Enhance] Added Budget exception approver role in company ( #14645 )
...
* [Enhance] Added Budget exception approver role in company
* Added test cases for budget
2018-06-25 10:31:08 +05:30
Ranjith Kurungadam
b4ad3c3f77
Salary Structure Assignment - remove to_date ( #14642 )
...
* Salary Structure Assignment - remove to_date
* fix Salary Assignment - remove to_date
* Salary Slip - fix codacy remove sting based query, add end_date to condition
2018-06-25 10:29:54 +05:30
Jamsheer
8044d09d50
[Enhance] Refactor ( #14647 )
...
* Payroll Entry - Make Bank Entry button routes to Journal Entry list view
* Salary Component - additional component and flexi not comes in same component
* Salary Structure - refactor validation messages
2018-06-25 10:29:06 +05:30
rohitwaghchaure
3a595d07d0
[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases ( #14649 )
...
* [Fix] POS Closing Voucher, on save collected amount becomes zero
* Added test cases for the POS Closing Voucher
2018-06-25 10:10:29 +05:30
Jamsheer
648728f330
Fix - depends on lwp - employee benefit ( #14644 )
2018-06-22 17:28:29 +05:30
Jamsheer
b64161a389
Employee benefit - Last payroll period benefit ( #14634 )
...
* Employee benefit - Last payroll period benefit
* Method name refactor
2018-06-22 17:27:54 +05:30
Sushant Nadkar
00f0f0f5fc
Added adational filters to Tax Rule doctype ( #14639 )
2018-06-22 15:57:19 +05:30
Shreya Shah
5b64e98c5b
Fetch company on employee selection ( #14633 )
2018-06-22 15:41:57 +05:30
rohitwaghchaure
d3fb0fbb20
Added test cases for asset accounting, asset value adjustment ( #14572 )
...
* Added test cases for asset accounting, asset value adjustment
* Accounting entry for the asset created manually
* Added asset movement test cases and validation
* Added validation to make asset from purchase receupt, invoice only
2018-06-22 15:40:59 +05:30
Ranjith Kurungadam
ce26610d39
Fix tax calculation ( #14635 )
...
* Salary Detail - field is_additional_component
* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax
* fix indentation
2018-06-22 15:39:49 +05:30
Ameya Shenoy
4e96f55eff
Merge branch 'master' into develop
2018-06-22 05:10:29 +00:00
Ameya Shenoy
774f676a25
bumped to version 10.1.40
2018-06-22 05:10:27 +00:00
Prateeksha Singh
c92bbcb9fa
Merge pull request #14629 from pratu16x7/css-fixes
...
[portal] fix item-preview column #13077
2018-06-21 22:47:41 +05:30
Prateeksha Singh
9a138f07f7
[portal] fix item-preview column #13077
2018-06-21 22:42:03 +05:30
Nabin Hait
3ebc15cc8f
test fixes
2018-06-21 17:55:32 +05:30
Nabin Hait
e5b3a56cea
Test case fixes
2018-06-21 15:21:17 +05:30
Zlash65
4cf46edabc
expense_claim related fix in payment entry
...
outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added
2018-06-21 15:18:13 +05:30
rohitwaghchaure
ae276bcaa1
Don't allow to sale asset item from POS ( #14623 )
2018-06-21 13:18:01 +05:30
Shreya Shah
c8a40f3ef0
[Tests] Employee Onboarding & Separation ( #14606 )
...
* Set query on department
* Add test for Employee Onboarding
* Add fetch for Employee Separation fields
* Add test for Employee Separation
* Fix Staffing Plan test case
2018-06-21 13:06:47 +05:30
Sachin Mane
19a5a5dcf4
improve performance of stock_value retrieval using tabBin instead of … ( #14584 )
...
* improve performance of stock_value retrieval using tabBin instead of stock ledger
* rename fn
* rename fn
* Update warehouse.py
2018-06-21 13:01:48 +05:30
rohitwaghchaure
79e5b07e62
[Fix] Subscription method ( #14604 )
...
* [Fix] Subscription method path
* [Fix] Condition
2018-06-21 12:58:14 +05:30
rohitwaghchaure
4d80c05125
[Fix] Deferred account must be liability account ( #14612 )
2018-06-21 11:55:49 +05:30
Shreya Shah
22bb61b58c
Merge pull request #14608 from shreyashah115/fix-onboard
...
[Enhance] Employee Onboarding & Separation
2018-06-21 11:51:39 +05:30
Jamsheer
f76dbbae68
Compensatory Leave Request ( #14611 )
...
* Compensatory Leave Request - Validate Holidays and Attendance
* Compensatory Leave Request - Cancel
* Half Day in Compensatory Leave Request
* Leave allocation on Compensatory Leave Request - Fix
* Unused import
2018-06-21 11:38:38 +05:30
Nabin Hait
227489193b
Test case fixes
2018-06-21 11:36:13 +05:30
umaepoch
0484547150
BOM Stock Calculation Report ( #14561 )
...
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Siddhi Sawant
51e4d641c8
Job Applicant Source ( #14543 )
...
* New doctype - Job Applicant Source
* Source and source name field in job applicant
* Updated install_fixtures with default options
* Update install_fixtures.py
* Fixes codacy
2018-06-21 10:47:54 +05:30
Frappe PR Bot
748c0240db
[Translation] Updated Translations ( #14615 )
2018-06-21 10:34:28 +05:30
Charles-Henri Decultot
fc2292f08c
Email alert renamed to Notification ( #14618 )
2018-06-21 09:17:52 +05:30
Nabin Hait
3946b77555
changed fieldname of inventory section break in Item
2018-06-20 22:33:34 +05:30
Shreya Shah
b125ba9ed8
Update status if tasks have been completed ( #14601 )
2018-06-20 17:52:21 +05:30
Manas Solanki
616a6d2bc2
Test leave management ( #14587 )
...
* test max allowed days in leave policy
* test the leave period
* test leave encashment
2018-06-20 17:47:45 +05:30
Suraj Shetty
be3ce16352
Daily work summary reply report ( #14583 )
...
* Add daily work summary reply report
* Show user name instead of email
* Remove print statement
* Change field datatype
* ReRun Travis
2018-06-20 17:46:03 +05:30
Nabin Hait
7aae0e66df
minor fix
2018-06-20 17:45:39 +05:30
Bassam Ramadan
45725c2c7b
add missing brand filter to stock balance report ( #14597 )
...
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Shreya
3fd21d4273
Fix codacy
2018-06-20 16:09:16 +05:30
Shreya
5c6ade4bd8
Update and set status on the basis of project completion
2018-06-20 15:55:27 +05:30
Shreya
a5afd96019
Employee Onboarding and Separation lists
2018-06-20 15:55:14 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
Saurabh
98b7bb5679
bumped to version 10.1.39
2018-06-20 15:51:40 +06:00
Zarrar
99017b173d
naming for asset maintenance task should be task name ( #14607 )
2018-06-20 14:53:13 +05:30
Ranjith Kurungadam
c1030a3958
fix - Employee Transfer, Promotion ( #14603 )
2018-06-20 12:42:58 +05:30
Jamsheer
a1bb94e59d
Pro-rata component consistency for monthly Salary slip ( #14595 )
...
* Pro-rata component consistency for monthly Salary slip
* Resolve merge conflict
2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0
Update tax calculation ( #14564 )
...
* Tax Slab remove to_amt mandatory, condition data type Code
* Salary Slip - consider condition in tax slab
* Payroll Period - help text for tax slab condition
2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d
HRA fix ( #14589 )
...
* hra - fix var ref before assignment
* Tax Exemption Category - remove deduction component
2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71
Employee Benefit ( #14571 )
...
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim
* Employee Benefit Application - Validate previous benefit claim
* Employee Benefit Claim - Code refactor
* Salary Slip - additional salary - fix
2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183
[Fix] Additional Salary Component and tax calculation ( #14581 )
...
* Additional salary not include in tax calculation
* Additional salary get doubled in salary slip via Payroll Entry - Fix
* Salary Component - if is_additional_component hide flexi
2018-06-20 10:52:20 +05:30
Shreya Shah
222c550c29
Parse left out time ( #14586 )
2018-06-20 10:51:32 +05:30
Shreya Shah
0cb0c0b642
[Tests] Staffing Plan ( #14585 )
...
* Add test case for Staffing Plan
* Fix codacy
2018-06-20 10:50:54 +05:30
Zarrar
42f2d1a7a8
fix incase no customer fetched ( #14596 )
2018-06-20 10:50:11 +05:30
Ranjith Kurungadam
f972e7b259
Staffing Plan - remove department filter, query by dates ( #14590 )
2018-06-20 10:48:40 +05:30
rohitwaghchaure
fd5ac45775
[Fix] Not able to make invoice in the subscription ( #14594 )
2018-06-20 10:47:55 +05:30
Nabin Hait
a125a6199c
Allowed paid amount against debit/credit note
2018-06-19 12:07:02 +05:30
Shreya Shah
b0575265fb
Test case for Attendance Request ( #14566 )
...
* Add test case for Attendance Request
* Add a message if attendance not submitted
* Add test for cancelled document
2018-06-19 10:47:40 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Zarrar
ba1cdc6c57
fix opening invoice related authorization control - item=None ( #14567 )
2018-06-19 10:45:47 +05:30
Shreya Shah
cbff30f718
[Tests] Shift Planning ( #14570 )
...
* Cancel shift assignment on cancellation of shift request
* [minor] Fix shift type test
* Modify test for shift request
* Add test case for shift assignment
* Fix syntax
* Fix codacy
2018-06-19 10:45:33 +05:30
asbasawaraj
b0fafa9774
Additional fields in Certified Consultant DocType ( #14573 )
2018-06-19 10:43:55 +05:30
Shreya Shah
77de8dc102
Change Restaurant icon type to module ( #14578 )
2018-06-19 10:43:08 +05:30
Nabin Hait
875c941f3d
fixes in setting itemised tax breakup
2018-06-18 17:41:27 +05:30
Nabin Hait
8eeb5694ba
Fixed qty in item-wise sales history report
2018-06-18 17:41:27 +05:30
Nabin Hait
0bef91c241
minor fix in item type validation
2018-06-18 17:41:27 +05:30
Nabin Hait
ae02209b6a
Removed autoname of child table
2018-06-18 17:41:27 +05:30
Shreya Shah
5c3929c5ea
Fix positioning of fields ( #14562 )
2018-06-18 15:49:59 +05:30
Zarrar
e0adb6bbd6
cost_center overridden by company's default fix in SI ( #14560 )
2018-06-18 15:49:12 +05:30
Shreya Shah
1ac5585151
Bug - Add batch while creating serial nos ( #14559 )
2018-06-18 15:44:10 +05:30
Ranjith Kurungadam
5f7c7bfc78
remove patch to add hra fields ( #14552 )
2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
6cca03195f
fix- Salary Structure filter ( #14558 )
2018-06-18 15:42:38 +05:30
Ranjith Kurungadam
28f49a5a8e
fix - link validation error ( #14547 )
2018-06-18 10:40:23 +05:30
Zarrar
80ff296e97
data not filled in acc. receivable report for some field fix ( #14546 )
2018-06-17 11:21:10 +05:30
Manas Solanki
efa191c72e
[minor fix] change the unicode/str to the datetime obejct ( #14534 )
2018-06-15 18:04:12 +05:30
rohitwaghchaure
83a2612a18
[Fix] Consolidated Financial Statement report ( #14537 )
2018-06-15 18:03:50 +05:30
rohitwaghchaure
77a45b43aa
Added expense account, cost center in the purchase order and material request item doctype and fix the code ( #14535 )
2018-06-15 18:03:31 +05:30
Shreya Shah
27eff99190
[minor] Fixes for Exchange rate revaluation doctype ( #14533 )
...
* Add set query for account and party_type
* Fix asset category error
2018-06-15 16:30:15 +05:30
Shreya Shah
5f855d5da4
Add test case for Inter company Journal Entry ( #14531 )
2018-06-15 15:33:21 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
Ameya Shenoy
ed77429496
bumped to version 10.1.38
2018-06-15 09:29:56 +00:00
Nabin Hait
380a74732c
salary structure related test case fixes
2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511
create user permissions on save of employee
2018-06-15 13:16:44 +05:30
rohitwaghchaure
e647c1f3cb
Renamed asset adjustment to asset value adjustment ( #14532 )
2018-06-15 13:06:28 +05:30
Nabin Hait
fcaeea70d2
Update employee.py
2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d
Test case fixes
2018-06-15 11:59:58 +05:30
asbasawaraj
4c263480c9
Certfication Application Doctype and webform,Certfied Consultant DocType ( #14528 )
2018-06-15 10:04:19 +05:30
Ranjith Kurungadam
0e5c8283fa
Salary Slip - update period factor for tax calc ( #14527 )
2018-06-15 10:03:57 +05:30
Nabin Hait
2737b08f0f
blanket order related fixes
2018-06-14 18:07:34 +05:30
Shreya Shah
0b9b8d6826
Remove unused code ( #14526 )
2018-06-14 17:57:39 +05:30
Shreya Shah
02575d1f2c
Merge pull request #14205 from Alchez/frappe-contract
...
[Feature] Managing Contracts in ERPNext
2018-06-14 17:57:02 +05:30
Ranjith Kurungadam
a8e047afc8
HRA tax exemption Indian regional ( #14520 )
...
* remove HRA fields fom declaration, proof submission
* HRA fields, methods India regional
* Company - remove Payroll Settings
* HRA India regional, override methods
* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Manas Solanki
c7afbea708
Update bom.py ( #14524 )
2018-06-14 17:30:26 +05:30
Nabin Hait
d1f40ad0b6
minor fix
2018-06-14 17:09:55 +05:30
Shreya
cdd3982b44
[minor] Fix
2018-06-14 16:43:47 +05:30
Shreya
f333536446
Remove test_records.json and modify test
2018-06-14 16:43:07 +05:30
Nabin Hait
44341c1637
removed blanket order docs
2018-06-14 15:58:41 +05:30
Nabin Hait
b2d3c0f040
Update ordered qty in blanket order
2018-06-14 15:56:29 +05:30
Manas Solanki
9a31dd7062
test + documentation
2018-06-14 15:56:29 +05:30
Manas Solanki
2df1b31707
[minor] minor fixes along with the codacy
2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137
[feature] Blanket Order
...
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724
init the blanket order
2018-06-14 15:55:37 +05:30
Rushabh Mehta
1198d94904
[rename] Email Alert -> Notification
2018-06-14 13:18:21 +05:30
Shreya Shah
c3d1353ab5
Merge pull request #14518 from shreyashah115/patch-fix
...
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0
Check if table exists else return
2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
...
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30
Zarrar
6ffdf94003
[Fixes] Defaults and User-Permission based fixes in treeview ( #14501 )
...
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data
* make use of utility function for treeview
2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application
...
[Enhancement] toggle required fields on select of repayment option in loan application
2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab
[Fix] HR Fixes ( #14511 )
...
* Payroll Entry - fix in db query
* Salary Structure Assignment - Company read_only = 1
* Fixes in hr util and benefit claim
* Employee Benefit Application - Late application - fix
2018-06-14 11:55:17 +05:30
Zarrar
17089eeac3
[Minor] Fetching and appending items in Stock Reconciliation fix ( #14509 )
...
* minor fix in get_list of items in stock reconciliation
* reload doc fails because of backdated modified date
* item and item defaults should load prior to shopify refactor
* attribute value should't be none or empty, could be zero though
* Update item.py
2018-06-14 11:54:18 +05:30
Shreya Shah
dd8fba6783
Do not check for batch on cancellation ( #14506 )
2018-06-14 11:49:45 +05:30
Saurabh
8e74df09a4
[fix] On deletion of salary slip decrease the series count ( #14508 )
2018-06-14 11:47:21 +05:30
Rushabh Mehta
0d19744b17
[fix] for notification
2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES
62805e2101
Fix unicode literal issue that prevents payment entries to be created ( #14515 )
2018-06-14 09:14:07 +05:30
rohitwaghchaure
fb997d6539
[Fix] Woocommerce test cases ( #14513 )
2018-06-14 09:13:39 +05:30
Prateeksha Singh
0738483343
[docs] remove docs folder 💥 , update docs app to foundation ( #14516 )
2018-06-14 09:11:05 +05:30
Manas Solanki
687c6bb002
Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption
...
[Fix] Travis for the test case test_material_consumption
2018-06-13 18:41:12 +05:30
Rohit Waghchaure
80d4477d1e
[Fix] Travis for test_material_consumption
2018-06-13 18:37:03 +05:30
Shreya Shah
a2056a39bd
Fix patch ( #14503 )
...
* Modify patch to move leave approvers from Employee master to Department master
* Rename child table names
- Rename leave approver to leave approvers
- Rename expense approver to expense approvers
* Import cstr
* Fix a condition
2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py
2018-06-13 16:47:41 +05:30
Shreya Shah
3d73a6f7f2
Fetch details from Journal Entry in Accounts Payable report ( #14495 )
...
* Fetch bill_no, bill_date from Journal Entry
* Fix as per suggestion
* Fetch details only if bill_no exists
2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd
46c8ccc6a8
Fix conflict for taxable value having same item in GSTR-1 Report ( #14492 )
...
* Update gstr_1.py
Merge conflict for taxable value having same item
* Update gstr_1.py
* Minor Fix
* Update gstr_1.py
2018-06-13 15:34:17 +05:30
Jamsheer
30f37b2eb1
Payroll Entry - Separate JE for flexi salary component ( #14502 )
...
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry
* Journal Entry - validate cheque info on submit
* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5
Employee benefit application depends on lwp ( #14494 )
...
* Employee benefit - pro-rata amount - depends on lwp and working days
* HR Util - get holidays for employee
* Employee Benefit Application - calculate remainig on max benefit
* Employee benefit - late application - depends on lwp
* missing semicolon
2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84
[Fix] Travis for employee_tax_exemption_declaration ( #14500 )
2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f
Remove docstatus=1 to show pending leaves as well ( #14498 )
2018-06-13 15:11:43 +05:30
Manas Solanki
9385cd5203
Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases
...
[Fix] Travis for stock entry
2018-06-13 14:06:20 +05:30
Rohit Waghchaure
0eef3f665d
[Fix] Travis for stock entry
2018-06-13 13:06:25 +05:30
Manas Solanki
b12f0d90af
fix the timesheet
2018-06-13 12:30:02 +05:30
Jamsheer
f6d7b5d0c8
Salary slip - additional salary - deductions ( #14476 )
2018-06-13 11:36:43 +05:30
Tom Price
32c984cd3c
Fix fields being hidden by default. ( #14490 )
...
Modify the title property to be sensible for general usage, unique and translatable.
Add allow_in_quick_entry properties appropriately.
2018-06-13 11:14:44 +05:30
Manas Solanki
176e7c5ce2
fix the test case for the payroll ( #14480 )
...
* fix the test case for the payroll
* fix the shopify and stock entry
* more structured test cases for payroll
2018-06-13 11:13:01 +05:30
Prateeksha Singh
d1fffb6ba1
Merge pull request #14484 from pratu16x7/help-portal
...
[help-portal] don't show issues to guest
2018-06-12 17:40:36 +05:30
Prateeksha Singh
8d58429b69
[help-portal] don't show issues to guest
2018-06-12 17:39:12 +05:30
Nabin Hait
76c51b3068
minor ux fix
2018-06-12 16:29:10 +05:30
deepak-mnt
b95f60c6f3
minor changes
2018-06-12 16:04:49 +05:30
Rohit Waghchaure
b6381c66d8
[Fix] Purchase receipt test cases
2018-06-12 13:54:40 +05:30
rohitwaghchaure
a6b346f827
Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes
...
[Fix] Test cases for asset
2018-06-12 12:21:11 +05:30
Rohit Waghchaure
f270567c45
[Fix] Test cases for asset
2018-06-12 12:20:52 +05:30
Ranjith Kurungadam
138e6abaff
Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof ( #14428 )
2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494
Check if user permission for employee exists ( #14474 )
...
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d
Employee benefit - Late employee benefit application ( #14465 )
...
* HR Utils - get salary slip total benefit given for a payroll period
* Late employee benefit application
* Additional Salary - code refactor - get_amount
* new line in salary detail json
* Employee benefit late application - validation refactor
* Codacy fix
2018-06-12 11:30:59 +05:30
rohitwaghchaure
2354c1eba3
Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no
...
Code cleanup and fixes for the asset
2018-06-12 11:19:01 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py
2018-06-12 11:18:01 +05:30
Rohit Waghchaure
ec2a2ac47e
[Fix] patch
2018-06-12 01:16:28 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1
...
fix the salary slip test cases
2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d
fix the salary slip test cases
2018-06-11 19:27:46 +05:30
Rohit Waghchaure
647d595158
Code cleanup and fixes for the asset
2018-06-11 19:15:08 +05:30
Shridhar Patil
c3f5849ac0
typo fixed
2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav
...
Travis again
2018-06-11 17:45:11 +05:30
Shreya Shah
157815ff0c
Patch for total quantity ( #14458 )
...
* Add path to patches.txt
* Modify patch
2018-06-11 17:32:17 +05:30
Jamsheer
0ca76323af
Clinical Procedure Template - get_item_details - fix ( #14449 )
2018-06-11 17:25:49 +05:30
Prateeksha Singh
252d0bf255
Merge pull request #14455 from frappe/kennethsequeira-patch-3
...
Fix minor div issue in Accounts index page
2018-06-11 16:33:51 +05:30
rohitwaghchaure
7cd59a2089
Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush
...
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 15:44:37 +05:30
Shreya
9680dc476f
Remove commented code
2018-06-11 15:40:09 +05:30
deepak-mnt
bb6753f206
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type
2018-06-11 15:01:43 +05:30
deepak-mnt
4ec283d775
patch for sales partner type field
2018-06-11 14:53:25 +05:30
Manas Solanki
7e8cbf288c
Update cost_center.py
2018-06-11 14:25:27 +05:30
Kenneth Sequeira
061492a9af
Fix minor div issue in Accounts
2018-06-11 14:24:19 +05:30
Rohit Waghchaure
86026d31cf
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 14:11:00 +05:30
Rohit Waghchaure
cdec44ee81
Removed company data from test item records
2018-06-11 13:32:34 +05:30
Prateeksha Singh
ea7533fa75
[tax-breakup] store itemized tax by item_name when can
2018-06-11 13:31:33 +05:30
Shridhar Patil
6a00a17c14
toggle required fields on select of repayment option in loan application
2018-06-11 12:48:31 +05:30
rohitwaghchaure
7048925016
[Enhance] Standalone debit/credit note ( #14269 )
...
* [Enhance] Standalone debit/credit note
* Test cases
* Test cases and documentation
* Removed credit, debit note links from accounts module
2018-06-11 12:02:14 +05:30
Manas Solanki
3639b85663
Merge pull request #14363 from frappe/manassolanki-patch-10
...
PR to check the current state of Travis
2018-06-11 11:40:40 +05:30
Ranjith Kurungadam
e46639f47c
Employee Transfer allow same company, update internal work history ( #14430 )
2018-06-11 11:24:44 +05:30
Zarrar
88a90ff3b5
minor fix in account and account utils ( #14432 )
2018-06-11 11:21:17 +05:30
Shreya
83d5dc119b
Fix Employee tax declaration test case
2018-06-11 10:31:40 +05:30
Shreya
664f30a018
Fix asset maintenance json
2018-06-11 10:31:40 +05:30
Shreya
294238abfd
Fix shopify test case
2018-06-11 10:31:39 +05:30
Shreya
956277b121
Fix tests
2018-06-11 10:31:39 +05:30
Zarrar
65994210f6
fix patch to add email template in hr settings ( #14427 )
2018-06-08 16:57:06 +05:30
Zarrar
44175904c6
Tree fix ( #14425 )
...
* use frm.set_value instead of this.set_value
* generic methods moved to accounts/utils
* clean up code, and make use of methods added in utils
2018-06-08 16:35:21 +05:30
Suraj Shetty
f553b53fbf
Add patch to set update_field and update_value ( #14421 )
...
* Add patch to set update_field and update_value
- set update_field and update_value if empty
since expense claim workflow is dependent on it.
* Set update_field for workflow state of leave application
* Update patch entry
* Fix bug
* Update set_update_field_and_value_in_workflow_state.py
2018-06-08 16:28:36 +05:30
Alchez
ca8138fd13
[Agriculture] Sort crop tasks chronologically and optimize disease task creation ( #14367 )
...
* Improve max crop period check and sort agriculture tasks chronologically
* Reformat crop cycle logic and add field to optimize task creation
2018-06-08 14:55:07 +05:30
Doridel Cahanap
ebb530385a
Add Employee Status Temporary Leave ( #14423 )
2018-06-08 14:54:31 +05:30
rohitwaghchaure
8fc64a9717
[Fix] Travis data ( #14422 )
2018-06-08 14:43:50 +05:30
Zarrar
7ab70ca2d7
[ Fixes ] v11 Tree based doctype testing ( #14419 )
...
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node
* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash
* Company tree fix
Check if child exist while deleting a node validation added.
* Supplier Group tree fixes
on_trash validation added if child node present
* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
2018-06-08 14:33:15 +05:30
Gaurav Naik
094617d29a
Fix to allow migration of individual sites ( #14413 )
2018-06-08 11:44:27 +05:30
Shreya Shah
b9399d8781
Cancel attendance if leave application is cancelled ( #14372 )
...
* Cancel attendance if leave application is cancelled
* Fix as per review
2018-06-08 11:24:08 +05:30
Zarrar
8cd0f67b25
query fix if name contains apostrophe ( #14370 )
2018-06-07 16:48:31 +05:30
Zarrar
13f9851609
[Docs] Update doc for Supplier Group ( #14373 )
...
* add breadcrumb for Supplier Group tree
* change occurrences of supplier-type to supplier-group
* update supplier-group doc, update pngs
2018-06-07 16:47:30 +05:30
Zarrar
209d8f36f7
doctype was not reloaded to pickup changes ( #14371 )
2018-06-07 16:43:55 +05:30
Prateeksha Singh
50ae6b891b
Merge pull request #14410 from pratu16x7/hub-fixes
...
Hub fixes
2018-06-07 14:19:01 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav
...
Some more travis fixes
2018-06-07 14:14:33 +05:30
Prateeksha Singh
00ab78d768
[hub] set page title dynamically
2018-06-07 14:13:00 +05:30
Shreya
88591314b0
Fix Leave Application test cases
2018-06-07 13:56:27 +05:30
Rohit Waghchaure
de82ad1c5f
[Fix] Clenaup code if supplier gstin is none
2018-06-07 13:24:25 +05:30
Prateeksha Singh
9a7f957ace
[hub] fix item page recursion
2018-06-07 12:40:40 +05:30
Shreya
88fe0d59d9
Fix daily work summary test
2018-06-07 11:22:26 +05:30
Shreya
4638d1ab97
Fix POS Profile test
2018-06-06 16:23:16 +05:30
Shreya
71316aaec8
Modify asset movement test cases and files
2018-06-06 15:55:30 +05:30
Zarrar
32a118d68c
fix precision in stock entry ( #14366 )
2018-06-06 15:06:52 +05:30
Saurabh
eb579a11e1
Fix demo ( #14365 )
...
* fix demo
* Update asset.json
2018-06-06 15:05:31 +05:30
Shreya
90bdfed3db
Modify all asset test cases
2018-06-06 14:27:55 +05:30
Manas Solanki
3504a2342e
PR to check the current state of Travis
2018-06-06 12:46:06 +05:30
Ranjith Kurungadam
cff14793d8
Salary Structure, Slip - make fields readonly ( #14358 )
...
* Salary Structure, Slip - make fields readonly
* codacy fixes
* Salary Component - reorder fields, removed is_group for flexi
* Update salary_structure.js
2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop
2018-06-06 05:53:19 +00:00
Ameya Shenoy
36cd433999
bumped to version 10.1.37
2018-06-06 05:41:37 +00:00
Charles-Henri Decultot
a774f3d7a0
POS closing voucher ( #14270 )
...
* POS closing voucher
* Codacy corrections + improvements
* Codacy corrections
* POS Closing Voucher improvements
2018-06-06 10:22:13 +05:30
Alchez
eb0ac37587
Fix ISO standard references in Agriculture ( #14361 )
2018-06-06 10:10:56 +05:30
Shreya Shah
59af3a0296
[Enhancement] UOM Conversion Factors ( #13853 )
...
* new doctype UOM category
* new doctype UOM Conversion Factor
* bootstrap json data for uom conversions
* uom conversion in item
* Patch to add all conversions and categories
* Fetch conversions multi-way
* fix codacy
* Rebase with develop
* [minor] Fix
* Add a test case
* Improvise as per review comment
* Add json data for UOMs
* Commonify function and call from patch
* Update uom_conversion_data.py
2018-06-06 09:44:46 +05:30
Sushant Nadkar
d458f7710f
[UX Improvement] Removed uri encoding from search results on front end ( #14266 )
...
* removed uri encoding from search results on front end
* decode search string using html2text
2018-06-06 09:23:38 +05:30
Shreya Shah
c37fd050c5
Remove unnecessary variable ( #14352 )
...
* Remove unnecessary variable
* Replace cur_frm with frm
* Update material_request.js
2018-06-06 09:19:48 +05:30
Shreya
9aa7d8fe5f
Update asset related test cases
2018-06-06 04:27:59 +05:30
Shreya
80a1e156cb
Create location for asset test
2018-06-06 03:11:18 +05:30
Shreya
9c801b976d
Fix share transfer test
2018-06-06 02:58:23 +05:30
Shreya
8f692f9a27
Fix batch test
2018-06-06 02:09:17 +05:30
Shreya
2ad81726d5
Fix utils.py
2018-06-06 02:09:17 +05:30
Manas Solanki
dabe21051c
Update test_company.py ( #14360 )
2018-06-05 16:28:27 +05:30
Nabin Hait
2f273e73b2
minor fixes
2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0
Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop
2018-06-05 14:21:57 +05:30
Shreya Shah
6ff3a094e2
Fix currency exchange tests ( #14356 )
2018-06-05 14:16:10 +05:30
rohitwaghchaure
50d8c4a10f
[Fix] Not able to save purchase invoice, due to invalid condition ( #14355 )
2018-06-05 13:08:10 +05:30
rohitwaghchaure
2da6b3d628
[enhance] Provision to backflush raw materials based on stock entries for subcontracted items ( #14296 )
2018-06-05 13:06:52 +05:30
Shreya Shah
630721aacc
Travis ( #14354 )
...
* Fix Purchase Receipt tests
* Fix Item test
* Fix daily work summary test
* Modify currency exchange test cases
* Fix Leave Application test
* Update working hours when making salary slip from timesheet
* Replace fixer.io with exchangeratesapi
* Fix codacy
2018-06-05 12:56:10 +05:30
Nabin Hait
81d12cc9c8
Get default income account from Item
2018-06-05 12:49:03 +05:30
Ranjith Kurungadam
d580c92377
Staffing Plan ( #14346 )
...
* validate staffing plan
* staffing plan docs
* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set
* validate with parent and child company plans, plan now considers open job openings
* Failure details in validate error messages
* Fixed sql injection
2018-06-05 11:40:58 +05:30
Shreya Shah
4fa600a8dd
Apply GST based on Origin and Place of supply GST Code ( #14288 )
...
* Add new gst field in Taxes and Charges template - is_inter_state
* Add a patch
* Add a regional function to fetch taxes on the basis of GSTin
* Add regional function to hooks.py
* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN
* Fixes in the setup.py for India region
* Set is_inter_state field
For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.
* Fix as per review comment
2018-06-05 11:27:53 +05:30
Shreya Shah
5103454642
New Report Address and Contacts ( #14307 )
...
* New Report Address and Contacts
* Fix codacy
* Add links to report in module pages
2018-06-05 10:44:36 +05:30
Sushant Nadkar
565bf203e5
[Improvement] Added display settings for item price, availibility and stock levels ( #14308 )
...
* display item price on website even when cart is disabled
* added display settings for item price, availibility and stock levels
* Update shopping_cart_settings.json
2018-06-05 10:43:11 +05:30
Alchez
31ab64822c
Make the item UOM more visible ( #14315 )
2018-06-05 10:35:55 +05:30
Shreya Shah
f1e54836cb
Remove hardcoded workflow patches ( #14340 )
2018-06-05 10:35:07 +05:30
Shreya Shah
b75e77a2cc
Fix syntax ( #14342 )
2018-06-05 10:33:29 +05:30
Sushant Nadkar
64907e5083
Validate response message for frappe call ( #14343 )
2018-06-05 10:33:04 +05:30
Zarrar
7c088ff623
dont validate items if item_code not found ( #14344 )
...
item_code field is not set when created using invoice creation tool
2018-06-05 10:32:09 +05:30
rohitwaghchaure
7cf01e7c75
Replaced fixer api with exchangeratesapi ( #14347 )
2018-06-05 10:30:20 +05:30
asbasawaraj
1b16b772ab
Report to Track Expiring Memberships - Monthwise ( #14207 )
2018-06-05 10:30:03 +05:30
Nabin Hait
c4eec99bc4
minor fix
2018-06-05 09:06:30 +05:30
Prateeksha Singh
2141bfab89
[patch][update] naming_series field in member patch
2018-06-04 16:36:12 +05:30
Rohan Bansal
841d54c49d
Start adding tests for contracts
2018-06-04 15:56:38 +05:30
Rohan Bansal
bf0f0aaf6f
Add Contract-related doctypes to ERPNext
2018-06-04 15:56:38 +05:30
Prateeksha Singh
37678d4838
[patch][new] rename old members as per naming series ( #14339 )
2018-06-04 14:25:51 +05:30
Sushant Nadkar
ebf76163ad
show uom in list view of material request ( #14338 )
2018-06-04 14:23:25 +05:30
Ranjith Kurungadam
f576c570c9
Salary Slip - fix when no pyroll period found for tax calc ( #14335 )
2018-06-04 12:53:23 +05:30
Zarrar
fc03a0463c
[Fix] Validate items for saleable, purchaseable or subcontractable in transactions ( #14316 )
...
* validate items to see if they are saleable
* check if items are subcontractable or saleable
* improvise name,error message and code
Validate type function validates item if they are of proper type for that transaction and throws descriptive error.
2018-06-04 12:52:52 +05:30
Nabin Hait
8c7af497a0
Fixed merge conflict
2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2
Salary Slip - Deduct Tax ( #14255 )
...
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof
* fix - missing return statement
2018-06-04 11:17:55 +05:30
Nabin Hait
a55090dc88
Fixed merge conflict
2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d
Rename - Additional Salary Component to Additional Salary ( #14302 )
...
* Rename Doctype Additional Salary Component to Additional Salary
* Remove unused import
2018-06-04 11:02:53 +05:30
rohitwaghchaure
5ecc26bf15
[Fix] get_shipping_address() takes at least 1 argument (0 given) ( #14328 )
2018-06-04 11:00:24 +05:30
Prateeksha Singh
8ac7dfee36
Merge pull request #14329 from pratu16x7/hub-fixes
...
[hub][minor] remove links #14309
2018-06-04 10:28:47 +05:30
Prateeksha Singh
e73df88863
[hub][minor] remove links #14309
2018-06-04 10:26:49 +05:30
rohitwaghchaure
c1cf495a93
[Fix] Special character issue ( #14322 )
2018-06-03 16:00:31 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json
2018-06-03 15:31:35 +05:30
Shreya Shah
d3255b1d3d
Add docs for Inter Company Invoice creation ( #14314 )
2018-06-03 10:28:51 +05:30
Tropicalrambler
8b38e57af2
Correcting typo in the User Documentation ( #14326 )
...
This corrects a simple typo in the Pricing rule topic for documentation
2018-06-03 10:27:38 +05:30
Ranjith Kurungadam
375db6181d
Earned Leave ( #14143 )
...
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this
* Earned Leave monthly scheduler method, test
* remove whitelist of method
2018-06-01 16:09:28 +05:30
rohitwaghchaure
ce642d73cb
[Fix] Special character issue while upadting customer group in customer ( #14312 )
2018-06-01 15:11:21 +05:30
rohitwaghchaure
2fa057e4ad
[Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same ( #14311 )
2018-06-01 15:10:55 +05:30
Zarrar
7e0e85912b
item_name not fetched in packing slip ( #14310 )
2018-06-01 15:10:33 +05:30
Saurabh
824e068d0a
typo fix
2018-05-31 18:11:05 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Saurabh
fccf7f2a68
bumped to version 10.1.36
2018-05-31 17:54:53 +06:00
Ranjith
590bf4ce3a
codacy fixes
2018-05-31 12:08:14 +05:30
Shreya Shah
c55f774fbf
Address filter in gstr1 report ( #14290 )
2018-05-31 09:33:36 +05:30
AMS Fauzi
f3a6d95634
Develop: Batch Number Series ( #14251 )
2018-05-31 09:31:57 +05:30
rohitwaghchaure
780952ea03
Show actual qty in warehouse link search ( #14258 )
2018-05-31 09:29:18 +05:30
Ahmad M Abdelrahman
f12b446dc8
Bank Account #13714 PR ( #14295 )
2018-05-31 08:58:23 +05:30
Saurabh
e5d076d495
[minor][fix] fix query syntax ( #14294 )
...
* [minor][fix] fix query syntax
* Update pos.py
2018-05-31 08:54:31 +05:30
Umair Sayed
5225c0e541
May docs ( #14298 )
...
* manual update
* Added new videos in learn section. Updated other help pages.
* project module rewrite
* employee and supplier master
* employee and supplier master fixes
2018-05-31 08:43:22 +05:30
rohitwaghchaure
26833cf506
Merge pull request #14299 from rohitwaghchaure/field_rearrange_for_budget
...
Rearrange fields
2018-05-31 00:27:45 +05:30
Rohit Waghchaure
7c0dd7a142
Rearrange fields
2018-05-31 00:27:05 +05:30
Ranjith
0cb2684130
Tax Exemption Proof Submission - validations, eligible hra calc
2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa
Tax Exemption Declaration - update fields, move generic methods to utils
2018-05-30 20:50:48 +05:30
rohitwaghchaure
31a96d2a3f
[Fix] System not fetching default warehoue defined in pos profile for packing materials of product bundle item ( #14287 )
2018-05-30 18:13:47 +05:30
Prateeksha Singh
c62de0831e
Merge pull request #14291 from pratu16x7/help-page
...
[fix] help page issue listing
2018-05-30 17:27:49 +05:30
Prateeksha Singh
66425c6e7f
[fix] help page issue listing
2018-05-30 17:26:03 +05:30
Shreya Shah
47335e5e60
Stocking out items with expired batches ( #14249 )
...
* Add dropdown in Stock Entry to get expired batch items
* Fetch all the items with expired batches
* Add the fetched item details to stock entry details
* Modify as per the review comments
2018-05-30 15:44:41 +05:30
rohitwaghchaure
05152dad0b
[Enhance] Provision to set overproduction percentage for work order ( #14248 )
2018-05-30 15:28:09 +05:30
Prateeksha Singh
09e46a4e5f
Hub fixes ( #14281 )
...
* [hub] remove list freeze
* [hub] fix svg in icon
* [hub] implement route options in hub list view
2018-05-30 15:12:20 +05:30
Jignesh Greycube
9aca025be2
Documentation to Fetch value in Child Table for a field ( #14282 )
...
* Fetch value in Child Table for a field
Sample Script to fetch value in child table
* Update fetch value in child table field
2018-05-30 15:08:55 +05:30
Ranjith
806cd93791
Merge remote-tracking branch 'frappe/develop' into dev_hra
2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a
Tax Exemption Declaration - HRA Calculation
2018-05-30 13:37:15 +05:30
Faris Ansari
6ac9c0f71e
Merge pull request #14267 from surajshetty3416/workflow-doc-changes
...
Add doc related to workflow action
2018-05-30 12:34:21 +05:30
Zarrar
39c0add5a2
query fix sales-person-target-variance-item-group-wise ( #14271 )
2018-05-30 11:56:58 +05:30
Zarrar
58200182b4
update timeline data form Activity Log ( #14276 )
...
Documents updated are stored in Activity Log rather than Communication
2018-05-30 11:56:23 +05:30
Prateeksha Singh
865e16621c
[docs] fix embed issues ( #14268 )
2018-05-29 17:09:56 +05:30
Suraj Shetty
e51e51e138
Add requested changes
2018-05-29 16:46:19 +05:30
Nabin Hait
348a6a8b17
patch fixes
2018-05-29 16:17:15 +05:30
Suraj Shetty
77aed9d58b
Move video section to bottom
2018-05-29 15:45:22 +05:30
Suraj Shetty
16d3494efc
Add doc related to workflow action
2018-05-29 15:29:18 +05:30
Vladyslav Baidak
13d4391e70
Fixed SQL syntax error in Get Loan Details ( #14265 )
2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf
Tax Exemption Declaration, Proof Submission HRA fields
2018-05-29 13:58:31 +05:30
Ranjith
fb257ba19c
Company - Payroll Settings- fields
2018-05-29 13:57:27 +05:30
Nabin Hait
4d0c73a5c8
Submit auto created salary structure assignments
2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d
Fixes related to department tree
2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b
[fix] add ignore validate flag ( #14238 )
2018-05-29 13:07:27 +05:30
Nabin Hait
288cbcafce
Create demo data for salary structure
2018-05-29 11:04:11 +05:30
Nabin Hait
153536bf70
minor test fixes
2018-05-29 10:58:57 +05:30
Shreya Shah
ae95a8aa15
Update status in Purchase Receipt ( #14257 )
...
* Update status on submission if per_billed = 100
* Add patch to update existing records
2018-05-28 18:24:28 +05:30
Zarrar
b9f54ca946
[Enhance] Group same items during printing Delivery Note, Invoices, etc ( #14250 )
...
* add doctypes allowed to group items, average the rate
* add check field to group items during print
* call common before_print in delivery note
* fix precision issue while calculating average
2018-05-28 17:41:09 +05:30
rohitwaghchaure
a8c6ec27c0
Merge pull request #14252 from rohitwaghchaure/leaderboard_translation_issue
...
[Fix] Translation issue in leaderboard
2018-05-28 15:51:00 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix
...
[fix] Stock Ledger report item filter
2018-05-28 15:23:21 +05:30
rohitwaghchaure
bd2989a541
Merge pull request #14254 from rohitwaghchaure/leave_application_issue_for_leave_approver
...
[Fix] Leave application, leave approver not fetching
2018-05-28 15:11:08 +05:30
Rohit Waghchaure
81302a8b12
[Fix] Leave application, leave approver not fetching
2018-05-28 15:10:19 +05:30
rohitwaghchaure
65684564c2
Merge pull request #14253 from rohitwaghchaure/financial_report_issue
...
[Fix] Data not displaying in financial reports
2018-05-28 15:03:43 +05:30
Rohit Waghchaure
c89a84b61e
Fixed data not displaying in financial reports
2018-05-28 15:01:57 +05:30
Rohit Waghchaure
06f91e2dc1
[Fix] Translation issue in leaderboard
2018-05-28 14:43:17 +05:30
rohitwaghchaure
30c88fe1a5
Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse
...
Fixed patch, checked warehouse available in the asset
2018-05-28 12:30:55 +05:30
Rohit Waghchaure
ad184f62e3
Fixed patch, checked warehouse available in the asset
2018-05-28 12:29:42 +05:30
Shreya Shah
13f39eb821
Display rate on the basis of stock UOM ( #14246 )
2018-05-28 11:50:28 +05:30
Shreya Shah
e329038aaa
Total Quantity in Sales and Purchase DocTypes ( #14114 )
...
* Add field to all sales and purchase doctypes
* Add patch to update existing records
* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
tundebabzy
3eb235a53b
Sales Payment Summart Report Improvement ( #14243 )
...
* fix iteritems() takes exactly 1 argument (2 given)
* adds new helper functions
* use new functions to make POS invoices filterable on warehouse and cost center
* more PEP8 fixes
2018-05-28 10:26:45 +05:30
Kenneth Sequeira
119cc5dec6
Documentation - Open Divs and Video Resolutions ( #14242 )
...
* fixed open div tag in edu docs
* fixed open div tag in projects page
* fixed open div for item variants, serialized inventory article
* fixed video aspect ratio and open div for Selling, Workflow, and Material Request
2018-05-28 10:24:43 +05:30
Ameya Shenoy
67c9566e77
Duct tape for demo ( #14241 )
...
The demo is just too old and needs a complete refactor. This is just a
workaroud to keep the demo working
2018-05-27 12:45:32 +05:30
Solufyin
64d02f917a
[ADD] Department Analytics Bar Chart Feature ( #14217 )
2018-05-26 09:26:03 +05:30
rohitwaghchaure
a8fb2db001
[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed ( #14230 )
2018-05-26 09:23:02 +05:30
Kenneth Sequeira
089a41c679
Fixed code in Embed Link ( #14228 )
2018-05-26 09:22:43 +05:30
Suraj Shetty
084b0b3a67
Treeview permission ( #14232 )
...
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 )
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
* Add parent filter
* Add ifnull checks
2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493
Minor fixes ( #14231 )
...
* Parse date using getdate to avoid TypeError
* Fix alignment of application dashboard table text
* Use `user` instead of `email` to get value from user table
2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf
Test case fixes ( #14219 )
...
* Test case fixes
* fetch_from fixes
2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c
Remove unused imports
2018-05-25 15:20:50 +05:30
Jamsheer
9416ac4ad4
Leave Priod - fix - grant leave allocation filter by grade
2018-05-25 14:46:31 +05:30
Manas Solanki
730cb3b547
Update employee.py
2018-05-25 14:46:21 +05:30
Jamsheer
fca88a6b22
Employee benefits - get_assigned_salary_structure
2018-05-25 14:35:02 +05:30
Jamsheer
79a6b42353
Salary Slip - options to fetch from migration
2018-05-25 12:56:22 +05:30
Jamsheer
ce89199abb
taxable salary slabs remove from Salary Component and add to Payroll Period
2018-05-25 12:52:23 +05:30
Jamsheer
f1d10bf286
Salary Component - remove flexi_default
2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c
Employee Benefit Claim - non pro-rata claim validation updated
2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d
options to fetch from migration
2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a
Employee Benefits in Salary Slip - Application and Claim
2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e
get payroll period days - fix
2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0
Calculate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516
Validate remaining benefit amount in Employee Benefit Application
2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3
Employee Benefit Claim - date default to Today
2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec
Max benefit amount in Employee Benefit Application Detail
2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02
Employee Benefit Calim - earning component filter updated
2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e
Employee Benefit Application - refactor validation
2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f
Salary Structure - validate flexi with max benefit
2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68
Payroll Period - validate dates and overlap
2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499
Payroll Period - fields refactor
2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21
Salary Structure - validate max benefits with flexi
2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e
Salary Structure - filter for earnings
2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c
Employee Benefit Application - earning component filter by salary structure flexi component
2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01
Salary Component - account mandatory for separate payment entry
2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752
Codacy fix
2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c
Additional Salary Component - filter updated - salary_component
2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af
Salary Component - fields - refactor fields behaviour
2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7
Employee Benefit Application - filter updated - earning component
2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb
Employee Benefit Claim - filter for earning component
2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005
Employee Benefit Claim - Validation Updated - Code refactor
2018-05-25 12:37:35 +05:30
Nabin Hait
f87ec61043
Test case fixes for item defaults
2018-05-24 18:19:21 +05:30
Ranjith Kurungadam
27cf190269
healthcare fix - str encode to utf-8 ( #14213 )
2018-05-24 17:15:22 +05:30
Nabin Hait
b903fc4e71
Item defaults query fixes
2018-05-24 17:07:51 +05:30
Prateeksha Singh
05283b8af0
[fix] distribution page embed
2018-05-24 16:17:22 +05:30
Zarrar
ea064d4c5c
module import fix in patch ( #14203 )
2018-05-24 15:54:48 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +00:00
Ameya Shenoy
475729cefe
bumped to version 10.1.35
2018-05-24 08:45:12 +00:00
neckos
7663bb91c5
return list(filter()) not filter() ( #14191 )
...
filter constructs an iterator that is iterable only once
2018-05-23 19:45:34 +05:30
neckos
225af4a4cb
unicode error in python3 ( #14192 )
2018-05-23 19:43:53 +05:30
Manas Solanki
f7713ebfa7
[optimize] introduce two filter in the report in order to handle large item master data ( #14193 )
2018-05-23 19:43:04 +05:30
Nabin Hait
5f861756a2
Item Default fixes
2018-05-23 19:37:06 +05:30
Nabin Hait
d5cb4c10a1
Set parent department if missing and not root itself
2018-05-23 18:36:18 +05:30
Rushabh Mehta
315dbd2ed1
[minor] chart_of_accounts.py for python3
2018-05-23 16:14:35 +05:30
Rushabh Mehta
f7414519bb
[fix] set default supplier group in test
2018-05-23 16:14:35 +05:30
Rushabh Mehta
8788688431
[fix] inconsistent indentation
2018-05-23 16:14:35 +05:30
Nabin Hait
46600406b8
Update rename_field_max_days_allowed.py
2018-05-23 13:12:24 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Deepak kumar
e4c2ef03e1
Link Share Transfer to Account ( #14127 )
...
* Link Share Transfer to Account
* minor changes
* minoor changes
2018-05-23 10:50:22 +05:30
OSS Technolab
4fb4ca6b10
Project Budget does not filter per Project ( #14179 )
...
* Project Budget does not filter per Project
Project Budget does not filter per Project and always return actual expense amount of all entries tagged to a project.
* Update budget.py
2018-05-23 10:47:53 +05:30
Prateeksha Singh
2f69254e56
[company][dashboard] implement heatmap with linked doctypes ( #14185 )
...
* [company][dashboard] implement heatmap with linked doctypes
* [company][dashboard] cache transaction history data, schedule query daily
2018-05-23 10:41:26 +05:30
Suraj Shetty
e03937fd6a
Send daily work summary alert to only enabled users ( #14175 )
...
* Send daily work summary alert to only enabled users
* Fix import
2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274
Rename occurences of max_days_allowed to max_continuous allowed ( #14180 )
2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3
Merge pull request #14160 from shreyashah115/patches-fixes-travis
...
Fix patches for Travis
2018-05-22 15:26:49 +05:30
Faris Ansari
7a5221bd95
Add rename_field
2018-05-22 15:26:21 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Ameya Shenoy
826f020862
bumped to version 10.1.34
2018-05-22 09:06:38 +00:00
Prateeksha Singh
b44ea4c8dc
[website] Support Portal ( #14144 )
...
* [init] support portal
* [support-portal] Get started sections and forum activity
* [support-portal] integrate API search for forums, docs, etc
* [support-portal] integrate doctype docs search via global search
* [support-portal] /help page UI
2018-05-22 11:57:21 +05:30
Rohit Waghchaure
7529bbb7b4
[Fix] 'SalesInvoice' object has no attribute 'inter_company_invoice_reference'
2018-05-22 11:55:48 +05:30
Zarrar
93a186aa11
fetch customer_gstin or billing_address_gstin optionally ( #14075 )
2018-05-22 09:16:42 +05:30
rohitwaghchaure
742d3e5549
[Fix] General ledger default_currency issue for member party type ( #14172 )
2018-05-22 09:10:01 +05:30
mnatalia
5f0e8d6e09
Added possibility to translate ( #14173 )
2018-05-22 09:08:50 +05:30
Rohit Waghchaure
8e12a59d9b
[Fix] Patch
2018-05-21 18:52:07 +05:30
rohitwaghchaure
3ec43966da
Merge pull request #14170 from codingCoffee/sal
...
salary structure patch run if active employee
2018-05-21 18:39:10 +05:30
Ameya Shenoy
a7d402132f
salary structure patch run if active employee
2018-05-21 18:38:18 +05:30
Prateeksha Singh
bcbe32ce7c
Merge pull request #14169 from pratu16x7/hotfix
...
[hotfix][charts] update, without new build system
2018-05-21 18:31:39 +05:30
Prateeksha Singh
b434f2687e
[charts] update, without new build system
2018-05-21 18:04:50 +05:30
Manas Solanki
a96421279d
Remove the debugger from the material_request.js
2018-05-21 17:27:01 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
...
[Fix] Patch, default cost center, expense account for the item
2018-05-21 17:18:58 +05:30
Faris Ansari
d2b4ec5044
[fix] Set null values to '0' before changing column type
2018-05-21 16:55:31 +05:30
Zlash65
004bf218a0
remove changes for max_days_allowed patch
2018-05-21 16:52:08 +05:30
Rohit Waghchaure
0ca7ba3247
[Fix] Patch, default cost center, expense account for the item
2018-05-21 16:43:50 +05:30
Faris Ansari
e479057148
Merge pull request #14165 from codingCoffee/min
...
relieving_date wasnt of type datetime
2018-05-21 16:42:41 +05:30
Ameya Shenoy
35984daf72
relieving_date wasnt of type datetime
2018-05-21 16:37:27 +05:30
Manas Solanki
a752eca82c
Merge pull request #14163 from manassolanki/fix-20
...
[fix] don't update the modified of item price while updating item
2018-05-21 16:37:01 +05:30
rohitwaghchaure
22619a8e0c
Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue
...
[Fix] Unknown column 'i.stock_uom' in 'field list'
2018-05-21 16:22:23 +05:30
Rohit Waghchaure
abc6cf0aa5
[Fix] Unknown column 'i.stock_uom' in 'field list'
2018-05-21 16:18:37 +05:30
Manas Solanki
b5d9b38dee
don't update the modified of the item price
2018-05-21 15:40:51 +05:30
Rohit Waghchaure
11e2a9ac90
[Fix] Permission issue while saving leave application
2018-05-21 15:39:38 +05:30
Zlash65
41cb6cc491
patch fix - skip query if no when_then case
2018-05-21 15:10:06 +05:30
Shreya
70f9d07df8
Fix patches for Travis
2018-05-21 15:04:13 +05:30
Faris Ansari
6d2dfac44e
[fix][patch] Shopify ( #14159 )
2018-05-21 14:41:11 +05:30
rohitwaghchaure
1275ea5123
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver
...
Set leave approver in the leave application
2018-05-21 11:58:41 +05:30
Nabin Hait
19ce904030
Report added in Selling module
2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88
customers without any sales transactions
2018-05-21 11:03:02 +05:30
Nabin Hait
1bf2576e0e
Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818
2018-05-21 10:47:40 +05:30
Valmik
bfb8a73377
Append company after ( #14119 )
2018-05-21 10:44:35 +05:30
asbasawaraj
5f6b44e142
Formatted chapter member display ( #14128 )
2018-05-21 10:31:45 +05:30
Shridhar Patil
4c790488ea
job opening designation made mandatory ( #14153 )
2018-05-21 10:30:17 +05:30
Valmik
c28378f448
[fix] get barcode string instead of dict ( #14139 )
...
* [fix] get barcode string instead of dict
* Update pos.py
2018-05-21 10:06:05 +05:30
Rohit Waghchaure
812224e56e
Set leave approver in the leave application
2018-05-20 21:21:33 +05:30
Manas Solanki
f87762887a
fetch defualt supplier from the item table ( #14113 )
2018-05-20 10:58:26 +05:30
Zarrar
42231df33a
[Minor] Supplier Group test fix & default supplier in item fix ( #14150 )
...
* fix supplier group test
* item - default_supplier fix
2018-05-20 10:46:10 +05:30
Zarrar
1f3f18534b
[Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix ( #14149 )
...
* move set_query to setup function
* rectify leave balance report according to deparmtent changes
2018-05-20 10:45:14 +05:30
Gaurav Naik
8f17281011
Initialized dynamic link on Warehouse ( #14135 )
...
* Initialized dynamic link for Warehouse
* Codacy Fixes
2018-05-20 10:39:14 +05:30
rohitwaghchaure
d08ac1fe79
Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11
...
Fixes in material request, asset maintenance
2018-05-18 16:39:48 +05:30
Rohit Waghchaure
73a99441ca
Fixed get_query for default data in item
2018-05-18 16:39:08 +05:30
Rohit Waghchaure
6cdaa6e861
Fixes in material request, asset maintenance
2018-05-18 16:30:14 +05:30
Manas Solanki
d976c04b69
Merge pull request #14134 from manassolanki/fix-salary-patch
...
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:46:35 +05:30
rohitwaghchaure
7d834b946f
Merge pull request #14117 from shreyashah115/fixes
...
Fix patch
2018-05-18 12:45:06 +05:30
Rohit Waghchaure
f61e94e162
Changed condition of finance book in reports
2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c
Added finance book in Asset Depreciation Ledger report, fixed asset issue
2018-05-17 23:29:37 +05:30
Prateeksha Singh
984a7a7e61
[item-query] change order of description terms, name first
2018-05-17 17:29:36 +05:30
Shreya
65dd1f6b4c
Mark attendance only if to_date <= nowdate in Leave Application
2018-05-17 17:13:56 +05:30
Basawaraj
6d334b8135
Added Report : Customers Without Any Sales Transactions
2018-05-17 16:54:03 +05:30
Shreya
362e0a9f6e
Fix patch
2018-05-17 15:43:03 +05:30
Rohit Waghchaure
f2ccde0454
[Fix] Heatmap issue in the project
2018-05-17 15:40:32 +05:30
rohitwaghchaure
8c6b7557db
Merge branch 'develop' into jam_enterprise_emp_benefit
2018-05-17 14:08:06 +05:30
rohitwaghchaure
4444430200
Merge pull request #14108 from ESS-LLP/tax_deduction
...
Variable tax deduction
2018-05-17 13:55:52 +05:30
Valmik Jangla
b52d5b21a1
Add UOM to Item View with Price
2018-05-17 00:09:21 -07:00
Faris Ansari
9e4889d756
[fix] Stock Ledger report item filter
...
- breaks when Item Code contains % symbol
2018-05-17 12:18:28 +05:30
rohitwaghchaure
d2f0d08234
Merge pull request #14105 from Zlash65/fix-dept
...
[Minor] Typo in Employee Transfer
2018-05-17 11:23:52 +05:30
Rohit Waghchaure
992fb34c95
[Fix] Asset adjustment issues
2018-05-17 11:22:59 +05:30
Ranjith
fcfb5a3769
Merge remote-tracking branch 'frappe/develop' into develop
2018-05-17 10:07:23 +05:30
Ranjith
58363e6bbd
get_payroll_period return name, fix hard coded leave period
2018-05-17 10:00:33 +05:30
Zlash65
e3f7e8b101
typo in frappe.throw in employee_transfer
2018-05-17 01:34:35 +05:30
Rohit Waghchaure
585945e65d
Allow to select Asset Received But Not Billed in expense account head
2018-05-17 00:23:27 +05:30
rohitwaghchaure
e8ef69ec33
Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty
...
[Fix] Validation issue
2018-05-16 23:58:09 +05:30
Rohit Waghchaure
2868840e6b
[Fix] Validation issue
2018-05-16 23:57:28 +05:30
Rohit Waghchaure
44fda65b1d
[Fix] Company mandatory issue
2018-05-16 23:31:09 +05:30
Ranjith
31eeff00f7
merge frappe/develop
2018-05-16 23:24:34 +05:30
Rohit Waghchaure
a91765707a
[Fix] TDS issue
2018-05-16 23:13:02 +05:30
Ranjith
b485b1ef80
Salary Slip calc tax, except for flexi benefits
2018-05-16 23:01:40 +05:30
Ranjith
c6b2575a9c
fields in salary detail, copy data from salary component on change
2018-05-16 22:59:21 +05:30
rohitwaghchaure
274f890246
Merge pull request #14099 from rohitwaghchaure/fixed_asset_date
...
Multiple fixes in asset
2018-05-16 22:13:15 +05:30
Rohit Waghchaure
e6acd4c57a
Multiple fixes in asset
2018-05-16 22:12:39 +05:30
rohitwaghchaure
64e81b436e
Merge pull request #14098 from rohitwaghchaure/minor_button_not_showing
...
[Fix] Custom buttons not showing
2018-05-16 21:45:12 +05:30
Rohit Waghchaure
976af6b422
[Fix] Cystom buttons not showing
2018-05-16 21:43:16 +05:30
rohitwaghchaure
660ca9b6c0
Merge pull request #14097 from rohitwaghchaure/purchase_invoice_gl_entry_issue
...
[Fix] Gl Enrty issue
2018-05-16 21:34:44 +05:30
Rohit Waghchaure
1a328d02d2
[Fix] Gl Enrty issue
2018-05-16 21:34:06 +05:30
rohitwaghchaure
513cd189f0
Merge pull request #14095 from rohitwaghchaure/leave_application_issue_v11
...
[Fix] onload set default employee, leave approver, company
2018-05-16 19:57:09 +05:30
Rohit Waghchaure
8e4f676c8c
[Fix] onload set default employee, leave approver, company
2018-05-16 19:55:52 +05:30
Jamsheer
8b86d18f73
Remove unused imports
2018-05-16 19:50:30 +05:30
Jamsheer
3434aabc28
Employee Benefit Claim in Salary Slip
2018-05-16 19:50:30 +05:30
Jamsheer
3abae9c1ba
Employee Benefit Application - whitlist method get_max_benefits
2018-05-16 19:50:30 +05:30
Jamsheer
3e64297a3d
Employee Benefit Application - validate maximun benefit
2018-05-16 19:50:30 +05:30
Jamsheer
3cd0ad4c98
Codacy fixes
2018-05-16 19:50:30 +05:30
Jamsheer
c9287b5b88
Manage grouping of salary component for flexible benefit
2018-05-16 19:50:30 +05:30
Jamsheer
6410022cab
minor fixes
2018-05-16 19:49:39 +05:30
Jamsheer
c678d037e7
Salary slip - throw if no default flexi component
2018-05-16 19:49:39 +05:30
Jamsheer
5f6e274505
Salary slip - default flexi component
2018-05-16 19:49:39 +05:30
Jamsheer
43740a6511
Employee Benefit Application - employee benefit in salary slip
2018-05-16 19:49:39 +05:30
Jamsheer
0bc665c0a5
Salary Copmonent - Default flexible componnent
2018-05-16 19:49:39 +05:30
Jamsheer
15613e46ad
Salary Copmonent - Defualt flexible componnent
2018-05-16 19:48:47 +05:30
Jamsheer
d63c39a514
Payroll Period - get payroll period days
2018-05-16 19:47:18 +05:30
Jamsheer
d66fb842c1
Employee Benefit Application - validate max benefit for employee
2018-05-16 19:47:18 +05:30
Jamsheer
2d6901d5dc
Employee Benefit Application - validate max benefit amount for component
2018-05-16 19:47:18 +05:30
Jamsheer
9cb2fc2766
Employee Benefit Application - calcluate benefit amount
2018-05-16 19:47:18 +05:30
Jamsheer
d48998bae1
Employee Benefit Application - Calculate benefit amounts
2018-05-16 19:47:18 +05:30
Jamsheer
779f8ebbb3
Employee Benefit Application - get max benefit
2018-05-16 19:47:18 +05:30
Jamsheer
41616de9cc
Employee Benefit Application - validate duplicate
2018-05-16 19:47:18 +05:30
Jamsheer
9cd292b187
Employee Benefit Application - filter updated
2018-05-16 19:47:18 +05:30
Jamsheer
4d93d339f7
Employee benefit - filters fro earning component
2018-05-16 19:47:18 +05:30
Ranjith
29e0ed3da1
Exemption Declaration - field total_amount
2018-05-16 19:10:35 +05:30
Manas Solanki
df0ffab16c
Merge pull request #14093 from manassolanki/poc-fixes-1
...
[ui] more fields in the list view of assets
2018-05-16 18:25:37 +05:30
Manas Solanki
f3f1ba37b9
[ui] more fields in the list view of assets
2018-05-16 18:24:35 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
...
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:20:52 +05:30
Manas Solanki
5b34c00ba6
Added the travel request on the config page
2018-05-16 18:09:43 +05:30
Manas Solanki
fa57cdd86d
Merge pull request #14090 from manassolanki/poc-fixes
...
create item default on making of invoice
2018-05-16 17:46:53 +05:30
Manas Solanki
5b93562ce3
create default on making of invoice
2018-05-16 17:44:51 +05:30
rohitwaghchaure
19a2260ce7
Merge pull request #14089 from shreyashah115/fixes
...
[Fix] General Ledger report filters error
2018-05-16 17:41:19 +05:30
Shreya
63d14cfac8
Instead of throwing error, just return
2018-05-16 17:30:58 +05:30
Shreya
df9516e906
Add Finance Book to route options
2018-05-16 17:30:35 +05:30
Manas Solanki
e3bb1d0e3b
more fixes for the item defaults
2018-05-16 17:14:59 +05:30
Manas Solanki
38667ab8da
return defaults according to the company
2018-05-16 17:00:05 +05:30
Rohit Waghchaure
b233e9d643
[Fix] Multiple fixes
2018-05-16 16:41:34 +05:30
Manas Solanki
028e2ad246
Merge pull request #14083 from frappe/codingCoffee-patch-3
...
spaces to tabs
2018-05-16 16:25:25 +05:30
rohitwaghchaure
de796266f2
Merge pull request #14084 from shreyashah115/fixes
...
[minor] Fix error
2018-05-16 16:21:14 +05:30
rohitwaghchaure
9c0a87e804
Merge pull request #14082 from manassolanki/item-fixes
...
[fixes] fix in the item defaults
2018-05-16 16:19:39 +05:30
Manas Solanki
e3910fb2a6
[fixes] fix in the item defaults
2018-05-16 16:16:34 +05:30
Shreya
fda15702bc
Fix error
2018-05-16 16:14:34 +05:30
Ameya Shenoy
6e92958578
spaces to tabs
2018-05-16 16:11:20 +05:30
Rohit Waghchaure
23942701f1
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:41:00 +05:30
Manas Solanki
8e184569a1
Update item.json
2018-05-16 15:11:52 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint
...
[fix] calculate withholding only on invoice
2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd
[fix] calculate withholding only on invoice
2018-05-16 15:00:19 +05:30
Manas Solanki
b81ece9ddf
Merge pull request #14076 from chdecultot/pricing_rule
...
Missing parentheses in price list rate determination
2018-05-16 14:55:32 +05:30
Manas Solanki
4534df36a9
Merge pull request #14078 from manassolanki/pos-fix
...
[enterprise] minor fixes
2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220
[enterprise] minor fixes
...
make the employee name mandatory in the employee onboarding
added the retention bonus amount
2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37
Merge pull request #14077 from manassolanki/travel-request
...
[rename] Photo ID -> Identification Document
2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd
[rename] Photo ID -> Identification Document
2018-05-16 14:12:22 +05:30
Charles-Henri Decultot
2f822476dd
Removal of debugging print
2018-05-16 08:40:16 +00:00
rohitwaghchaure
9ad0ac9557
Merge pull request #14068 from manassolanki/travel-request
...
[feature] added travel request doctype in HR
2018-05-16 14:05:26 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Charles-Henri Decultot
dcfe19d868
Missing parentheses in price list rate determination
2018-05-16 08:34:41 +00:00
Suraj Shetty
fbb6b3da5f
Undo replace of frappe.db.sql with frappe.get_list ( #14074 )
2018-05-16 13:53:31 +05:30
lasalesi
265005d30d
apply sorting for make multiple variant attributes ( #14073 )
2018-05-16 13:10:25 +05:30
Ranjith Kurungadam
cdd4704485
Fixes, fields in Salary Component ( #14071 )
...
* remove duplicate fields
* Salary Component - fields is_tax_applicable, is_payable
* fix intendation
2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514
fix for tests
2018-05-16 13:05:13 +05:30
Manas Solanki
64614374d8
fix codacy
2018-05-16 13:00:56 +05:30
Manas Solanki
bbd8508783
optimize the patch
2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e
changes for the default cost center
2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9
update for default warehouse
2018-05-16 12:44:07 +05:30
Manas Solanki
c760222a6c
add the item defaults in the childtable for multicompany
2018-05-16 12:44:06 +05:30
Rohit Waghchaure
909069fa20
[Fix] 'Supplier' object has no attribute 'on_hold'
2018-05-16 12:25:51 +05:30
Ranjith
4bbf705e58
fix intendation
2018-05-16 12:17:57 +05:30
Ranjith
db120fb0bc
Salary Component - fields is_tax_applicable, is_payable
2018-05-16 12:17:16 +05:30
Rohit Waghchaure
144e9b178a
Added project condition in budget validation
2018-05-16 12:15:57 +05:30
Ranjith
447f0e495a
remove duplicate fields
2018-05-16 12:13:46 +05:30
Rushabh Mehta
b56f3d0689
[fix] syntax errors
2018-05-16 12:03:39 +05:30
Saurabh
d60c0f2292
Refactor shopify ( #13588 )
...
* move shopify settings to ERPNext
* [fix] setup webhook for order and validate webhook request
* validate webhook request
* sync customer and item if not exists while syncing order from shopify
* pull item from shopify and minor fixes
* fix method naming, mechanisim to register and withdraw webhooks, patch
* minor fix
* minor fixes
* [Patch][fix] use remove_from_installed_apps instead of remove app
* log exceptions
* add shopify logging for failed requests
* minor fixes
* fix test case
* codecy fixes
* check shared secret exists
* Test Case fixes
* UX fixes and patch fixes
* Documentation
* fixes
* [fix] dump webhooks request data into doctype
* Provision to resync the order if error occured in sync
* [fix] set default host
2018-05-16 11:33:47 +05:30
tundebabzy
ad08d4ce96
Ability to hold payment for disputed invoices #12048 ( #13298 )
...
* add new fields to Supplier Master:
- on_hold: To signal the Customer is blocked from completing certain transactions
- hold_type: 3 options - All, invoices and payments
* sanitize `on_hold` field input
* show hold status in list view
* add `release_date` field to Supplier Master:
- specifies the date when transaction restraint will be removed
* reset release date if supplier is not on hold
* add validation to stop transactions when Supplier is blocked
* add test cases
* return empty list for outstanding references if supplier is blocked
* block make button:payment if supplier is blocked
* adjust test cases
* PEP 8 clean up
* more tests
* adds new fields to Purchase Invoice:
- release_date: once set, invoice will be on hold until set date
- hold_comment: so user can add comment pertaining to why invoice is on hold
* implement individual purchase invoice on hold logic
* allow user to change release date
* update manual
* final cleanup including more validation and tests
* update supplier manual
* make default for release_date argument todays date
* remove Auto Repeat added by mistake
* add on_hold_field to purchase invoice
* add 'On Hold' or 'Temporarily on Hold' status for purchase invoice in list view
* implement explicit payment hold in purchase invoice
* update manual
* add dialog for saving comment
* bug fix, refactor, clean up
* more test cases
2018-05-16 11:31:41 +05:30
Shreya Shah
4f40b2dca5
[Fix] Sales Person Reports ( #13987 )
...
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.
* Fix codacy
* Modify as per the review comment
2018-05-16 11:22:59 +05:30
Shreya Shah
1906cadd94
[Fix] Currency field in Pricing rule ( #14004 )
...
* some minor changes
* Set query for price list based on currency
* Validate Price list with currency
2018-05-16 11:20:30 +05:30
rohitwaghchaure
557f40465b
Merge pull request #14067 from shreyashah115/fixes
...
[minor] Fix typo
2018-05-16 11:12:11 +05:30
rohitwaghchaure
e48b47fc0c
Production Plan, do not consider the sales orders against which work order has been created ( #13800 )
...
* Production Plan, do not consider the sales orders against which work order has been created
* Added test cases
2018-05-16 11:07:55 +05:30
Shreya
2a1bcf285b
[minor] Fix typo
2018-05-16 11:06:02 +05:30
Manas Solanki
d11b5d398d
[feature] added travel request doctype in HR
2018-05-16 11:02:28 +05:30
rohitwaghchaure
e8358f33a3
Refactor party type ( #13831 )
2018-05-16 11:02:26 +05:30
Doridel Cahanap
e42192bb6c
[WIP] Alternative items ( #13705 )
...
* Alternative Items in BOM
* Alternative Items in Work Order
2018-05-16 10:58:39 +05:30
Jamsheer
0cde6ae3c5
Clinical procedure ( #13540 )
...
* Clinical Procesdure Template and Clinical Procedure Doctype
* Consultation - Create procedure and procedure prescription
* Patient Appointment - Create Procedure and Procedure appointment invoice
* Physician Schedule - Validate slot overlap
* Clinical Procedure Item - batch_no for Clinical Procedure not for Template
* Clinical Procedure - manage item batch_no
* Codacy - fixes
* Yet another Codacy and travic-ci fix
* Codacy - fixes
* Clinical Procedure - Codacy fix
* Permissions updated
* fixed Qty Indicators, Minor fixes
* Patient appointment for procedure prescription
* Doctype Patient Service Unit to Healthcare Service Unit
* Add healthcare service unit tree root
* Healthcare Service Unit - Tree view script
* Healthcare Service Unit - allow appointments check
* Clinical Procedure - remove unused variable
* Clinical Procedure - Get actual quantity from ledger - fix
* Clinical Procedure - apply transilation for message
* Warehouse in Healthcare Service Unit
* Service Unit in Clinical Procedure
* Codacy fix
* Missing semicolon
2018-05-16 10:54:00 +05:30
Rushabh Mehta
bc5c04f438
Update job_offer.js
...
cur_frm is deprecated
2018-05-16 10:51:15 +05:30
rohitwaghchaure
915877553a
Merge pull request #14066 from rohitwaghchaure/minor_asset_fix
...
[Minor] Is fixed asset checkbox not set at server side if duplicate
2018-05-16 10:49:52 +05:30
Rohit Waghchaure
a02640e249
[Minor] Is fixed asset checkbox not set at server side if duplicate
2018-05-16 10:49:12 +05:30
Manas Solanki
1b48fde986
Make the communication from the issue webform ( #14015 )
2018-05-16 10:47:02 +05:30
Frappe PR Bot
b2a64d6344
[Translation] Updated Translations ( #14021 )
2018-05-16 10:46:11 +05:30
Charles-Henri Decultot
471dea0d10
Digest translation improvement ( #14026 )
2018-05-16 10:45:03 +05:30
Suraj Shetty
8501010f12
Replace frappe.db.sql to frappe.get_list to apply permissions ( #14037 )
...
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
2018-05-16 10:44:38 +05:30
Shreya Shah
11f3e8155b
Import nowdate ( #14064 )
2018-05-16 10:42:09 +05:30
Rohit Waghchaure
d3e84a6944
[Fix] Issue, local variable 'leaves_encashed' referenced before assignment
2018-05-16 09:39:44 +05:30
rohitwaghchaure
4671c53eb0
Merge pull request #14056 from ESS-LLP/retention_bonus
...
Retention bonus
2018-05-15 22:27:04 +05:30
rohitwaghchaure
41b457076d
Merge branch 'develop' into enterprise_fix
2018-05-15 22:26:11 +05:30
rohitwaghchaure
043aae7293
Merge pull request #14058 from ESS-LLP/encashment
...
Leave Encashment
2018-05-15 22:24:52 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po
...
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:12:44 +05:30
Ranjith
d43e068a5b
fix Leave Encashment unlink additional component, readonly encashed days
2018-05-15 20:11:30 +05:30
Ranjith
c60c6981a5
Merge remote-tracking branch 'frappe/develop' into encash
2018-05-15 20:00:26 +05:30
Jamsheer
3beeb7255f
Compensatory Leave Request - add link to leave allocation
2018-05-15 19:42:27 +05:30
Jamsheer
ebb68afecb
Leave Allocation - remove link to compensatory leave request
2018-05-15 19:41:25 +05:30
Jamsheer
a46ce11af9
Additional Salary Component - naming and date fix
2018-05-15 19:20:51 +05:30
Ranjith
819c3b1bf6
Retention Bonus - menu, validate
2018-05-15 19:17:31 +05:30
Ranjith
7d394c14ce
Email Alert for Retention Bonus
2018-05-15 19:15:58 +05:30
Manas Solanki
70899f5a60
Update utils.py
2018-05-15 18:52:14 +05:30
anoop
bb629de49b
doctype retention bonus
2018-05-15 18:41:46 +05:30
Zlash65
b8bd6644fd
remove unused module import and error classes
2018-05-15 18:23:41 +05:30
anoop
504855e1a0
on submit: create additional salary component, revert on cancel
2018-05-15 18:11:49 +05:30
rohitwaghchaure
0e47837dab
Merge pull request #14051 from shreyashah115/min-fix
...
[Fix] Supplier Doctype
2018-05-15 17:55:32 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate
...
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Shreya
acc4ceceb7
Add Patch to update existing records
2018-05-15 17:54:10 +05:30
Shreya
da5163da2f
Fix Supplier Doctype
2018-05-15 17:43:50 +05:30
Zlash65
36cb8fb153
removed hard coded account_type from tree's add_child entry
2018-05-15 17:36:01 +05:30
Shreya
3f77852e93
Pass buying or selling as filter parameters
...
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Shreya
b547cdd8fa
Add buying or selling to filters in get_exchange_rate
2018-05-15 16:58:45 +05:30
Ranjith
4c721cbe0f
Leave Encashment - submit, cancel Additional Salary Component
2018-05-15 16:39:20 +05:30
rohitwaghchaure
c0b15cf41a
Merge pull request #14041 from manassolanki/deferred-account
...
Deferred account
2018-05-15 16:31:05 +05:30
rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix
...
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
Rohit Waghchaure
e0b515066e
[Fix] Employee mandatory validation issue
2018-05-15 16:18:05 +05:30
Shreya
8e386167b8
Set Mandatory from client-side
2018-05-15 16:09:53 +05:30
Rohit Waghchaure
e2a7f86636
Navigation added for Employee Separation, Onboarding
2018-05-15 16:04:39 +05:30
Shreya
f636503dc1
[minor] Fix customer doctype
2018-05-15 15:57:27 +05:30
rohitwaghchaure
6bcf48a70e
Merge pull request #14043 from Zlash65/fix-dept
...
[Minor] Remove duplicate from HR config file
2018-05-15 15:28:16 +05:30
rohitwaghchaure
66ece67d41
Merge pull request #14044 from shreyashah115/fix-promotion-doc
...
[Fix] Updation of new values in Employee Property History
2018-05-15 15:27:16 +05:30
Manas Solanki
2f4e5ee2c2
Update hooks.py
2018-05-15 15:25:14 +05:30
Zlash65
44146e0cda
remove duplicates
2018-05-15 15:21:49 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account
2018-05-15 15:20:44 +05:30
Shreya
14069c9395
Fix updation of new values
...
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
2018-05-15 15:19:24 +05:30
Saurabh
ac2692711b
Merge branch 'master' into develop
2018-05-15 14:59:38 +05:30
Saurabh
78a0be666f
bumped to version 10.1.33
2018-05-15 15:29:36 +06:00
Saurabh
29160441bb
[fix] if UOM and Warehouse link is invalid then set blank values
2018-05-15 14:56:18 +05:30
Manas Solanki
183dc731c2
Update employee_onboarding.py
2018-05-15 14:32:37 +05:30
Zlash65
7f5ebbe494
call post company fixture after setting up company
2018-05-15 13:53:40 +05:30
Zlash65
667f846bdb
bifurcate data into pre & post company fixtures
2018-05-15 13:53:40 +05:30
Zlash65
99e72af089
skip abbr, reload doc, disable edit for root department node'
2018-05-15 13:53:40 +05:30
Manas Solanki
0b7f64924d
booking via the schedular
2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60
deferred account in the item and company master
2018-05-15 13:04:01 +05:30
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Saurabh
f8c26bb778
bumped to version 10.1.32
2018-05-15 13:28:15 +06:00
Shreya
0db85067b2
Add For Buying and For Selling checkboxes in Currency Exchange
2018-05-15 12:48:10 +05:30
Rohit Waghchaure
4a126947f5
Code cleaup
2018-05-15 12:43:21 +05:30
anoop
6119b7337c
updated get_leave_balance_on to consider encashed leaves by default.
2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f
13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending
2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b
helper method to get employees assigned salary structure
2018-05-15 12:36:42 +05:30
anoop
161b3b2979
added field Total Leaves Encashed
2018-05-15 12:35:51 +05:30
anoop
067b5574ce
duplicate field is_encash removed, fixed in install fixtures
2018-05-15 12:27:23 +05:30
Saurabh
ccd0617e19
Merge pull request #14017 from netchampfaris/apply-price-list-hotfix
...
[fix] apply price list
2018-05-15 11:25:08 +05:30
Saurabh
12f708d155
Merge pull request #14035 from saurabh6790/v11_patch_fix
...
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 10:49:53 +05:30
Rohit Waghchaure
3f02820384
[Fix] Global name 'Approved' is not defined
2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 08:35:25 +05:30
Shreya
dbb67fb4fd
Clear leave balance on changing leave type
2018-05-14 23:02:09 +05:30
Saurabh
99400bd958
remove duplicate fields occured due to merge conflicts
2018-05-14 22:11:17 +05:30
Rohit Waghchaure
9ba72f7897
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint
2018-05-14 20:57:40 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption
2018-05-14 20:47:35 +05:30
Saurabh
4ae089d6a1
Provision to deduct TDS on Advance
2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18
tds fixed for PI
2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0
Supplier Tax Withholding Config
2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group
2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding
...
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0
minor changes and fixed the conflicts
2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period
...
Accounting Period
2018-05-14 20:33:09 +05:30
rohitwaghchaure
3282191aae
Merge pull request #14025 from shreyashah115/html-table
...
Show pending leaves as an HTML table in leave application
2018-05-14 20:32:26 +05:30
Manas Solanki
b698846c30
[feature] added the employee onboarding and separation doctype
2018-05-14 20:27:00 +05:30
rohitwaghchaure
48199842aa
Merge pull request #13750 from rohitwaghchaure/asset_purchase_link
...
Asset linked to purchase and serial no
2018-05-14 20:24:37 +05:30
rohitwaghchaure
8d626e6888
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp
...
Additional Salary Component
2018-05-14 20:24:10 +05:30
Shreya
4bd5583e11
Make Available Leave HTML Table
2018-05-14 19:32:59 +05:30
Jamsheer
75c53e5022
Fix - missing semicolon
2018-05-14 19:17:16 +05:30
Rohit Waghchaure
d644e6da16
Code cleanup
2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4
Patch to move asset fields to Asset Finance Book table
2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976
Patch to make location
2018-05-14 19:08:56 +05:30
Rohit Waghchaure
16bc853f6a
Reschedule for future depreciations and booked difference amount in accumulated depreciation account
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
aa7b434270
Create asset adjustment doctype, post gl entry for the asset
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
0ea6fe4397
Added new doctype Finance Book Detail in asset, asset category
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a
Commonify get_asset_category_account and get_fixed_asset_account method
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191
Added default asset accounts in COA, CWIP account in asset category
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba
Treeview for Location
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418
Asset accounting
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4
Added account fields in the company, fixes in auto creation of the asset from PR
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188
Asset linked to purchase receipt and serial no
2018-05-14 19:07:39 +05:30
Jamsheer
47039e801e
Remove unused import
2018-05-14 18:54:10 +05:30
Jamsheer
70a998d428
Remove unused variable
2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number
...
Cost center number
2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd
Attendance Request - half day check is enabled
2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop
...
Bank Statement Import
2018-05-14 18:27:53 +05:30
Gaurav Naik
21b2df41ac
[Fix] len() instead of .length
2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a
[WIP] Accounting Period Test cases
2018-05-14 18:11:09 +05:30
Jamsheer
ead858b4de
Compensatory Leave Request - fix
2018-05-14 18:08:31 +05:30
Gaurav Naik
52571a80da
Bootstrap documents for closing (js)
2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5
Bootstrap documents for closing
2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c
[Fix] Indentation for accounting_period overlap
2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592
Compensatory Leave Request - leave allocation create and update - fix
2018-05-14 17:56:22 +05:30
Zlash65
06fd51bf69
patch fix for instructor
2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b
create and update department records patch
2018-05-14 16:07:28 +05:30
Zlash65
03ad0f2f4a
set query for department based on company
2018-05-14 16:07:28 +05:30
Zlash65
9a8f5bd6c7
set department name with company abbr
2018-05-14 16:07:27 +05:30
Zlash65
39668609ce
improv department tree
2018-05-14 16:07:27 +05:30
Zlash65
366ca92ba7
move default_currency on top
2018-05-14 16:07:27 +05:30
Zlash65
513f13df27
patch fix
2018-05-14 16:05:16 +05:30
Faris Ansari
404f39d373
[fix] apply price list
...
in_apply_price_list flag remains true if server exception occurs
2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe
codacy fix
2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4
[Enhancement] Monthly Attendance Report ( #13970 )
...
* Update Attendance on Approval of Leave
* Separate out leaves on the basis of its type
* Remove commented code
* Make attendance records if not found
* Fix Codacy
* Replace bad code in attendance.py
2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5
[fix] honour the shopping cart setting when showing the stock and non-stock item ( #13988 )
2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc
button triggers not working in tasks table ( #13973 )
2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10
[fix] Incorrect currency conversion in Itemised Tax Breakup ( #14006 )
2018-05-14 14:19:31 +05:30
Suraj Shetty
f93cc57e8a
Ignore user permission for 'variant Of' in Item ( #14013 )
...
- Since mostly variant of is null it gets filtered out if
user permission is applied.
And since variant is a link to item itself there is no need to check
user permission for it as user permission gets applied on Item anyways.
2018-05-14 14:07:20 +05:30
Shreya Shah
ba6cb8ae4b
[Healthcare] Fix UI ( #14011 )
...
* Fix UI
* Fix Calendar View
2018-05-14 14:06:31 +05:30
Faris Ansari
a7387b45ec
[fix] Get items from BOM error in python 3 ( #14012 )
2018-05-14 14:05:52 +05:30
Jamsheer
236be22648
Payroll entry - get employee fix
2018-05-14 13:32:50 +05:30
Rohit Waghchaure
ebe1ebead2
[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'
2018-05-14 13:21:45 +05:30
Jamsheer
d0b0c87f40
get additional salary component in salary slip
2018-05-14 12:16:46 +05:30
Jamsheer
08b60a1a62
New Doctype - Additional Salary Component
2018-05-14 12:16:46 +05:30
Jamsheer
a5028c8e54
Salary Structure - filter updated, Salary Component - fields re-arranged
2018-05-14 12:16:45 +05:30
Jamsheer
b5c5c471b4
Formula on Salary Component Master
2018-05-14 12:16:45 +05:30
Jamsheer
4bd7cdb018
Salary Structure Assignment - filters applied
2018-05-14 12:13:47 +05:30
Manas Solanki
a27d29b349
enable deferred revenue in the item master
2018-05-14 12:07:14 +05:30
Zlash65
f665189ab3
tree based changes
2018-05-14 11:45:38 +05:30
Zlash65
93d6b555d7
added fixtures for supplier-group, changed analytics report accordingly
2018-05-14 11:45:38 +05:30
Zlash65
c88ce364ce
treeview implemented for supplier group
2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635
patch to reload_doc and rename field
2018-05-14 11:45:38 +05:30
Zlash65
2e0809801d
controller and other changes
2018-05-14 11:45:38 +05:30
Zlash65
890707854d
config/utility level changes
2018-05-14 11:45:38 +05:30
Zlash65
0a50554417
doctype level changes
2018-05-14 11:45:38 +05:30
Zlash65
4437a5ed18
json level changes
2018-05-14 11:45:38 +05:30
Zlash65
3387a35fed
rename supplier-type to supplier-group
2018-05-14 11:42:30 +05:30
rohitwaghchaure
a8c49f26d3
Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue
...
Fixed spelling
2018-05-14 00:44:29 +05:30
Rohit Waghchaure
eee830eafe
Fixed spelling
2018-05-13 16:17:18 +05:30
Saurabh
c1acbdfb69
[fix] overlapping dates
2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610
add get leave period method
2018-05-12 17:45:39 +05:30
Faris Ansari
f2b3307136
Remove escaped customer string ( #13986 )
...
- no need to escape strings that are passed to the values parameter of the sql method
- this query was failing for inputs like "D'Arby" which have quotes
2018-05-11 21:07:27 +05:30
Jamsheer
46b23f8e6e
Salary Structure Refactor, Formula on Salary Component Master ( #13967 )
...
* Salary structure refactor
* Salary Structure Assignment - filters applied
* Formula on Salary Component Master
* Salary Structure - filter updated, Salary Component - fields re-arranged
* Payroll Entry - get_employee_list fix
* Salary Structure Assignment - Validate Duplicate Assignment
* Salary Structure Assignment - filters for salary structure
2018-05-11 21:05:24 +05:30
Pawan Mehta
c53e35368d
Shift Management - Documentation and Tests ( #13997 )
...
* [fix] #13996
* codacy fix
2018-05-11 21:03:50 +05:30
Gaurav Naik
9502476c67
Accounting Period overlap validation
2018-05-11 07:53:12 +05:30
Gaurav Naik
6c92cff226
Accounting Period autoname
2018-05-11 07:52:50 +05:30
Ranjith
ded636097e
Tax Declaration, Proof Submission tests
2018-05-10 15:42:04 +05:30
Ranjith
5a8e6427f4
Tax Declaration, Proof Submission, validation
2018-05-10 15:06:49 +05:30
Ranjith
85d2d571c5
update hr menu, field subcategory in child table
2018-05-10 15:04:32 +05:30
Ranjith
e1c556b7e0
Doctype Employee Tax Exemption Sub Category
2018-05-10 15:02:57 +05:30
Ranjith
96121c598e
Tax Declaration, Proof Submission, field company
2018-05-10 15:02:00 +05:30
Kanchan Chauhan
d560da950d
[Minor] Show only active driver in Delivery Trip
2018-05-10 10:42:56 +05:30
Jamsheer
9032c9d91d
Documentation - updated
2018-05-09 19:19:34 +05:30
Nabin Hait
9d215c2d9b
Set operations on production order while making from Material Request
2018-05-09 18:32:54 +05:30
Nabin Hait
b9fed2aa38
Removed company from Finance Book and related changes
2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f
Added finance book filtering logic to financial_statements.py
2018-05-09 15:03:40 +05:30
Gaurav Naik
8cbbdfdf30
Added finance book filter to financial_statements.js
2018-05-09 15:03:05 +05:30
Gaurav Naik
40559d5f5c
Added finance book filter logic to ReceivablePayable
2018-05-09 15:02:55 +05:30
Gaurav Naik
70ac2d2c51
Added finance book filter in accounts_receivable.js
2018-05-09 15:02:23 +05:30
Gaurav Naik
cddda8ac5f
Added finance book filter in accounts_payable.js
2018-05-09 15:02:11 +05:30
Gaurav Naik
57856b475c
Added finance book filter logic in general_ledger.py
2018-05-09 14:58:15 +05:30
Gaurav Naik
460d96f16d
Added finance book filter to General Ledger
2018-05-09 14:57:36 +05:30
Gaurav Naik
a6d3cbfbc5
Added finance book field to GL Entry doctype
2018-05-09 14:56:52 +05:30
Gaurav Naik
30f9e0f547
Set finance book in make_gl_entries
2018-05-09 14:56:39 +05:30
Gaurav Naik
a948726ddd
Added Finance Book doctype
2018-05-09 14:53:51 +05:30
Manas Solanki
fbe548e4be
[Enterprise] Bank Guarantee Enhancements ( #13960 )
2018-05-09 14:49:53 +05:30
Vishal Dhayagude
3cf0d51e65
[fix] Compounding error in task weight ( #13958 )
...
* [fix] Compounding error in task weight
* [minor] minor changes
* [fix] Requested Changes added
2018-05-09 10:42:39 +05:30
Jamsheer
63a8f83076
Leaves - Documentation
2018-05-08 18:45:41 +05:30
Nabin Hait
3881e98000
Staffing plan for group company
2018-05-08 18:36:14 +05:30
Jamsheer
4573e6609f
Leave Type - remove field is_parental_leave
2018-05-08 18:33:49 +05:30
Nabin Hait
b2800eeb2a
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-05-08 16:34:35 +05:30
Nabin Hait
9036b9ee85
Merge branch 'master' into develop
2018-05-08 16:31:42 +05:30
Nabin Hait
0ff31f0ebf
bumped to version 10.1.31
2018-05-08 17:01:38 +06:00
Nabin Hait
247bd94824
Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing
2018-05-08 16:30:18 +05:30
Zarrar
f2df7f32fa
update subscription to auto_repeat across dashboards ( #13956 )
2018-05-08 16:06:36 +05:30
Nabin Hait
3e47fbb2f0
assign salary structure custom button
2018-05-08 16:05:04 +05:30
Saurabh
40349f4b00
[fix] add stock entry link on Material Request Dashboard ( #13950 )
2018-05-08 15:23:51 +05:30
Saurabh
b36517158b
[fix] cheque print template coordinates ( #13959 )
2018-05-08 15:23:29 +05:30
Jamsheer
bec950428c
HR Utils - Trailing whitespace
2018-05-08 12:50:14 +05:30
Manas Solanki
cf26b2ca1c
[minor] fix for the student report card
2018-05-08 12:39:02 +05:30
Jamsheer
fe882bc68a
Leave Application - Test - Leave allowed, applicable after, maximum continuos days
2018-05-08 12:36:51 +05:30
Jamsheer
3153734e7e
Leave Application - validate applicable after for leave type
2018-05-08 12:36:51 +05:30
Jamsheer
62a93533fc
Leave Policy - Validate Annual alloction for leave type
2018-05-08 12:36:51 +05:30
Jamsheer
d7bfa2303f
Leave allocation - validate max leave allocation days for a leave type
2018-05-08 12:36:51 +05:30
Jamsheer
b42f3d41ab
Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type
2018-05-08 12:36:51 +05:30
Jamsheer
b408b158dd
Leave allocation - link to leave period and compensatory leave request
2018-05-08 12:35:40 +05:30
Jamsheer
8c4386f016
Leave Type - new field is_compensatory
2018-05-08 12:35:40 +05:30
Jamsheer
c7aaf0ba67
Leave Period - Validate and Create Leave Allocation
2018-05-08 12:35:40 +05:30
Jamsheer
0e2cc5574d
HR Util methods
2018-05-08 12:35:40 +05:30
Jamsheer
9d857579af
Attendance Request - validate and create attendance
2018-05-08 12:35:40 +05:30
Jamsheer
b41baa228c
Attendance Request - link to company
2018-05-08 12:35:40 +05:30
Jamsheer
a9c82b6464
Attendance - link to attendance request
2018-05-08 12:35:40 +05:30
Shreya Shah
204c3bc37e
Remove Production Planning Tool docs ( #13946 )
...
* Remove Production Planning Tool docs
* Remove Offer Letter Occurrences
* Rename Employee Loan Occurrences
2018-05-07 18:21:03 +05:30
bghayad
1184a7300a
Adding Payments View for Fees ( #13939 )
...
* Adding View Payments For Fees
* Adding View Payments For Fees
* Adding Payments View For Fees
2018-05-07 18:20:37 +05:30
Nabin Hait
b7613af73c
Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint
2018-05-07 16:13:33 +05:30
Nabin Hait
330fae8652
minor fixes
2018-05-07 16:11:35 +05:30
Shreya Shah
7bd83f3d8e
Rename occurrences for Production Order to Work Order ( #13944 )
2018-05-07 15:27:21 +05:30
Ranjith
c36578e8d3
Job Opening - display vacancies only on staffing plan
2018-05-07 14:19:40 +05:30
Ranjith
f220e89d9f
Job Opening - get planned opening, validate vacancies by Staffing Plan
2018-05-07 13:58:54 +05:30
Ranjith
e4cda0380a
Staffing Plan - validations, get employee count on designation change, calc estimated cost
2018-05-07 13:54:49 +05:30
Nabin Hait
fdc67a577f
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
2018-05-07 13:12:16 +05:30
Ranjith Kurungadam
95c5c055f8
Optional leave ( #13931 )
...
* Optional Holiday - move holiday list from leave type to leave period
* Optional Leave - validate on Leave Application
* test Optional Leaves
2018-05-07 12:43:08 +05:30
Nabin Hait
d5220c0ff4
minor fix
2018-05-07 12:22:57 +05:30
Nabin Hait
01f5df72cc
Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer
2018-05-07 11:55:52 +05:30
Rah Yuliantoro
b3882cacd9
update coa and company default ( #13937 )
...
* Update standard_chart_of_accounts.py
adding account for employee advances
* Update standard_chart_of_accounts_with_account_number.py
adding account for employee advances
* Update company.py
adding accounts for default fields in company doctypes
* Update company.py
Missing some default accounts for fields in company doctype
2018-05-07 11:39:35 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation ( #13932 )
...
* Added account data on child table
* Added Journal Entry button and functionality
* Add docs
* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Ranjith
86b81e99e5
codacy fixes
2018-05-05 16:49:51 +05:30
Nabin Hait
338e1b6e91
Merge branch 'master' into develop
2018-05-05 14:33:35 +05:30
Nabin Hait
ea199f9cd9
bumped to version 10.1.30
2018-05-05 15:03:33 +06:00
Ranjith
9505ea93cf
codacy fixes
2018-05-05 14:32:42 +05:30
Nabin Hait
161f35a687
Update sales_invoice.py
2018-05-05 14:32:31 +05:30
Ranjith
715780b78b
Employee Promotion, Transfer - documentation
2018-05-05 13:51:34 +05:30
Ranjith
a68a108234
Employee Promotion, Transfer - test submit before date, create new employee
2018-05-05 13:43:15 +05:30
Ranjith
56b58017d1
Employee Promotion, Transfer - validate, submit, cancel workflow
2018-05-05 13:41:48 +05:30
Ranjith
fddfffd3e6
Employee Promotion, Transfer - modal to add details to child table
2018-05-05 13:27:26 +05:30
Ranjith
ea60225760
Employee Promotion, Transfer - update child table, added fields
2018-05-05 13:25:46 +05:30
Nabin Hait
4bbe5fbefc
Fixes related to auto repeat
2018-05-05 12:32:59 +05:30
Nabin Hait
abd0325acd
Fixed merge conflict
2018-05-05 12:19:14 +05:30
Nabin Hait
723fe8fb1b
bumped to version 10.1.29
2018-05-05 12:43:29 +06:00
mnaim-cloude8
c3b4464df8
Remove unnecessary field.
2018-05-04 22:06:35 +08:00
Rohit Waghchaure
3e0a937cb8
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-05-04 19:20:20 +05:30
Shreya Shah
88aa3ec275
[Report] HSN-wise-summary of outward supplies ( #13803 )
...
* hsn wise summary report
* renamed
* added total amount column
* moved total amount column
2018-05-04 18:33:14 +05:30
Jamsheer
bd63f0056a
Patient medical record updation and deletion fixes ( #13891 )
2018-05-04 18:13:28 +05:30
Pawan Mehta
5e7b2eb338
Add Calendar View to Attendance doctype ( #13919 )
...
* [fix] #13917
* codacy fixes
* remove company
* add status
* fix date issue
* code optimizations
* change sql
2018-05-04 18:12:35 +05:30
creador30
dae8f1b353
Search for item_code ( #13912 )
...
Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.
2018-05-04 18:12:03 +05:30
Shreya Shah
55daa9cd24
fix taxable amount for same items ( #13927 )
2018-05-04 18:01:23 +05:30
Shreya Shah
764b9bfeba
cint for Item field has_variants ( #13916 )
...
* convert none type value to int
* Fix typo
2018-05-04 17:58:36 +05:30
Suraj Shetty
dcc90e3312
Add fix to support changes in user permission ( #13923 )
...
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
Shreya Shah
eec0209e3c
Fetch mandatory reqd from server side ( #13924 )
2018-05-04 17:51:10 +05:30
Nabin Hait
62b985d405
[fix] Update show_in_website in template
2018-05-04 12:21:15 +05:30
KanchanChauhan
f4feedace4
Allow changing of Address after Submit ( #13747 )
2018-05-03 19:08:54 +05:30
Suraj Shetty
57fbebb630
Update user permission doc ( #13695 )
2018-05-03 19:07:07 +05:30
Suraj Shetty
00cced12a0
Success Action ( #13666 )
...
* success action config for sales invoice
* remove "Notification Control" doctype and its usage
* add default success action after_install or while migration (patch)
* rename for_doctype to ref_doctype
* case change
* minor fix
* Remove unnecessary code
* Replace message with translatable message
* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Shreya Shah
ecb9315ea1
Inter Company Journal Entry ( #13683 )
...
* rebase with enterprise_sprint
* Add Inter company account checkbox in Account master
* Add Inter Company Journal Entry Voucher Type in Journal Entry
* Make Inter Company Journal Entry button
* Dialog to select company for Inter Company Journal Entry
* Map relevant fields in the Inter Company Journal Entry and reference links
* Rebase
* Add Documentation
2018-05-03 19:04:36 +05:30
Zarrar
6f3594b2e4
[Enhance] GL Entry - ability to multiselect party ( #13769 )
...
* change dynamic link to multiselect field and improv
* print based fix
* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
rohitwaghchaure
1aa3a11546
On auto-creation of new Fiscal Year, send Email notification to the account users ( #13789 )
2018-05-03 18:59:26 +05:30
Saurabh
ed393d1025
[fix] consider user permissions in leave application calendar view ( #13902 )
...
* [fix] consider user permissions in leave application calendar view
* add hr settings to control leave calendar view
* add patch
2018-05-03 18:52:25 +05:30
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings ( #13897 )
2018-05-03 16:24:52 +05:30
rohitwaghchaure
125c0caf12
Added brand in item price doctype, item prices report ( #13900 )
2018-05-03 16:23:57 +05:30
Shreya Shah
c4323cb6ba
remove set query ( #13908 )
2018-05-03 16:19:56 +05:30
Shreya Shah
c10820e93e
fix error ( #13907 )
2018-05-03 16:09:34 +05:30
mnaim-cloude8
e21ad0e641
Add printing details section for Job Offer. To fetch correct letter head for company selected at Job Offer.
2018-05-03 15:43:25 +08:00
Prateeksha Singh
a7c6ff8f3e
Merge pull request #13837 from shreyashah115/serial-batch-linking
...
Serial No. and Batch No. linking
2018-05-02 15:11:19 +05:30
Saurabh
e85a43c1c6
Merge branch 'master' into develop
2018-05-02 14:48:10 +05:30
Saurabh
4f6b68fef2
bumped to version 10.1.28
2018-05-02 15:18:09 +06:00
Shreya
27e4e244b6
fix codacy
2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d
changes as per the reviews
2018-05-02 14:34:14 +05:30
Shreya
b47302dd52
unlink reference on cancellation of any invoice
2018-05-02 14:34:14 +05:30
Shreya
c804f424ab
update reference fields on both invoices
2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd
validations to check price list and currencies
2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7
mapping of relevant fields
2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03
validations before routing to invoice
2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e
Inter company invoice reference link field
2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe
make inter company invoice button on Invoices
2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e
Allowed To Transact With child table in Customer & Supplier
2018-05-02 14:34:14 +05:30
Shreya
59512aaaaa
Internal Supplier check in Supplier
2018-05-02 14:34:14 +05:30
Shreya
7946ca216e
Internal Customer check in Customer
2018-05-02 14:34:14 +05:30
Nabin Hait
d2861df939
Renamed Health Insurance to Employee Health Insurance
2018-05-02 14:34:14 +05:30
Nabin Hait
43274de5df
Removed employee table from Salary Structure and added employee name in all forms
2018-05-02 14:33:37 +05:30
Nabin Hait
e9ad03e23e
Documents order in hr page
2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd
Added links in HR module
2018-05-02 14:31:03 +05:30
Shreya Shah
24e8f31be1
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-05-02 14:29:44 +05:30
Nabin Hait
2f77ccce1b
New doctypes for HR and Accounting ( #13652 )
2018-05-02 14:27:19 +05:30
Umair Sayed
cd00f8f458
Updated domain pages (only content) and added few new help pages. ( #13835 )
...
* domain pages update
* domain docs
* domain pages
* help and domain pages
2018-05-02 12:21:35 +05:30
rohitwaghchaure
0065624fe0
Tax amount showing under wrong tax header in the report ( #13843 )
2018-05-02 12:20:55 +05:30
Faris Ansari
eae2ddac69
validate_conversion_rate in taxes_and_totals ( #13880 )
2018-05-02 12:19:30 +05:30
Zarrar
284de4c15a
updated modified time - reload issue in patch ( #13881 )
2018-05-02 12:14:59 +05:30
Shreya
0456ced796
remove unused code
2018-05-01 19:00:06 +05:30
Shreya
eb54331d5f
removed color field from sales order and work order
2018-05-01 18:56:06 +05:30
Shreya
fd47b92138
renamed color field
2018-05-01 18:55:17 +05:30
Shreya
9c688f6dbf
color field for calendar in leave application
2018-05-01 18:55:17 +05:30
Shreya
a7b2fc9250
color field for calendar in sales order and work order
2018-05-01 18:55:17 +05:30
Shreya
62907472f3
color field for calendar in task
2018-05-01 18:54:20 +05:30
Shreya
d71c0c1720
color field for calendar in holiday list
2018-05-01 18:54:20 +05:30
Shreya
4c8a08effb
color field for calendar in course schedule
2018-05-01 18:54:20 +05:30
Faris Ansari
5df63e36d4
Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix
2018-05-01 10:52:15 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Zarrar
b0a46f397a
display customer's name while printing receivable report ( #13830 )
2018-04-30 19:40:18 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Prateeksha Singh
9b2078feab
[fix] setup_website, fixes #11143
2018-04-30 18:11:20 +05:30
Nabin Hait
d39386bd55
Renamed some salary related fields
2018-04-30 16:21:37 +05:30
Shreya
96e45902fd
codacy
2018-04-30 15:54:34 +05:30
Faris Ansari
30304e68ff
[fix] Current stock qty calculation in case of different UOM
2018-04-30 15:44:49 +05:30
Shreya
14bd43d5eb
minor changes
2018-04-30 15:30:42 +05:30
Shreya Shah
05ad2802c6
Travis test fixes for leave application ( #13790 )
...
* test fix
* expense claim test fix
* fix payroll entry test case
2018-04-30 11:14:56 +05:30
Zarrar
6bc500bffa
[Minor] Validate dates in Salary Structure ( #13807 )
...
* validate date
* fix date trigger issue
2018-04-30 11:14:09 +05:30
Adam Dawoodjee
3cd4fce710
Typo fix ( #13809 )
2018-04-30 11:13:18 +05:30
Faris Ansari
8be895091e
Set is_pos to 0 in Opening Invoice Tool ( #13810 )
2018-04-30 11:13:06 +05:30
Gaurav Naik
c925a38f79
Ignore mandatory for default warehouses ( #13812 )
2018-04-27 15:31:11 +05:30
Manas Solanki
0536baacc2
Remove the duplicate description
2018-04-27 12:46:56 +05:30
Faris Ansari
9f739fe87d
Handle item_wise_tax_detail invalid value while item renaming ( #13778 )
2018-04-26 18:48:01 +05:30
Kenneth Sequeira
b01f998b49
Update tracking-project-profitability-using-cost-center.md ( #13792 )
...
Fixed typo in the title.
2018-04-26 18:40:14 +05:30
AravindPranera
805f09a3fe
Accounts receivable aging based on supplier due date ( #13801 )
2018-04-26 18:02:37 +05:30
deepak-mnt
b712d1905d
Override after_rename method to fetch cost center number on changing from title
2018-04-26 17:04:06 +05:30
deepak-mnt
b379998961
Added Update Cost Center Number button and it's functionality
2018-04-26 17:00:08 +05:30
Nabin Hait
2f82bce387
minor fix
2018-04-26 16:32:17 +05:30
rohitwaghchaure
7e8a7ac6ee
Provision to select opening stock in stock reconciliation ( #13802 )
2018-04-26 16:30:35 +05:30
Shreya
a20157af17
on item, warehouse and batch triggers, fetch serial nos based on batch
2018-04-26 14:39:21 +05:30
Shreya
7461d28ae0
add batch when creating serial nos
2018-04-26 14:39:21 +05:30
Shreya
4a2fe605b3
batch no field in serial no doctype
2018-04-26 14:39:21 +05:30
Nabin Hait
25ccd1acbb
minor fix in asset
2018-04-26 12:16:38 +05:30
Nabin Hait
dc75be8b6c
Show company column in order in consolidated financial statement
2018-04-26 12:16:38 +05:30
Siddhi Sawant
a16c8d0a2b
Establishment / Effective Date field in the Company master ( #13723 )
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d
[Fix] general ledger group by validation
2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c
[Fix] Profit and loss statment
2018-04-26 12:16:38 +05:30
Nabin Hait
074928cf6c
Company field added in department
2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520
Fixed merge conflict
2018-04-26 12:16:18 +05:30
Nabin Hait
ee09408dcc
Minor fixes
2018-04-26 12:16:18 +05:30
Pawan Mehta
2215d4c593
Shift Management ( #13667 )
...
* [fix] #13634
* review_changes
* rename function
* rename function
2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de
Consolidated financial statement ( #13678 )
...
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106
Group by party in general ledger report ( #13649 )
...
* Group wise Ledger for Customer and Supplier
* commonify group by fields
2018-04-26 12:16:18 +05:30
Pawan Mehta
0a17f8d51b
remove shift schedule tool ( #13658 )
2018-04-26 12:16:18 +05:30
Nabin Hait
8076d6ddc8
Renamed Health Insurance to Employee Health Insurance
2018-04-26 12:16:17 +05:30
Nabin Hait
265426a5a6
Minor fixes
2018-04-26 12:14:02 +05:30
Nabin Hait
81706fdb46
Update rename_field_max_days_allowed.py
2018-04-26 12:14:02 +05:30
Nabin Hait
551844881b
Removed employee table from Salary Structure and added employee name in all forms
2018-04-26 12:14:01 +05:30
Nabin Hait
fcdca7f2a0
Documents order in hr page
2018-04-26 12:13:46 +05:30
Nabin Hait
f914bd374d
Added links in HR module
2018-04-26 12:13:24 +05:30
Shreya Shah
b15ef8450f
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-04-26 12:13:06 +05:30
Pawan Mehta
8f14cb590c
Add grade to employee master ( #13654 )
2018-04-26 12:12:45 +05:30
Nabin Hait
1c13e70d13
New doctypes for HR and Accounting ( #13652 )
2018-04-26 12:12:29 +05:30
Shreya Shah
ec38044fe2
New DocTypes for HR Module ( #13650 )
...
* New DocType Employee Incentive
* New DocType Shift Type
* New DocType Shift Assignment
* New DocType Shift Assignment Tool
* New DocType Shift Request
* New DocType Salary Structure Assignment
* Added Permissions
* New DocType Employee Lifecycle Process
* New DocType Employee Lifecycle Activity Type
* New DocType Employee Lifecycle Activity
* New DocType Employee Lifecycle Process Template
* New DocType Employee Lifecycle Process Template Detail
* Permissions and Auto Name
* New DocType Staffing Plan
* New DocType Staffing Plan Detail
* Added fields in Job Opening
* New DocType Employee Transfer
* New DocType Employee Promotion
* [minor]
2018-04-26 12:10:13 +05:30
Rushabh Mehta
369afce43c
[patch] ignore validations while creating custom fields for gst via patch
2018-04-26 10:10:03 +05:30
Kanchan Chauhan
7826dd1aeb
Typo Fix in Work Order
2018-04-25 13:48:47 +05:30
Prateeksha Singh
c23230faea
Merge pull request #13786 from pratu16x7/hotfix
...
[fix] featured product thumbnail
2018-04-25 13:04:19 +05:30
Prateeksha Singh
6855b87f76
[fix] featured product thumbnail
2018-04-25 13:03:11 +05:30
Saurabh
1d5bbe1081
Merge branch 'master' into develop
2018-04-25 12:46:50 +05:30
Saurabh
47f6e32920
bumped to version 10.1.27
2018-04-25 13:16:48 +06:00
Rohit Waghchaure
bf416cfbf8
[Fix] POS Patch
2018-04-25 12:32:22 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
Saurabh
132dac9712
bumped to version 10.1.26
2018-04-25 12:01:48 +06:00
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2
Minor fix in reloading email template
2018-04-24 17:51:13 +05:30
Shridhar Patil
02c93a3d05
[bug] Leave application ui issues fixed ( #13740 )
...
* validate to_date in leave application
if to_date is less than from_date show message to user
reset to_date value to ''
* var declaration and semicolon missed
* Updated popup message
2018-04-24 14:45:11 +05:30
Kenneth Sequeira
70330e8379
fixed user permission video link ( #13774 )
2018-04-24 14:12:41 +05:30
Shreya Shah
3cf35f2496
fix syntax ( #13773 )
2018-04-24 12:20:21 +05:30
Shreya Shah
4dc453d131
Loan Management for the Members (Non Profit Module) ( #13149 )
...
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account
* Patch added
* Dynamic link fields 'applicant' and 'applicant_type'
* Member link visible only if domain non profit is active
* Modified loan_dashboard
* Make Repayment Entry button
* Common file loan_common.js for loan and loan_application
* repayment schedule rows selection in dialog
* validation if repayment amount > total paid amount
* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month
* fetch nowdate if disbursement date not found
* Rebased with develop
* updated non-profit module page
* updated patch for renamed fields
* dialog to select repayment entries
* hidden field to store reschedule paid status
* update paid check in loan on journal entry updation
* calculate total paid
* updated docs
* codacy fix
2018-04-24 12:19:36 +05:30
bghayad
1c3830c53f
Student Account Ledger Button ( #13591 )
...
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
2018-04-24 12:12:11 +05:30
Kenneth Sequeira
5becde7a45
embedded social login keys set up videos ( #13659 )
2018-04-24 12:11:29 +05:30
hiousi
38de994788
do not copy template description to variant if not in allow fields ( #13726 )
2018-04-24 12:10:45 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Saurabh
ad4ede0e23
bumped to version 10.1.25
2018-04-24 12:39:38 +06:00
Shreya Shah
6db3d84cc0
remove unused code ( #13765 )
2018-04-24 12:07:40 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Rohit Waghchaure
31edddace6
[Fix] Tax not changes when user change the POS profile in the sales invoice
2018-04-24 11:43:31 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Saurabh
8f29159fb7
Merge branch 'hotfix'
2018-04-24 11:12:07 +05:30
Saurabh
d9f1b539dc
bumped to version 10.1.24
2018-04-24 11:42:07 +06:00
Deepak kumar
022ac50160
Reverse Journal Entry ( #13637 )
...
* [Fix] #13605
* fixes codacy
* minor changes
* Added naming series for reverse journal entry
* added reference_type and reference_name
2018-04-24 10:52:28 +05:30
Manas Solanki
276a92539d
Update move_leave_approvers_from_employee.py
2018-04-23 14:55:19 +05:30
Prateeksha Singh
c0ec3c3f7b
[fix] cal view start end date field discrepancies
2018-04-23 13:32:59 +05:30
Zarrar
68a7ee22f2
order_by for gantt error fix ( #13752 )
2018-04-23 13:22:03 +05:30
Shreya Shah
828f5ab29e
Patch fixes ( #13754 )
...
* reload doc
* remove unused code
2018-04-23 13:21:35 +05:30
Manas Solanki
60aa1170d5
Merge pull request #13762 from manassolanki/fix-patient-appointment
...
fixed the gantt view of patient appointment
2018-04-23 12:39:28 +05:30
Manas Solanki
9630aa3d7f
fixed the gantt view of patient appointment
2018-04-23 12:37:11 +05:30
Kenneth Sequeira
d4991cc49f
Assets Docs Update ( #13749 )
...
* asset depreciation auto booking image added
* commit 3
2018-04-23 11:35:24 +05:30
tundebabzy
dbdf462e56
fix conflict
2018-04-22 23:49:26 +01:00
tundebabzy
f65ee888c0
spelling: canceled --> cancelled
2018-04-22 23:43:08 +01:00
Zlash65
fa5ecb066e
typo fix in leaderboard
2018-04-22 12:11:01 +05:30
Nabin Hait
c36524ec54
Update chart_of_accounts.py
2018-04-20 11:00:20 +05:30
Shreya Shah
44e719d64c
[Enhancement] Leave Application and Expense Claim ( #13645 )
...
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
2018-04-19 20:58:52 -08:00
Saurabh
cba3570cf6
Merge pull request #13734 from rohitwaghchaure/pos_special_character_item_issue
...
[Fix] Item with special character not adding in the POS cart
2018-04-19 15:58:35 +05:30
Saurabh
5b7503c074
Merge pull request #13691 from saurabh6790/supp_180417_1
...
[hotfix] multiple fixes
2018-04-19 15:57:35 +05:30
Rohit Waghchaure
8441dd9184
[Fix] Item with special character not adding in the POS cart
2018-04-19 12:55:06 +05:30
Julian Robbins
78869f1e77
Update manual-feedback-request.md ( #13709 )
...
Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'
2018-04-18 03:12:30 -08:00
Zarrar
59f7b8c4a1
issue routing to report ( #13710 )
2018-04-18 02:56:02 -08:00
Saurabh
2476a8aab9
a[fix] check content before making in condition
2018-04-17 20:45:06 +05:30
Saurabh
46ffbb74ff
fix cheque print measurements
2018-04-17 20:44:37 +05:30
tundebabzy
280c7a410a
code review: make use of db_insert and change Auto Repeat to auto_repeat
2018-04-17 11:32:17 +01:00
tundebabzy
20721942ad
code review: use delete from to delete records
2018-04-17 11:31:23 +01:00
tundebabzy
5988da9a31
code review: revert changes
2018-04-17 11:30:35 +01:00
Saurabh
492aff2a8b
[fix] check if academic_year exists ( #13665 )
2018-04-17 14:21:40 +05:30
tundebabzy
caae0f4dcc
Merge branch 'develop' into new-subscription
2018-04-17 09:34:04 +01:00
matmyers
742da8cfce
removed duplicate keys ( #13675 )
2018-04-17 12:20:57 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
5b866db6bc
bumped to version 10.1.23
2018-04-17 12:30:19 +06:00
Saurabh
9fbb8192e1
[fix] do not escape % while using clause ( #13677 )
2018-04-17 11:56:46 +05:30
Faris Ansari
d7a3b78fdf
[py3] Cast dict_keys to list ( #13663 )
2018-04-16 14:39:37 +05:30
Saurabh
ea1408f2e0
[fix] enqueue salary slip print email after completing accounting entries ( #13633 )
2018-04-15 21:38:49 -08:00
Saurabh
f2a941b1a4
[fix] check if supplier value exists ( #13616 )
2018-04-15 21:37:14 -08:00
Sanjay Kumar
bc83daf0fa
#13478 : Default Accounts in Item from Item Group ( #13635 )
...
* remove external app reference and update get_warehouse_list
* resolve #13478 : Default Accounts in Item from Item Group
2018-04-15 21:36:37 -08:00
Saurabh
ea49deb315
Merge branch 'master' into develop
2018-04-15 12:54:50 +05:30
Saurabh
c3d43e672b
bumped to version 10.1.22
2018-04-15 13:24:49 +06:00
Sathisha Poojary
16ce8ed7d5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-14 12:05:11 +05:30
Faris Ansari
ed34a442a8
Obey currency filter in financial statement prints #pdd ( #13648 )
2018-04-13 21:34:00 -08:00
Shreya Shah
a952e40b56
fix tab ( #13651 )
2018-04-13 19:33:40 +05:30
Shreya Shah
6bf4e5b73b
Department Tree ( #13567 )
...
* Department Tree
* print hide fields
* create 'All Departments' as parent on setup
* patch to set lft rgt
* fix translatable string
2018-04-13 15:09:26 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
Nabin Hait
d6aadef395
Merge branch 'hotfix'
2018-04-13 14:38:23 +05:30
Nabin Hait
11c899bc1f
bumped to version 10.1.21
2018-04-13 15:08:22 +06:00
Nabin Hait
00efeb26f4
Email Account field added in Issue
2018-04-13 14:30:26 +05:30
Nabin Hait
4566d1f60c
Email Account field added in Issue
2018-04-13 13:26:06 +05:30
Faris Ansari
f8dd4c2d7b
[fix] Financial report column values during print ( #13627 )
2018-04-12 17:28:40 +05:30
Siddhi Sawant
a0bbc0846b
GST purchase invoice with tax breakup details ( #13561 )
2018-04-12 14:50:48 +05:30
rohitwaghchaure
1129ac711e
[Fix] Patch ( #13610 )
2018-04-12 14:48:23 +05:30
rohitwaghchaure
2ea593bdd8
[Fix] POS Profile data not set in the sales invoice ( #13568 )
2018-04-12 13:37:08 +05:30
Frappe PR Bot
59a2a653d0
[Translation] Updated Translations ( #13570 )
2018-04-12 13:36:55 +05:30
Ahmed Madi
02fd6f56d6
Update leave_application.py ( #13575 )
...
Make get_holidays function white listed
2018-04-12 13:31:50 +05:30
Pawan Mehta
c0727633e7
[fix] #13589 ( #13590 )
2018-04-12 13:31:08 +05:30
rohitwaghchaure
098b444f6f
[minor] Toggle required opportunity item table based on with items field ( #13584 )
2018-04-12 13:26:50 +05:30
rohitwaghchaure
e72bde5159
Removed expired items from the list of POS items ( #13582 )
2018-04-12 13:26:11 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items ( #13606 )
2018-04-12 13:25:03 +05:30
Ameya Shenoy
848d34f1a8
Minor fixes ( #13609 )
...
- typo renamed make_prod_order_test_record to make_wo_order_test_record,
whereever it was missed
2018-04-12 13:21:16 +05:30
rohitwaghchaure
2c111b7b14
Minor fix ( #13600 )
2018-04-11 02:20:06 -08:00
Sanjay Kumar
6225b769a6
remove external app reference and update get_warehouse_list ( #13597 )
2018-04-11 02:19:36 -08:00
Rushabh Mehta
fb5d678b0c
[minor] cache refactor and workflow docs ( #13598 )
2018-04-11 00:38:19 -08:00
Doridel Cahanap
ad76f9ad70
[Enhancement] Work Order Material Consumption ( #13384 )
...
* Work Order Material Consumption
* Test cases and other minor fixes
* Test cases fixes
* Travis Fixes
* Work Order Material Consumption Request Changes
* Update work_order.js
2018-04-09 10:31:28 +05:30
Sathisha Poojary
99e3ca0f67
Create a new doctype for bank so that we can suport other
...
bank statements dynamically.
2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
Nabin Hait
1ff9e0432a
bumped to version 10.1.20
2018-04-06 15:36:09 +06:00
rohitwaghchaure
c0f149a3be
[Fix] Delivery notification for delivery trip ( #13543 )
2018-04-06 14:26:26 +05:30
Dominik Ottenbreit
82eac06505
Add Order Confirmation to PO ( #13421 )
2018-04-06 11:51:18 +05:30
rohitwaghchaure
2ae6cfda5f
[Fix] Item variant details report ( #13545 )
2018-04-06 11:49:04 +05:30
KanchanChauhan
4691af6348
Get Payment Schedule from Sales Order to Sales Invoice ( #13497 )
2018-04-06 11:23:19 +05:30
Kenneth Sequeira
2d79e46fbd
updated images for print format ( #13498 )
2018-04-06 11:22:37 +05:30
Jamsheer
86fd8cbf68
Healthcare dashboard ( #13533 )
...
* Healthcare Dashboards
* Lab Test and Template - field marked in_filter = True
2018-04-06 10:29:23 +05:30
rohitwaghchaure
22d9f0a4aa
[Fix] Bin not deleted on delete of an item ( #13539 )
2018-04-06 10:29:07 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form ( #13509 )
2018-04-06 10:28:08 +05:30
Zarrar
92109b01fd
translate while creating items from user progress ( #13530 )
2018-04-06 10:27:55 +05:30
Manas Solanki
b2f9af71d2
Update setup.py
2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e
Group email fields together and add IFSC Code ( #13535 )
...
* [fix] #13534
* change field order cell no
2018-04-05 14:54:51 +05:30
Prateeksha Singh
59147c0368
Merge pull request #13538 from pratu16x7/hub-fixes
...
[fix] company listing context
2018-04-05 14:53:11 +05:30
Prateeksha Singh
4b7dcfad54
[hub] add hub settings access regardless
2018-04-05 14:50:42 +05:30
Prateeksha Singh
420c79041e
[fix] company listing context
2018-04-05 14:44:16 +05:30
Suraj Shetty
97d84eb509
remove apply user permission ( #13505 )
2018-04-05 12:10:46 +05:30
Zarrar
0e3b000e81
sql syntax fix ( #13529 )
2018-04-05 10:34:30 +05:30
Rohit Waghchaure
920a3ff0b8
[Fix] POS freeze when rate button pushed
2018-04-04 18:06:19 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling
...
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Nabin Hait
adddb15380
bumped to version 10.1.19
2018-04-04 11:56:19 +06:00
Nabin Hait
5fd79f7f77
Update stock_ledger.py
2018-04-04 11:20:16 +05:30
Vishal Dhayagude
2505c74d64
Place of Supply set on save Delivery Note if Customer Address Present ( #13492 )
2018-04-04 11:05:21 +05:30
frappe-pr-bot
6623cdc244
[Translation] Updated Translations
2018-04-03 15:49:16 +02:00
Vinayak Jethe
df83148d7c
Woocommerce Integration ( #13217 )
...
* WIP for WooCommerce Integration
* WIP for WooComm Integration
* WIP WooComm
* Added Woocommerce Settings
* Woocommerce Settings
Enable Sync Makes fields mandatory
* Woocommerce whitelisted endpoints
* [Clean Up] Woocommerce Settings
* Verify Webhook Data
* Fix Verify Webhook
* WIP WooComm
* WIP and working few modules
* Customer creating partially
* Customer creation successful
* Refactored Customer code
* WIP Address
* Fixed address and customer bug. Now working fine
* WIP for products. Creation of items successful
* Handling json for product
* Products creating and updating properly
* Custom checkbox for required doctypes
* Product feature fully completed
* WIP orders
* Sales order working properly
* Orders mapping successfully
* New version Customer Working Properly
* Items creation properly
* Working on sales order
* Orders comming successfully
* Bug fixes
* Fixed date format for delivery date
* Code Cleanup
* Woo setting page modified
* Fixed minor bug
* Fixes
* Minimum Viable Product
* Cleanup
* Removed duplicate file from erpnext config
* Added more default changes to woo settings
* Fixes as per required
* Fixes
* Bug fix
* few changes and fix
* Fixing
* Fixes with test
* Added Test for Woocommerce - Emulates request
* Fix woocommerce test
* fix woocommerce test
* verify_request: py3 ready
* Codacy fixes
* WooCommerce Integration Docs
* Codacy changes
* Codacy fixes
* User set tax account
* Fixes for account
* Fix for warehouse issue
* Docs updated
* Codacy fix
* Updated Docs
* Minor changes
* Tested added for repeat order and cleanup
* Minor change
* docs and gifs renamed according to convention
* Doc updated
2018-04-03 11:17:03 +05:30
Prateeksha Singh
b60a52b194
Hub Market ( #13325 )
...
* [hub] enable hub with OAuth token from user's client ID
* [hub] settings schema for adding users
* [hub] image view style listing
* [hub] broken image link fallback
* [wip]
* [hub] bootstrap timeline
* [hub] setup quick view
* [hub] reformat ratings, add companies autocomplete filter
* [hub] common listing frames
* [hub] setup sort selector
* [hub] timeline
* [hub] customize list header
* [hub] genuine form fieldtypes
* [hub] review products
* [hub] suggest missing categories remotely
* [hub] Wishlist; header and title templates
* [hub] link wishlist, remove company migration
* [hub] calculate ratings
2018-04-03 10:44:13 +05:30
Suraj Shetty
c5effbf009
Data export tool doc ( #13419 )
...
* data export tool docs
* change doc gif path
2018-04-03 10:43:08 +05:30
Frappe PR Bot
dc0a92c8de
updated translations ( #13485 )
2018-04-02 23:46:54 +05:30
Rushabh Mehta
d5f9ebd008
[optimize] item queries ( #13480 )
2018-04-02 23:37:33 +05:30
Rohit Waghchaure
395d61b998
[Fix] Travis
2018-04-02 15:11:47 +05:30
rohitwaghchaure
eedc0ac681
[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com ( #13467 )
2018-04-02 12:49:38 +05:30
Britlog
220864b4f7
Allow decimal quantities in pos ( #13471 )
2018-04-02 10:55:04 +05:30
Charles-Henri Decultot
6860036b01
Agriculture module corrections ( #13438 )
...
* Agriculture module corrections
* Update ternary_plot.js
2018-04-02 10:51:53 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30
Shreya Shah
d021e45301
exclude current doc while validating ( #13450 )
2018-04-02 10:43:19 +05:30
Zarrar
e9ca5e81d2
hide add_child for root node ( #13444 )
2018-04-02 10:40:39 +05:30
Shreya Shah
5d71609f0b
Timer fixes ( #13443 )
...
* alert for exceeded time only when dialog is open
* fetch row having an activity without from_time
* fixes if timesheet created from work order
* reset timer limit exceeded
2018-04-02 10:32:39 +05:30
Manas Solanki
a7f5589564
fix for the update button in the sales invoice ( #13435 )
2018-04-02 10:32:00 +05:30
Nabin Hait
edd320e338
Optimisation of warehouse_account_map ( #13454 )
2018-04-02 10:30:17 +05:30
Kenneth Sequeira
84fe32d05c
removed pos-view article since it is deprecated ( #13456 )
2018-04-02 10:26:43 +05:30
Shreya Shah
a8df73c263
typo in landed cost voucher doc ( #13472 )
2018-04-02 10:16:27 +05:30
rohitwaghchaure
40a5a3063c
[Fix] Allow zero valuation rate if previous sle has zero valuation rate ( #13432 )
2018-04-02 10:14:49 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements ( #13423 )
2018-04-02 10:14:32 +05:30
Shreya Shah
d17c24f969
set query in payment account ( #13446 )
2018-04-02 10:13:48 +05:30
Manas Solanki
0289ad285f
fix the route filters and payment account ( #13447 )
2018-04-02 10:13:22 +05:30
Shreya Shah
562227db8f
db escape as single quote in address causes error ( #13451 )
2018-04-02 10:12:37 +05:30
Achilles Rasquinha
9c1cac80fe
Merge pull request #13445 from shreyashah115/typo-in-payroll
...
Typo in Payroll Entry
2018-04-01 10:29:16 +05:30
Sathisha Poojary
1de5669574
Rename Bank Statement Settings appropriately and allow auto
...
populating some settings for supported banks
2018-03-31 10:30:34 +05:30
Sathisha Poojary
f698a1bcbe
Minor typo with major error
2018-03-31 01:19:52 +05:30
Sathisha Poojary
f069e1c83c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-03-31 00:55:56 +05:30
Rohit Waghchaure
5e0cabc538
[Fix] POS not opening
2018-03-30 14:29:18 +05:30
Gaurav Naik
03016e5000
Exploded view for BOM Stock Report ( #12506 )
...
* Multilevel BOM Stock Report prototype
* Rechristened multilevel to exploded view
* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation
* Used BOM Explosion item in query for exploded view
* Removed trailing whitespaces for Codacy compliance
2018-03-30 13:03:19 +05:30
Shreya
9240eaa0a6
typo for accrual journal entry
2018-03-30 12:19:11 +05:30
Manas Solanki
618940b5c9
Merge pull request #13433 from manassolanki/fix-pe
...
minor fix for the program enrollment tool
2018-03-29 16:37:54 +05:30
Manas Solanki
ccf2b7b08b
minor fix for the program enrollment tool
2018-03-29 16:36:59 +05:30
Nabin Hait
ff2e4c898a
Fixed merge conflict
2018-03-29 13:57:39 +05:30
Nabin Hait
cae2723920
bumped to version 10.1.18
2018-03-29 14:23:00 +06:00
rohitwaghchaure
badc855400
[Fix] BOM validation issue for scrap item ( #13429 )
2018-03-29 13:48:38 +05:30
Manas Solanki
a4502c4f6b
Merge pull request #13430 from codingCoffee/child_doc_perm_fix
...
Permisssion fixes for child table
2018-03-29 13:27:08 +05:30
Manas Solanki
1f02c62339
Merge pull request #13431 from manassolanki/fix-22
...
fix the item varint details
2018-03-29 13:26:14 +05:30
Manas Solanki
ef770b593a
fix the item varint details
2018-03-29 13:25:00 +05:30
Ameya Shenoy
c5d222253a
Permisssion fixes for child table
...
Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3
frappe.client.[get_list, get, get_value] when called on child table
needs parent as an argument or it throws an error by default
2018-03-29 13:16:08 +05:30
Manas Solanki
94769d81a8
Update get_item_details.py
2018-03-29 11:15:05 +05:30
rohitwaghchaure
edd63a178f
Merge pull request #13418 from rohitwaghchaure/pdf_and_alignment_issue
...
[Fix] Alignment and date issue in PDC report
2018-03-28 17:17:37 +05:30
Rohit Waghchaure
ace68cd283
[Fix] Alignment and date issue in PDC report
2018-03-28 15:53:29 +05:30
Nabin Hait
4d9e104284
Merge branch 'master' into develop
2018-03-28 15:51:18 +05:30
Nabin Hait
0794816527
bumped to version 10.1.17
2018-03-28 16:21:16 +06:00
Nabin Hait
7041a45294
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 15:50:14 +05:30
Dominik Ottenbreit
561e2a534b
Add Project Standard Filters ( #13417 )
2018-03-28 14:25:51 +05:30
rohitwaghchaure
68ba4fd697
[Fix] Multi-batch selection issue in POS ( #13407 )
2018-03-28 12:33:15 +05:30
rohitwaghchaure
a3c3dec5a2
[enhance] Item Alternative ( #13121 )
...
* [enhance] Item Alternative
* Added two way provision in item alternative
* Test Cases
* documentation
2018-03-28 11:51:44 +05:30
Nabin Hait
a6746407e5
Fixed waiting qty in item dashboard data
2018-03-28 11:16:12 +05:30
Nabin Hait
6c35822a35
Merge branch 'master' into develop
2018-03-28 10:40:14 +05:30
Nabin Hait
63e40b52af
bumped to version 10.1.16
2018-03-28 11:10:12 +06:00
Nabin Hait
2e203e53c6
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 10:38:55 +05:30
Sathisha Poojary
148c4f9724
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-03-28 00:27:32 +05:30
Sathisha Poojary
0512eec54b
Some minor changes addressing manual doctype renaming issues
2018-03-28 00:22:59 +05:30
Shreya Shah
c0201877dd
fixed column fieldnames for translations ( #13406 )
2018-03-27 18:45:42 +05:30
Nabin Hait
9db28ef90d
Minor fix in patch
2018-03-27 16:00:57 +05:30
Zarrar
7f4cd3f5ea
Update Docs for Work Order ( #13403 )
...
* update docs
* rename files, update pngs
* update pngs for timesheet, leftover changes
2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Nabin Hait
00279f27f3
bumped to version 10.1.15
2018-03-27 14:52:27 +06:00
Nabin Hait
f620dae8ca
Null issue fixed in gstr reports
2018-03-27 14:15:36 +05:30
Nabin Hait
9d7fe1f7cd
Indicator fix for stock entry item table
2018-03-27 13:30:11 +05:30
Prateeksha Singh
ffaed1ce2e
Merge pull request #13404 from pratu16x7/variants
...
Enumerate numeric values in variant dialog
2018-03-27 12:18:13 +05:30
Prateeksha Singh
be368fe94b
Enumerate numeric values in variant dialog
2018-03-27 12:17:15 +05:30
Shreya Shah
ba4f32be5c
set default warehouse instead of product bundle's warehouse for packed_items in delivery note ( #13398 )
2018-03-27 11:32:10 +05:30
rohitwaghchaure
85f63a3866
[Fix] Showing to bill even if per deliverd in sales order is 99.9996 ( #13392 )
2018-03-27 11:31:44 +05:30
Shreya Shah
149f7ee875
[Fix] General Ledger Report ( #13374 )
...
* error fix if party_type = student or shareholder
* clear party filter when party_type changes to avoid error throw
* dict with values of party_name in utils.js
* fetch party_name from erpnext.utils.get_party_name
* Update general_ledger.py
2018-03-27 11:29:25 +05:30
rohitwaghchaure
c9a1eb1081
[Fix] Not able to delete row in modal table ( #13377 )
2018-03-27 11:26:43 +05:30
rohitwaghchaure
2e560cb25d
[Fix] Same serial no returned two times ( #13378 )
2018-03-27 11:24:50 +05:30
Nabin Hait
651b612909
Fixed logic for reserved qty for subcontract and production and written a patch ( #13396 )
...
* Fixed logic for reserved qty for subcontract and production and written a patch
* repost reserved qty for filtered bins
2018-03-27 11:24:20 +05:30
Manas Solanki
398eac3f4c
message in the program enrollment tool ( #13393 )
2018-03-27 11:21:47 +05:30
Frappe PR Bot
7db805a031
[Translation] Updated Translations ( #13394 )
2018-03-27 11:21:08 +05:30
Shreya Shah
f3025f1596
operation time in grid view ( #13400 )
2018-03-27 10:34:05 +05:30
Prateeksha Singh
e45f957ad9
Merge pull request #13363 from shreyashah115/timer
...
Timer in Timesheets!
2018-03-27 10:28:50 +05:30
Sathisha Poojary
0b5fea1491
Initial changes to manually migrating bank statemet work from
...
app to erpnext
2018-03-26 01:12:18 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Nabin Hait
3fdda7a9b7
bumped to version 10.1.14
2018-03-23 16:35:06 +06:00
Shreya Shah
9bcadf8126
Tax Id in some reports and print formats ( #13373 )
...
* tax-id in sales and purchase registers
* tax-id in general ledger print_format
* tax-id in accounts payable
* tax-id in accounts receivable
2018-03-23 15:04:37 +05:30
rohitwaghchaure
492de67d7b
Added consumed material cost in project ( #13365 )
2018-03-23 15:02:04 +05:30
Nabin Hait
80a9f523d5
Minor fix AR/AP summary report
2018-03-23 13:02:27 +05:30
Shreya
8bb0f05451
added task field
2018-03-23 11:46:45 +05:30
Shreya
7619cd2e14
updated docs for timesheet
2018-03-23 11:41:56 +05:30
Shreya
822ba21f38
codacy fix
2018-03-23 11:41:56 +05:30
Shreya
559011404a
removed timesheet.html, appended it as a helper function
2018-03-23 11:41:56 +05:30
Shreya
5bf24be704
minor fixes
2018-03-23 11:41:56 +05:30
Shreya
8f06266838
all fields editable
2018-03-23 11:41:55 +05:30
Shreya
5714260af4
replaced status with completed checkbox
2018-03-23 11:41:55 +05:30
Shreya
09937f3753
modified timer start button
2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2
thanks to faris for the css
2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c
moved timer.js to public/js
2018-03-23 11:41:55 +05:30
Shreya
05e516efc4
Start the timer on the basis of time diff between now_time and timestamp
2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db
New activity dialog removed, read only fields editable if no rows found, add a new row on timer start
2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9
new field actual_end_time to record completed time
2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8
CSS modifications
2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec
new dialog to create activity
2018-03-23 11:41:55 +05:30
Shreya
643528a3b8
added status field
2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104
removed stop button and added a complete button
2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b
read only fields project and hours
2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627
alert sound when timer exceeds the given hours
2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d
timer in timesheet
2018-03-23 11:41:55 +05:30
Faris Ansari
35397a1033
Salary Register ( #13367 )
...
- convert date range to from_date and to_date
2018-03-22 15:26:45 +05:30
Nabin Hait
e3f0412570
Pass doc while autonaming item
2018-03-22 12:13:21 +05:30
rohitwaghchaure
6a2d073fe1
Merge pull request #13353 from PawanMeh/fixes_13352
...
Add total qty to offline POS
2018-03-22 11:36:32 +05:30
rohitwaghchaure
23fa8893a8
[Fix] Division by zero issue ( #13362 )
2018-03-22 11:16:00 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports ( #13344 )
2018-03-22 11:12:02 +05:30
Manas Solanki
0f6c35d63f
Update update_project_in_sle.py
2018-03-21 18:24:45 +05:30
Faris Ansari
4fc74333bd
Fix Icons for Expense Claim and Timesheet ( #13359 )
2018-03-21 17:54:09 +05:30
Kenneth Sequeira
6a92cdc358
Update cost-center.md ( #13354 )
...
Fixed link to missing image for cost centre.
2018-03-21 17:52:52 +05:30
rohitwaghchaure
93779c21a7
[Fix] Project not set in the stock ledger entry ( #13357 )
2018-03-21 17:52:41 +05:30
Manas Solanki
e010ddf65f
Student Report Card ( #13346 )
...
* finalise the assessment report
* minor fixes for button
* fix the travis and codacy
2018-03-21 17:50:42 +05:30
Zarrar
969c8aaf52
[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group ( #13198 )
...
* customer code can be assigned based on customer group
* improvise customer group selection
* requested changes made
2018-03-21 11:17:49 +05:30
Manas Solanki
c711445b91
add the student as party type ( #13348 )
2018-03-21 10:12:27 +05:30
rohitwaghchaure
2b88ac948e
[Fix] Special character issue ( #13350 )
2018-03-21 10:04:47 +05:30
pawan
53a4d2c430
[fix] #13352
2018-03-21 09:19:36 +05:30
Faris Ansari
ce08aabc84
Add Kanban Board button in project ( #13345 )
2018-03-20 19:03:32 +05:30
Zlash65
0859018c48
unindented code
2018-03-20 16:29:27 +05:30
Siddhi Sawant
c672530210
[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats ( #13316 )
...
* Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats
* Update gst_pos_invoice.json
Updated its 'disabled' property.
* Update pos_invoice.json
Updated its 'disabled' property.
* Shows change amount only if it exists
* Updated disable property of print formats
2018-03-20 14:31:14 +05:30
Britlog
e3a9b9fe49
[Website] Price in items list and sales uom management ( #13335 )
...
* Price in items list and sales uom management
* Price in product search page
* Display website stock in sales uom
* Add set_product_info_for_website to avoid duplicate code
* Add price uom in item list and page
* Update product.py
2018-03-20 14:28:44 +05:30
Zarrar
9a01baac1d
explicitely provide order_by ( #13338 )
2018-03-20 14:08:44 +05:30
Achilles Rasquinha
0575b3e1c3
fixed inconsistent tab error ( #13339 )
2018-03-20 14:07:25 +05:30
Charles-Henri Decultot
d0ac69704f
Chained log report doc ( #13314 )
2018-03-20 13:12:28 +05:30
Zarrar
c5b061834b
doctype dropdown rectify, validate series is set ( #13305 )
2018-03-20 13:06:18 +05:30
Zarrar
13ddc7e188
[ Enhance ] Production to Work Order ( #12902 )
...
* remove occurrences of Production Order
* rename from report and jsons
* Change Production Order to Work Order
* change occurences of production order from other files
* resolve minor conflict issues and reports
* patch added
* codacy fix
* updated patches, leftover changes
* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
Doridel Cahanap
c893268dea
Add Health Insurance Doctype and link to Employee ( #13257 )
2018-03-20 12:37:02 +05:30
Deepak kumar
656ff36c76
[Feature] Advance Account Balance in Employee Advance ( #13263 )
...
* added due advance amount field to show due amount
* fixes codacy
* made whitelisted method
* Update employee_advance.js
2018-03-20 12:35:02 +05:30
Nabin Hait
d97c5a04b2
minor fix in item naming
2018-03-20 12:31:05 +05:30
Tom Price
cd525299ee
[Feature] Add default duration and color to appointment type ( #13296 )
...
* Add default duration and color to appointment type
When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment.
`Appointment Type.color` is used in the calendar display.
* Remove accidental fixed date from git
* Update modified timestamp to ensure migrations.
Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0
2018-03-20 12:08:44 +05:30
Mark Walker
f572522f25
Copy source project into Purchase Order Item ( #13321 )
2018-03-20 12:06:04 +05:30
renzodemie
417dfed214
Daily Reminder ( #12938 )
...
* for email sending
* test commit for new branch
* Removed test changes
* test commit renzo
* Email sending
* Project Uo
* Project Update
* "My first commit"
* "My second commit"
* "My second commit"
* Holiday is included
* delete idea
* first pull
* first pull
* "My third commit"
* Delete idea
* delete again
* "Edit Time"
* "Edit Time"
* Naming series and bug fixing
* "Edit current day and time"
* "Proper naming series, hidden time and date"
* Project and Project Update dashboard
* dashboard
* Remove hooks for PR
* Remove hooks for PR
* Remove hooks for PR
* Deleted project_time.py
* Corrected indention
* Hook back to original
* Delete project_time.py
* "Modified time"
* Fix indention
* Sample
* FRM
* FRM
* Time fix
* Hooks original state
* "Modified time"
* Added permission to Project User
* Added function/method to be called in order to create project update for the specific project
* Naming series
* this is not included
* Fix minor bug
* Indent again
* "Reformat Code"
* "Check Indent"
* Indent again and again
* semi colon
* "Check Again Indent"
* "Check again Indent"
* "Check again Indent"
* ind
* "Check again Indent"
* "Check again Indent"
* Generate Project update
With button in email
* []
* "Erro Summary"
* "Add syntax for the communcation"
* "add summary code"
* "Modified Summary code"
* "Modified Summary code"
* "Fix update ID and set localhost"
* Fix time and date error in project_update
Fix naming series problem in project_update
* included "not updated" in project update
* Bug in Number of Drafts
* "add notes in summary"
* Correct code
* With error
* Removed the method
* Minor fixes
* Correction for daily summary
2018-03-20 11:58:15 +05:30
Nabin Hait
8a8966ce9b
minor fix
2018-03-20 11:19:57 +05:30
Achilles Rasquinha
ecc4fdd3ef
Check Set Sales Target Item exists in User Slides
2018-03-19 22:21:45 +05:30
Achilles Rasquinha
d0786b45c3
fix issue
2018-03-19 22:17:37 +05:30
Achilles Rasquinha
60da37b502
Merge pull request #13329 from shreyashah115/travis-fix
...
[Fix] Travis
2018-03-19 19:10:21 +05:30
Saurabh
2777fd4332
[fix] validate minimum transaction amount in Payment Request for selected payment gateway ( #13328 )
2018-03-19 18:29:01 +05:30
Shreya
9602bf4ba3
patch fix
2018-03-19 18:17:54 +05:30
Shreya
5042dd32da
undefined args error
2018-03-19 17:45:39 +05:30
Shreya
4d347b1ca0
travis fix
2018-03-19 17:31:19 +05:30
Achilles Rasquinha
034834d671
Merge pull request #13326 from shreyashah115/fix-travis
...
[Fix] Travis
2018-03-19 17:00:34 +05:30
Shreya
f7b39438d2
travis fix
2018-03-19 14:19:55 +05:30
Achilles Rasquinha
3099ea67a1
Merge pull request #13303 from achillesrasquinha/py3
...
unordered types None vs int
2018-03-19 11:54:24 +05:30
Achilles Rasquinha
3d85951c1f
Merge pull request #13304 from achillesrasquinha/hotfix-hub
...
[HOTFIX] Hub Domain Change
2018-03-19 11:54:13 +05:30
Achilles Rasquinha
1e95323679
Fixed dict_keys concatenation
2018-03-18 10:08:43 +05:30
Manas Solanki
7b91042ae6
Merge pull request #13310 from manassolanki/student-report-card
...
addition of student report card generation tool
2018-03-16 02:00:07 +05:30
Manas Solanki
633a39144d
addition of student report card generation tool
2018-03-16 01:57:45 +05:30
Achilles Rasquinha
94b41ea4f6
removed debugging
2018-03-15 12:53:22 +05:30
Achilles Rasquinha
d8f7de9946
fixed patch for hub
2018-03-15 12:48:32 +05:30
Nabin Hait
c8cd4ba6f7
Merge branch 'master' into develop
2018-03-15 12:38:43 +05:30
Nabin Hait
60200eaf0d
bumped to version 10.1.13
2018-03-15 13:08:41 +06:00
Nabin Hait
1e4cfb4bf5
Fixes in setting po nos manually in sales invoice
2018-03-15 12:27:24 +05:30
Nabin Hait
70abac0061
Get territory from sales invoice
2018-03-15 12:19:16 +05:30
Achilles Rasquinha
a4a62d5ea1
unordered types None vs int
2018-03-15 12:18:37 +05:30
Nabin Hait
bb5caf8fad
Merge branch 'master' into develop
2018-03-14 13:33:38 +05:30
Nabin Hait
6c09297bcd
bumped to version 10.1.12
2018-03-14 14:03:36 +06:00
Nabin Hait
363cedde76
Fixed minor issue
2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5
Merge branch 'master' into develop
2018-03-13 18:13:44 +05:30
Nabin Hait
c8c733bc54
bumped to version 10.1.11
2018-03-13 18:43:42 +06:00
Shreya Shah
7acc8cb747
fix else condition ( #13295 )
2018-03-13 18:12:19 +05:30
Nabin Hait
e01dcc170c
Merge branch 'master' into develop
2018-03-13 17:11:52 +05:30
Nabin Hait
56882033bf
bumped to version 10.1.10
2018-03-13 17:41:49 +06:00
Nabin Hait
74c817e7f9
Update update_reserved_qty_for_purchase_order.py
2018-03-13 17:10:14 +05:30
Nabin Hait
3707242770
Fixed merge conflict
2018-03-13 16:15:41 +05:30
Nabin Hait
baac05955b
bumped to version 10.1.9
2018-03-13 16:44:02 +06:00
Nabin Hait
89346967da
Reverted #13259 ( #13291 )
2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry ( #13288 )
2018-03-13 15:57:34 +05:30
Ameya Shenoy
95763bc233
Purchase Order fixes ( #13287 )
...
- Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied'
- Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.
2018-03-13 15:51:56 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI ( #13290 )
2018-03-13 15:46:59 +05:30
Ranjith Kurungadam
369ba85499
Physician Schedule fixes ( #13284 )
...
* move button add schedule to grid
* Physician Schedule- add slots for multiple days
* fix patient image view
2018-03-13 14:50:24 +05:30
Achilles Rasquinha
cbfcb3e61d
string_types from basestirng
2018-03-12 19:15:29 +05:30
Zarrar
0702f29860
Add Ends-On field in the Lead doctype ( #13147 )
...
* add ends_on date in lead to be mapped with calendar event
* set default ends_on to 1 hour from contact_time
2018-03-12 18:49:54 +05:30
tundebabzy
0125f7b130
rename to Subscription and transfer present Subscription records to Auto Repeat in frappe
2018-03-12 13:51:47 +01:00
rohitwaghchaure
13460f023d
[Fix] Batch value showing as item value while making batch ( #13281 )
2018-03-12 17:20:50 +05:30
Nabin Hait
2f493731ec
Fixed merge conflict
2018-03-12 15:49:59 +05:30
Nabin Hait
04f50be306
bumped to version 10.1.8
2018-03-12 16:01:03 +06:00
Ameya Shenoy
b34ab7549a
fixed subject to task_name ( #13278 )
2018-03-12 15:24:01 +05:30
Shreya Shah
aa54d934b8
make stock qty negative ( #13276 )
2018-03-12 15:23:28 +05:30
Zarrar
c35665fa60
update physician patch fail ( #13277 )
2018-03-12 15:21:53 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Shreya Shah
58797481f0
uncheck report hide ( #13256 )
2018-03-12 13:08:01 +05:30
Kenneth Sequeira
b48557fdc6
payment terms video tutorial in videos/learn ( #13258 )
...
* payment terms video tutorial in videos/learn
* Update payment-terms.md
2018-03-12 13:07:21 +05:30
Shreya Shah
ef4c3b8e2f
add has variants in standard filter ( #13251 )
2018-03-12 11:20:49 +05:30
rohitwaghchaure
12aa4265ff
Don't allow to set negative quantity if transaction is not return entry ( #13255 )
2018-03-12 11:20:30 +05:30
Shreya Shah
69d9f51dbb
if price list not found, set default selling/ buying price list from settings ( #13259 )
2018-03-12 11:15:49 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
tundebabzy
2970630ed2
Merge branch 'develop' into new-subscription
2018-03-12 02:00:34 +01:00
Nabin Hait
fd75d554d2
Payment Terms Template added in test_ignore for Company
2018-03-09 18:52:14 +05:30
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Nabin Hait
096d136460
bumped to version 10.1.7
2018-03-09 17:08:50 +06:00
Nabin Hait
c3889d85a1
Update shopping_cart.js
2018-03-09 16:28:25 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3
...
sort by name accounts for trial balance.
2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975
sort by name accounts
2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1
sort by name accounts
2018-03-09 15:22:20 +05:30
Nabin Hait
052333ea63
subctracting stock entry should also be considered as consumed qty
2018-03-09 14:30:32 +05:30
tundebabzy
3d26003c1f
add column breaks to Subscription
2018-03-09 09:37:06 +01:00
tundebabzy
8889b70ba1
Merge branch 'develop' into new-subscription
2018-03-09 09:10:48 +01:00
Nabin Hait
0357fbc9c1
commonfied regional function for checking delete permission
2018-03-09 13:19:52 +05:30
Nabin Hait
096c05ca6f
Fixes for regional feature of Nepal
2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352
prevent deletion of sales invoices if country is nepal
2018-03-09 12:39:40 +05:30
Achilles Rasquinha
b4de7e3d07
removed has_key, used pythonic in ( #13236 )
...
* removed has_key, used pythonic in
* Update bom.py
2018-03-09 12:35:47 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
tundebabzy
e69747ca6d
[Feature Request] Add Payment Mode field on Payment Terms Template #13117 ( #13243 )
...
* add mode of payment field to Payment Term
* add mode of payment field to Payment Terms Template Detail
* add mode of payment field to Payment Schedule
* add mode of payment in `get_payment_term_details`
2018-03-09 12:23:53 +05:30
Shreya Shah
aadd30d194
fetch delivery date on add-row only if item_code exists ( #13250 )
2018-03-09 12:19:35 +05:30
Zarrar
3fd634783d
[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group ( #13198 )
...
* customer code can be assigned based on customer group
* improvise customer group selection
* requested changes made
2018-03-09 12:10:45 +05:30
Harsh Patel
22e6f8d4c2
Fixes for #13071 ( #13234 )
2018-03-08 16:23:59 +05:30
rohitwaghchaure
acd3479269
Bank POS transactions in bank reconciliation ( #13225 )
2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82
[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile ( #13233 )
2018-03-08 16:21:13 +05:30
Ranjith Kurungadam
a3a63177a1
fix- cannot cancel consultation, remove updating age ( #13226 )
2018-03-08 16:20:22 +05:30
Achilles Rasquinha
b2f7092f9e
Merge pull request #13235 from achillesrasquinha/py3
...
removed has_key
2018-03-08 14:22:36 +05:30
Achilles Rasquinha
87dab14576
removed has_key
2018-03-08 14:21:48 +05:30
Ameya Shenoy
d2eec91b2c
indentation fix
2018-03-08 13:27:11 +05:30
Achilles Rasquinha
9efd6e80d2
fixed tabs
2018-03-08 13:20:48 +05:30
Achilles Rasquinha
987934d8ee
fixed tabs
2018-03-08 13:16:08 +05:30
Achilles Rasquinha
abd365fd90
Merge pull request #13228 from achillesrasquinha/py3
...
[FIX] filter to list
2018-03-08 13:11:58 +05:30
Achilles Rasquinha
908289d40a
[FIX] filter to list
2018-03-08 13:10:51 +05:30
Jamsheer
665b48773f
Healthcare - Patient Appointment - Service unit based scheduling and booking ( #13211 )
...
* New Document - Patient Service Unit
* Physician - schedule based on patient service unit
* Consultation - Remove validation on submit
* Consultation - Label changed from Drug Prescription to Medication
* Availability check and book appointment based on service unit, appointment invoice creation optimized
* patch fixes
* Patient Service Unit - field - overlap_appointments
* Patient Appointment - Service Unit based scheduling and booking
* Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment
* Codacy fixes on PR #13211
* Codacy fixes on PR #13211
* Fee validity test -fixes
* Fee Validity - test - fixes
2018-03-08 13:08:35 +05:30
Achilles Rasquinha
11241044b2
Merge pull request #13227 from achillesrasquinha/py3
...
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:58:21 +05:30
Achilles Rasquinha
9050998e06
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:55:41 +05:30
theopen-institute
1bfa243190
fix patch that causes error on bench update ( #13222 )
2018-03-08 11:20:40 +05:30
lasalesi
470977fa13
corrected setup wizard tax rates for Switzerland 2018 ( #13220 ) ( #13221 )
2018-03-08 11:19:56 +05:30
tundebabzy
1643cce479
fetch journal entry details ( #13218 )
2018-03-08 11:17:17 +05:30
Manas Solanki
bb42e3b411
Merge pull request #13214 from manassolanki/assessment-report-fix
...
minor fix for key error in assessment reports
2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1
minor fix for key error
2018-03-07 16:28:21 +05:30
Shreya Shah
c3bf1fa009
[Fixes] Chapter DocType ( #13213 )
...
* fetch chapter head from member doctype instead of user
* add enabled in grid view and set default as 1
2018-03-07 16:27:30 +05:30
rohitwaghchaure
bbd9b71547
Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item ( #13043 )
2018-03-07 15:39:40 +05:30
Vishal Dhayagude
668ec25d19
Allow Item variant Rename ( #13161 )
...
* [WIP] Item varient rename
* [wip] Item Variant
* [fix] Item Varient Rename
* [fix] Item Attribution Rename
* removed unwanted code
2018-03-07 15:31:08 +05:30
Nabin Hait
c50d7446b5
Merge branch 'master' into develop
2018-03-07 13:09:07 +05:30
Nabin Hait
36b4faab48
bumped to version 10.1.6
2018-03-07 13:39:05 +06:00
Saurabh
2b59a851c4
Merge pull request #13166 from saurabh6790/patches_fixes
...
[fix] use join instead of subquery
2018-03-07 12:59:03 +05:30
Manas Solanki
857d4f7a0b
Merge pull request #13209 from manassolanki/guardian-fix
...
allow renaming of the guardian
2018-03-07 12:53:40 +05:30
Manas Solanki
12d7bfb658
allow renaming of the guardian
2018-03-07 12:52:31 +05:30
Raghavendra Kamath
6193b92b70
Add new logo in splash image and optimise pngs ( #13206 )
2018-03-07 12:39:38 +05:30
Saurabh
ca6e223694
[fix] use join instead of subquery
2018-03-07 12:13:32 +05:30
rohitwaghchaure
343ba85e3a
Merge pull request #13203 from saurabh6790/pe_fix
...
[fix] setup_party_account_field on init
2018-03-07 12:11:46 +05:30
Manas Solanki
1fa992564a
fix the desktop icon for course schedule
2018-03-07 12:08:52 +05:30
Saurabh
a65b28772f
[fix] setup_party_account_field on init
2018-03-06 18:22:01 +05:30
Achilles Rasquinha
78064b7a45
Update patches.txt
2018-03-05 17:53:23 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Nabin Hait
491ce05b8d
bumped to version 10.1.5
2018-03-05 15:17:18 +06:00
Saurabh
2cfcbf933d
Patches fixes ( #13163 )
...
* [fix] if serialised items not found then return
* [fix] unicode encoding in patch
2018-03-05 13:01:15 +05:30
Zarrar
2550180a05
remove updating territory for customers on change ( #13162 )
2018-03-05 12:32:41 +05:30
Zarrar
950fff0ba1
changes according to the workflow ( #13160 )
2018-03-05 11:30:53 +05:30
Manas Solanki
5fd7b3bb80
Fix status updater ( #13033 )
...
* fix the status updater for multiple sources
* patch for updating the status
* patch for updating the sales order item
* Update update_status_for_multiple_source_in_po.py
2018-03-05 11:28:29 +05:30
Vishal Dhayagude
35b665cb26
[new] Create multiple warehouse address and fetch address to stock entry ( #13109 )
...
* [new] Create multiple warehouse address and fetch address to stock entry
* [fix] Deleted unwanted field and added patch to link warehouse details to Address
* [fix] Codacy fixed
* [fix] Modified patch for warehouse address
* [fix] Modified patch for warehouse address
* [fix] Patch updated and removed contact details from stock entry
* [fix] Patch Updated
2018-03-05 11:10:01 +05:30
Zarrar
4417cb0006
improve multiple add dialog, populate parent's depends on with child tasks ( #13142 )
2018-03-05 11:08:15 +05:30
Kenneth Sequeira
89795c3f69
Doc imp ( #13148 )
...
* added intro, item and prices video, fixed image links in item and prices
* update 2: first 5 videos added
* added all videos to the user manual
* updated .gitignore
2018-03-05 11:06:44 +05:30
Zarrar
1e4e004667
leave application assigned by naming_series ( #13158 )
2018-03-05 11:05:59 +05:30
rohitwaghchaure
a6a4e86dc8
[Fix] System only shows 20 attribute values while making variants ( #13155 )
2018-03-05 11:03:59 +05:30
rohitwaghchaure
0eb8bb2511
[Fix] Wrong salary slips showing when click on view salary slips from payroll entry ( #13152 )
2018-03-05 11:03:27 +05:30
rohitwaghchaure
67cfa81de2
[Fix] Stock Ageing report does not work with group warehouse ( #13151 )
2018-03-05 11:00:42 +05:30
tundebabzy
458a1fe61a
codacy
2018-03-03 18:11:48 +01:00
tundebabzy
ef605d5f00
codacy
2018-03-03 18:03:04 +01:00
tundebabzy
3b1251ef47
codacy tinzz
2018-03-03 17:36:07 +01:00
tundebabzy
2379451b68
codacy tinzz
2018-03-03 17:18:47 +01:00
tundebabzy
fbdd5d30e9
more tests and bug fixes
2018-03-03 11:19:18 +01:00
tundebabzy
024c28acf7
fix proration logic to reduce possibility of rounding errors
2018-03-03 10:32:02 +01:00
tundebabzy
79a01561d5
enhancement: do nothing if cancel_sbscription is called for cancelled subscription
2018-03-03 07:39:44 +01:00
tundebabzy
d43422c18e
enhancement: ensure subscription is cancelled before attempting to restart
2018-03-03 07:37:59 +01:00
tundebabzy
e13570f343
codacy review
2018-03-02 12:27:12 +01:00
tundebabzy
9e863b9572
Merge branch 'develop' into new-subscription
2018-03-02 11:10:27 +01:00
tundebabzy
c15dc21b7d
clean up
2018-03-02 11:00:15 +01:00
tundebabzy
49d34df8f4
more tests
2018-03-02 10:16:57 +01:00
tundebabzy
688fd6b205
prorate invoice when cancelling subscription
2018-03-02 10:16:42 +01:00
tundebabzy
4499e5351c
add article
2018-03-02 06:51:33 +01:00
tundebabzy
16afa8765e
tiny refactor of invoice setting logic
2018-03-01 17:16:41 +01:00
tundebabzy
9df4f0bd43
fix: apply_discount_on field should be of type Select not Data
2018-03-01 17:12:43 +01:00
tundebabzy
8670c85827
make sure default apply_discount_on is set when creating invoice
2018-03-01 17:11:14 +01:00
tundebabzy
ca5cf35a99
fix: task should explicitly call commit and rollback if error
2018-03-01 17:06:39 +01:00
tundebabzy
36c18c913e
docstrings
2018-03-01 16:44:10 +01:00
tundebabzy
0ec445214c
hook to hourly scheduler
2018-03-01 11:54:32 +01:00
tundebabzy
78fb12663a
fix test
2018-03-01 11:27:48 +01:00
tundebabzy
b91ec79494
update tests and more tweaks
2018-03-01 10:47:00 +01:00
tundebabzy
7eabbd93e1
update start date alone after restarting subscription
2018-03-01 09:09:23 +01:00
tundebabzy
2a11c18383
set initial invoice period based on subscription start
2018-03-01 08:47:38 +01:00
tundebabzy
a93fa16bce
freeze screen while waiting for updates on subscription
2018-03-01 08:45:56 +01:00
rohitwaghchaure
a942722619
[Fix] Timeout issue while saving multilevel BOM ( #13118 )
2018-03-01 13:15:25 +05:30
tundebabzy
328adedbc8
adds start field to record subscrption start date
2018-03-01 08:45:01 +01:00
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe ( #13130 )
...
* editable unallocated amount in payment entry to handle multi currency
* set unallocated amount on server side
* some minor fixes
* Fixes in territory patch
* removed print
* minor fixes
2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55
[Fix] Sales invoice email prompt not working
2018-03-01 13:06:01 +05:30
Harsh Patel
5bebbbe7a9
[Feature] Supplier warehouse link field on purchase order ( #13051 )
...
* Multiple Features:
[New] Supplier warehouse link field on purchase order for sub-contracting
[New] Auto select supplier warehouse while making purchase receipt from purchase order
* Set default to_warehouse in stock entry as the supplier warehouse
2018-03-01 11:33:25 +05:30
rohitwaghchaure
0df95fa781
Multi-UOM for sales/purchase return ( #13132 )
...
* Multi-UOM for sales/purchase return
* Update sales_and_purchase_return.py
2018-03-01 11:31:33 +05:30
Charles-Henri Decultot
bc7a549fdb
Gocardless integration ( #13008 )
...
* GoCardless integration
* Addition of a method for determining if the email should be sent or not
* Correction for Tests
* Codacy fix
* Documents moved to ERPNext
* Codacy fix
* Codacy fixes
* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Zarrar
6578bc11b6
wrong query formed to delete events ( #13119 )
2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM ( #13112 )
...
* Create user from Employee
* Set auto created serial nos in incoming transactions in case of multi uom
2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5
Make Expense Claim from Employee Advance #13053 ( #13074 )
...
* allow to make expense claim from employee advance
* make expense claim only if claimed amount < paid_amount
* expense claim made from employee advance is paid
2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67
display image fnd description for root BOM also ( #13099 )
2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8
Do not validate payment schedule for POS ( #13115 )
2018-03-01 10:32:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero ( #13129 )
...
* Don't overwrite start and end date comes from payroll entry
* Get valuation rate from historical SLE even if it is zero, if records exists
* Valid till should be autoset if not any default value
* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
rohitwaghchaure
332a17ee86
[Fix] Test case for serial no ( #13136 )
2018-03-01 10:28:04 +05:30
tundebabzy
d9fec69a70
update test case, fix bugs
2018-03-01 05:34:02 +01:00
tundebabzy
8f37926ca8
add ability to cancel, restart and refresh subscription
2018-03-01 04:57:23 +01:00
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Shreya Shah
a310cc7156
order by modified instead of item name ( #13113 )
2018-02-28 18:59:55 +05:30
Ameya Shenoy
c20901443e
updated develop_version to 11 ( #13133 )
2018-02-28 17:38:23 +05:30
tundebabzy
2cccad0274
more tests and quick fix
2018-02-28 12:45:09 +01:00
tundebabzy
a5bc057ad4
adds missing 'translatability'
2018-02-28 12:24:16 +01:00
tundebabzy
86ee455cbc
more tests and bug fix
2018-02-28 12:21:08 +01:00
tundebabzy
b3d5777e55
more test cases and bug fixes
2018-02-28 12:11:19 +01:00
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix ( #13127 )
2018-02-28 12:53:34 +05:30
tundebabzy
3aaf693abd
adds task -process
2018-02-28 05:12:18 +01:00
tundebabzy
95a4ca9429
update test cases
2018-02-27 18:09:06 +01:00
tundebabzy
9bf029a16e
generate new invoice only when current_invoice_end is past
2018-02-27 15:19:02 +01:00
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3
...
[FIX] sorting multiple compares
2018-02-27 19:48:25 +05:30
tundebabzy
45b6a1719f
refactor:
...
- current_invoice _start and end should be determined by trial period or billing period
- adds new functions to get billing period data
2018-02-27 15:14:19 +01:00
tundebabzy
c634ca8737
adds validation to billing_interval_count in Subscription Plan
2018-02-27 14:12:39 +01:00
Nabin Hait
3b43c0d160
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-27 15:57:14 +05:30
Zarrar
96002c28bd
optimize patch for faster execution ( #13068 )
2018-02-27 15:57:01 +05:30
Zarrar
91fc1a8fbe
Update Territory & Customer Group across all transaction ( #13004 )
...
* added method for update query based on changes
* patch added
* updated function, moved util function
2018-02-27 15:56:38 +05:30
tundebabzy
3c26a7e862
adjusts query so multiple plans can be used to create single invoice
2018-02-27 09:36:29 +01:00
tundebabzy
559d01e176
allows to rename subscription plan
2018-02-27 09:13:35 +01:00
tundebabzy
07313c281a
adds more assertions to test cases
2018-02-27 09:00:13 +01:00
Ameya Shenoy
3ee22f0137
rename valid_email to validate_email ( #13103 )
2018-02-27 12:59:12 +05:30
rohitwaghchaure
f1755fb5b1
Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1
...
[Hotfix] POS discount issue
2018-02-27 11:58:33 +05:30
Manas Solanki
be841ccc53
Merge pull request #13096 from manassolanki/fix-fee-schedule
...
Fixes in the Fees Schedule
2018-02-27 11:23:38 +05:30
Frappe PR Bot
c6e2d750bb
[Translation] Updated Translations ( #13097 )
2018-02-27 11:00:59 +05:30
Zarrar
033eb779d4
minor fixes for member ( #13101 )
2018-02-27 11:00:47 +05:30
tundebabzy
048bcbf080
more tests and code fixes
2018-02-26 22:17:06 +01:00
tundebabzy
b84e9519c2
Subscriptions doctype - subscriber should be set only once
2018-02-26 20:35:20 +01:00
tundebabzy
1ea5055967
fix another date comparison bug
2018-02-26 20:17:59 +01:00
tundebabzy
4d8175f9d9
adds test cases and fix resulting bugs
2018-02-26 18:56:05 +01:00
tundebabzy
cd700efc0b
only generate invoice after_insert if subscription is not in trial period
2018-02-26 16:26:36 +01:00
tundebabzy
0091c86e80
fix date comparison bug
2018-02-26 16:18:55 +01:00
tundebabzy
08a11b4d1f
sets default for days_until_due to 0
2018-02-26 16:13:45 +01:00
tundebabzy
d3fdcd9da5
set after_insert methods:
...
- if subscription is not in trial period, generate sales invoice
2018-02-26 16:10:47 +01:00
tundebabzy
b72aac6729
adds validation:
...
- ensure trial period dates are in order
2018-02-26 15:56:47 +01:00
tundebabzy
7a2c6df645
sets Subscription doc status in before_save
2018-02-26 15:55:32 +01:00
tundebabzy
3010996cc5
adds before_insert methods:
...
- set current_invoice_start
- set current_invoice_end
2018-02-26 15:51:32 +01:00
tundebabzy
35e92c7d29
removes start field from Subscriptions
2018-02-26 15:25:26 +01:00
Manas Solanki
51dfba749b
filter students on basis of category and button to show fees
2018-02-26 19:32:26 +05:30
tundebabzy
6e014331c5
removes end_date from Subscriptions doctype
2018-02-26 14:05:54 +01:00
tundebabzy
2b5298238e
adds prorate field to Subscription Settings
2018-02-26 13:58:29 +01:00
tundebabzy
2dee342501
Subscriptions doctype - trial start and end are set_only_once
2018-02-26 13:34:25 +01:00
Nabin Hait
3799f8bec9
Don't validate serial nos while cancelling the transaction
2018-02-26 16:39:06 +05:30
Zarrar
e53a238665
minor fix ( #13095 )
2018-02-26 15:59:20 +05:30
Shreya Shah
70a57e08fd
New Report Employee Advance Summary ( #13040 )
...
* New Report Employee Advance Summary
* JSON style column definition
2018-02-26 15:58:57 +05:30
tundebabzy
cbe4f5b6b3
changes to subscription settings
2018-02-26 11:22:53 +01:00
tundebabzy
066958a794
subscription_invoice doctype changes
2018-02-26 11:22:05 +01:00
Rohit Waghchaure
3edc101957
[Fix] POS discount issue
2018-02-26 13:25:58 +05:30
tundebabzy
8457bb2c7e
change in Subscription Settings
2018-02-26 08:13:41 +01:00
Nabin Hait
127c61e930
Fixed logic in itemwise recommended reorder level
2018-02-26 12:43:17 +05:30
rohitwaghchaure
8ffd5d40e3
[Fix] UX for delivery trip ( #13046 )
...
* [Fix] UX for delivery trip
* Fixed test cases
2018-02-26 12:25:39 +05:30
tundebabzy
9360f81b94
Validity of Quotation #12858 ( #13078 )
...
* add new setting for default valid_till date
* codacy cleanup
2018-02-26 12:23:41 +05:30
Nabin Hait
e55831a89c
Projected Qty in Auto reorder email
2018-02-26 11:38:40 +05:30
tundebabzy
9016890ecf
adds Subscription Settings doctype
2018-02-26 06:15:31 +01:00
tundebabzy
988f5ca38b
hide trial_period_end and invoices if empty
2018-02-26 05:14:10 +01:00
tundebabzy
bbac07d9d2
use naming series for Subscriptions
2018-02-26 05:07:56 +01:00
tundebabzy
dda6234cab
remove subscription name and name by subscriber
2018-02-26 04:52:13 +01:00
tundebabzy
7c455ad4b6
display invoices section field only if there are invoices
2018-02-26 04:50:45 +01:00
tundebabzy
4ca5e81aa3
adds description for billing_interval_count in subscription plan
2018-02-26 04:47:19 +01:00
tundebabzy
4d31255d5c
customer field in Subscriber should be Link
2018-02-26 04:40:53 +01:00
tundebabzy
a07811b67f
adds new doctype - Subscriptions
...
- encapsulates subscription
- linked to a subscriber
- subscription can contain many plans
- contains history of generated invoices
2018-02-26 04:25:30 +01:00
Nabin Hait
2572b05b35
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-25 10:45:24 +05:30
tundebabzy
2581e2e5d7
New doctype - Subscription Plan:
...
- Plan is to be linked to a Product
- Plan will be used to create Invoice items
- Subscriber can have multiple plans
- Contains billing cycle information
2018-02-24 11:31:42 +01:00
tundebabzy
007919c03f
New doctype - Subscriber:
...
- Encapsulates a subscriber to a service or product
- Contains subscription specific information
2018-02-24 11:19:06 +01:00
Zarrar
4a0d27078e
optimize patch for faster execution ( #13068 )
2018-02-23 17:41:32 +05:30
Achilles Rasquinha
a3555aa7bd
[FIX] sorting multiple compares
2018-02-23 17:22:07 +05:30
Nabin Hait
802819df9d
Merge branch 'master' into develop
2018-02-23 16:59:44 +05:30
Nabin Hait
d54953e419
bumped to version 10.1.4
2018-02-23 17:29:42 +06:00
Zarrar
339426c926
fix permission issue for stock balance report - Item Group ( #13069 )
2018-02-23 16:58:55 +05:30
Nabin Hait
7570774ebe
Merge branch 'master' into develop
2018-02-23 16:49:43 +05:30
Nabin Hait
d12fb58c12
bumped to version 10.1.3
2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce
verify payment entry amount is positive ( #13066 )
...
* verify payment entry amount is positive
* Update sales_invoice.py
* Update sales_invoice.py
2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb
[Fix] Item wise sales register report ( #13055 )
2018-02-23 16:25:30 +05:30
Shreya Shah
70a68897cc
auto name on the basis of naming series ( #13056 )
2018-02-23 16:24:59 +05:30
Shreya Shah
d5b2e39f45
improve validation ( #13058 )
2018-02-23 16:23:57 +05:30
Frappe PR Bot
239c121f7d
[Translation] Updated Translations ( #13059 )
2018-02-23 16:23:00 +05:30
rohitwaghchaure
dd0fc1084e
[Fix] PDC amount, PDC print layout issue ( #13062 )
2018-02-23 16:20:46 +05:30
Faris Ansari
97b212e348
Patch optimization ( #13060 )
...
* Patch fixes
* fix codacy
* Update item_barcode_childtable_migrate.py
2018-02-23 16:19:41 +05:30
Raghavendra Kamath
1a9388acbb
Clean inline css found in chapter and grant for loops! ( #13038 )
...
* Clean inline css found in chapter and grant for loops!
* Remove redundant css
* remove unwanted ide files and append gitignore
* remove unnecessary line from build.json
* restore import for variable.less
* remove kdev from gitignore
2018-02-23 14:34:44 +05:30
Nabin Hait
d283ee73f3
Fetch timesheet based on project
2018-02-23 12:58:39 +05:30
Nabin Hait
5b9f3b0cd3
Merge branch 'master' into develop
2018-02-22 18:18:36 +05:30
Nabin Hait
2b2cf13408
bumped to version 10.1.2
2018-02-22 18:48:34 +06:00
Nabin Hait
7f49b57aaa
Update added_extra_gst_custom_field_in_gstr2.py
2018-02-22 18:17:57 +05:30
Nabin Hait
0e3db275e5
Merge branch 'master' into develop
2018-02-22 18:10:39 +05:30
Nabin Hait
6b69fc7e5d
bumped to version 10.1.1
2018-02-22 18:40:37 +06:00
Saurabh
d8cd54dfd0
[fix] remove gstr2 fields from Sales Invoice and Delivery Note too ( #13047 )
2018-02-22 18:05:40 +05:30
Suraj Shetty
8a41887f68
patch exception fixes ( #13037 )
...
* patch exception fixes
* reload daily_work_summary_group_user doctype
2018-02-22 15:56:33 +05:30
tundebabzy
2949e9c5dc
Merge pull request #13036 from tundebabzy/issue-13019
...
Uncaught Server Exception : adjust_qty_for_expired_items #13019
2018-02-22 11:04:53 +01:00
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Nabin Hait
9b530fb2cb
bumped to version 10.1.0
2018-02-22 15:09:37 +06:00
Nabin Hait
06bace9089
Fixed develop version
2018-02-22 14:36:26 +05:30
tundebabzy
c15978fca0
fix indentation
2018-02-22 09:50:49 +01:00
Nabin Hait
7d862276af
Cleanup and fixes on leaderboard
2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603
Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard
2018-02-22 11:35:10 +05:30
rohitwaghchaure
23a2b65576
[Fix] BOM Update Tool not update grandparent's exploded BOM ( #13026 )
2018-02-22 11:32:09 +05:30
tundebabzy
cad22dbe39
Cutomisable Cash Flow Reports ( #12969 )
...
* add child doctype - Cash Flow Mapping Account
* adds new doctype - Cash Flow Mapping
* adds new doctype - Cash Flow Mapper
* adds new doctype Cash Flow Mapping Template
* adds new doctype Cash Flow Mapping Template
* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper
* get cash_flow_accouts from Cash Flow Mapping
* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field
* changes description from 'Net Profit/Loss' to 'Profit for the year'
* set `net_profit_loss` `parent_account` properly
* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`
* remove zero rows
* de-duplicates row, summing similar accounts in the process
* makes gl sum calculation use `parent_account` as a condition
* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field
* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities
* add "Movement in working capital" subheader
* refactor code for readability
* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'
* allow `Cash Flow Mapping` to be renamable
* adds new field - `section_subtotal` useful for only Operating Activities
* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L
* calculates and shows tax paid adjustment in cash flow statement
* renames `is_interest_paid` to `is_finance_cost`
* - adds finance costs calculation
- correctly sets opening balance dates
* prevents users from selecting extra options in Cash Flow Mapping
* adds validation to prevent selecting multiple options
* adds new fields to Cash Flow Mapping
* calculate non cash p or l items (2nd pass)
* separates default cash flow generation from custom
* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report
* clean up
* removes mandatory constraint from accounts field
* allow rename, disallow create and delete
* adds patch to add default Cash Flow Mappers
* refactors custom_cashflow
* add article to explain configuration
* refactor
* further refactor
* final clean up (hopefully)
* clean up for codacy
* more codacy fixes
* more codacy fixes
* fix broken patch
* rename article to .md
* create default mappers after install
* PEP 8
* create the tables in `after_install` call
2018-02-22 11:08:36 +05:30
tundebabzy
27d558c9ef
Optionally allow overlap on Timesheet #12893 ( #13018 )
...
* give user option to ignore time overlap validation
* move settings to new Projects Settings
* clean up - remove trailing space
2018-02-22 11:05:49 +05:30
rohitwaghchaure
4e8fdf7b3f
[Enhance] Quality Inspection Template ( #12988 )
...
* [Enhance] Quality Inspection Template
* Test case and patch
* Update make_quality_inspection_template.py
2018-02-22 11:03:48 +05:30
Zarrar
79756c44c9
Update Territory & Customer Group across all transaction ( #13004 )
...
* added method for update query based on changes
* patch added
* updated function, moved util function
2018-02-22 10:57:49 +05:30
Shreya Shah
0bde9e11c7
clear log if no attachments ( #13023 )
2018-02-22 10:55:40 +05:30
tundebabzy
637b242a34
Credit card default account should be debtors #12989 ( #13029 )
...
* allow receivable account type in mode of payment
* update `default_account` field description
2018-02-22 10:51:57 +05:30
vishdha
09d56754ea
[fix] Codacy issue
2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19
[fix] Sales partner details get from sales Order and company currency details from selected company
2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e
[fix] Codacy Issue
2018-02-21 15:35:58 +05:30
vishdha
d4491d361f
[new] Filter based on company:
2018-02-21 15:35:58 +05:30
vishdha
09acb779d7
[new] Leader board
2018-02-21 15:35:58 +05:30
Suraj Shetty
d3069fee4d
Daily work summary refactor ( #12944 )
...
* added daily work summary setting doctype and code to support feature
this will allow multiple setting for daily work summary
* added daily work summary setting user doctype
* made changes in daily work summary code
* [minor] entry change in hr config file
* deleted previous daily work summary settings (and its company) doctype
* removed unwanted permission check
* toggled read_only option for enabled field
* removed print statements
* add patch for the changes
* doc changes
* [minor] indentation fix
* fixed tests
* indentation fixes
* codacy issue fix
* formatting fixes
* renamed doctype
Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes
* fixed typo
* updated doc
* codacy issue fix
* [minor] renamed doctype name in json
* Renamed old doctype
* fixed indentation
* codacy fix
* indentation fix
* renamed doctype
* handled patch exception
* fixed exception
* Update daily_work_summary_group.py
* rename patch file
removed abbreviation in file name
* handled exception in patch code
* removed Unnecessary pass statement
* [minor] indentation fix
2018-02-21 15:15:43 +05:30
Zarrar
67f74414c4
disable expand_all button for BOM ( #13015 )
2018-02-21 14:46:41 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
Zarrar
bc5515651b
[Hotfix] Selecting create on blank field throws error ( #13014 )
...
* selecting create on blank field error fix
* error when fetching default_print_format
2018-02-21 11:13:14 +05:30
Shreya Shah
f65afac353
db_update instead of save to avoid unnecessary validations ( #13009 )
2018-02-21 11:12:04 +05:30
Charles-Henri Decultot
b8c088edb7
Transaction Log for France ( #12795 )
...
* Regional overrides for France
* Addition of tests and documentation
2018-02-21 11:07:33 +05:30
Faris Ansari
7c744acc49
Changes for Rollup ( #12924 )
...
* Changes for rollup
* remove variables.less
2018-02-20 14:21:50 +05:30
rohitwaghchaure
e2558308f6
[enhance] Production Plan ( #12160 )
...
* [enhance] Production plan
* Test cases
* Removed production planning tool
* Documentation
* Added actual qty in material request production item
* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
2018-02-20 12:20:00 +05:30
Pawan Mehta
2fbb4923a7
item balance report ( #12983 )
...
* item balance report
* remove hard coding
* Update item_balance.json
* Update item_balance.json
Change name to "Item Balance (Simple)"
* Update item_balance.json
2018-02-20 12:17:49 +05:30
Pawan Mehta
244e235c48
Sales Payment Summary - fix for change amount ( #12981 )
...
* [fix] #12980
* apply change amount to cash
2018-02-20 12:15:10 +05:30
Shreya Shah
f718b0c0df
Currency filter in Pricing Rule ( #11776 )
...
* added currency filter
* modified files
* pull margin only if currency matches
* Renamed price to rate in pricing rule
* fetch rate only if currency matches
* rebase with develop
* rebase with develop
* patch to set currency in existing docs
* currency field mandatory in pricing rule
* modified test cases
* rebase with develop
* fixed test case
2018-02-20 11:26:46 +05:30
rohitwaghchaure
554f2de23d
Code cleanup online POS ( #12985 )
2018-02-20 11:18:01 +05:30
Vishal Dhayagude
a5003f8f5b
[minor] Balance Qty added in reorder level email notification ( #13000 )
2018-02-20 11:14:54 +05:30
tundebabzy
6c5d7986ab
Outstanding Amount not getting updated in Payment Entry #12713 ( #12975 )
...
* allow to `set_missing_ref_details` by force
* update payment entry references during submit and cancel
2018-02-19 13:11:56 +05:30
Shreya Shah
5448318146
fix total field ( #12992 )
2018-02-19 12:44:52 +05:30
Pawan Mehta
174a18399c
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-02-19 12:39:13 +05:30
Saurabh
ec23a6f0eb
[fix] section break for raw_material_details ( #12976 )
2018-02-19 11:33:11 +05:30
joezsweet
16862f9051
Better handling of auto set barcode_type issue ( #12970 )
...
Get barcode_type options and check if value is included
2018-02-16 17:33:30 +05:30
Charles-Henri Decultot
894ab7a664
Braintree integration documentation ( #12775 )
...
* Braintree integration documentation
* Cleanup documentation
2018-02-16 15:16:47 +05:30
riyasrawther
d1134516c2
Warehouse wise Item Balance, Age and Value ( #12879 )
...
* Create warehouse_wise_item_balanace_age_and_value.py
* Create warehouse_wise_item_balance_age_and_value.js
* Create warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.js
* Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py
* Update warehouse_wise_item_balance_age_and_value.py
2018-02-16 14:53:53 +05:30
Shreya Shah
093e7e6e98
Refactor Expense Claim ( #12883 )
...
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
joezsweet
bd7c00c59e
[Hot Fix] barcode_type auto set to a wrong value ( #12957 )
...
* Fix barcode_type auto set to a wrong value
This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13"
* codacy fix
2018-02-16 14:47:10 +05:30
Jay Parikh
33b2614377
[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 ( #12966 )
2018-02-16 14:45:40 +05:30
Zarrar
441a1e1b8a
Validate Bank name in Setup wizard on the same slide ( #12968 )
...
* validate bank name before moving on to next slide
* Update setup_wizard.js
2018-02-16 14:44:42 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
Nabin Hait
cc98d40ff7
Payment reco auto allocation and maintain same order of records ( #12963 )
...
* Automatically allocate amount after selecting invoice against a payment entry
* codacy fixes
2018-02-16 13:14:20 +05:30
Vishal Dhayagude
1e0ae07bff
[fix] Validate Party in not present in Party Type ( #12910 )
...
* [fix] Validate Party in not present in Party Type
* [fix] Minor Changes
* [fix] Valid Customer and Supplier fetch
* [WIP] Allow and prevent for creating party
* [fix] minor changes
* [fix] Requested Changes
* [fix] Codacy issue
* Update opening_invoice_creation_tool.py
2018-02-16 13:13:37 +05:30
Shreya Shah
3a9eec2e92
Calculate due date in Purchase Invoice on the basis of Supplier invoice date ( #12913 )
...
* pass bill_date as parameter and calculate due_date on that basis
* calculate payment_schedule on the basis of bill_date if present else posting_date
* add bill_date as an argument to get_party_details
* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
Shreya Shah
278af1befb
remove deprecated processing payroll video links ( #12947 )
2018-02-16 12:58:04 +05:30
rohitwaghchaure
103c4e9b92
[Fix] Incorrect rate in item-wise sales register ( #12943 )
2018-02-16 12:57:35 +05:30
Shreya Shah
f4b271a02e
Customer and Supplier link fields in Member DocType ( #12942 )
...
* added link fields customer and supplier
* fixed a typo
2018-02-16 12:56:01 +05:30
Zarrar
5a947f38ab
avoid overlap with dropdown ( #12941 )
2018-02-16 12:49:30 +05:30
Prateeksha Singh
0acb63a938
Update hub domain 💥
2018-02-16 11:07:12 +05:30
Shreya Shah
394b7a2fa3
Rename Offer Letter to Job Offer ( #12934 )
2018-02-16 10:49:34 +05:30
rohitwaghchaure
5a5f73e46a
Merge pull request #12602 from PawanMeh/fixes_8540
...
Select multiple raw material items for Sub Contract Stock Entries
2018-02-15 18:54:29 +05:30
Nabin Hait
8a562266ad
Update set_b2c_limit.py
2018-02-15 18:40:18 +05:30
Nabin Hait
0c7ce02e54
Update set_b2c_limit.py
2018-02-15 18:12:27 +05:30
Nabin Hait
44658d44c5
Update gstr_1.py
2018-02-15 17:24:15 +05:30
saurabh-bhosale
307063e64e
[Fix] Invalid Syntax in gstr_1.py ( #12946 )
...
* [Fix] Added missing parenthesis in gstr_1.py
* Minor change
2018-02-15 17:13:35 +05:30
Saurabh
82ffdd7dc6
Merge branch 'master' into develop
2018-02-15 15:17:04 +05:30
Saurabh
ca166eaae5
bumped to version 10.0.23
2018-02-15 15:47:03 +06:00
Vishal Dhayagude
bd59a53173
[new] B2C limit fetch from GST Settings ( #12905 )
...
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
2018-02-15 14:22:11 +05:30
Achilles Rasquinha
0bf19a1ac5
Merge pull request #12931 from achillesrasquinha/py3-iteritems
...
Py3 iteritems
2018-02-15 13:49:43 +05:30
Achilles Rasquinha
c94df80d88
Merge pull request #12925 from netchampfaris/enable-translatable-patch
...
Patch to enable translatable
2018-02-15 12:18:26 +05:30
Achilles Rasquinha
d56b00f5fd
Merge pull request #12932 from achillesrasquinha/py3-basestring
...
Py3 basestring
2018-02-15 12:16:12 +05:30
Achilles Rasquinha
5f0c70361a
iteritems
2018-02-15 11:55:45 +05:30
Achilles Rasquinha
1697a7aa81
replaced string_types with basestring
2018-02-15 11:39:45 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Shreya Shah
8b531c1ee6
Fix parenthesis in buying controller ( #12923 )
2018-02-15 11:21:49 +05:30
Prateeksha Singh
387a242232
Merge pull request #12928 from pratu16x7/hub-pages
...
Hub pages
2018-02-15 11:05:22 +05:30
Prateeksha Singh
9889899603
[hub] cleanups
2018-02-15 10:54:23 +05:30
Prateeksha Singh
1ad072f2a9
[hub] cleanups
2018-02-15 10:47:59 +05:30
Prateeksha Singh
2073959bb8
Update entity properties
2018-02-15 10:24:16 +05:30
Prateeksha Singh
6ee035ba5b
tree parent working
2018-02-15 08:50:31 +05:30
Faris Ansari
1e422f2383
Patch to enable translatable
2018-02-14 22:18:55 +05:30
Prateeksha Singh
25d5a1d890
add company pages
2018-02-14 19:53:18 +05:30
Nabin Hait
e6d65bc2a1
Fixed translations and tests ( #12900 )
...
* Fixed translations and tests
* minor fixes
* minor test fixes
2018-02-14 17:44:06 +05:30
Achilles Rasquinha
361366ebe6
Python 3 fixes. ( #12916 )
...
* Fixed iteritems and exceptions
* python3-fixes
* fixed iteritems
2018-02-14 17:08:59 +05:30
rohitwaghchaure
a13b177908
[Fix] Not able to select delivery note in delivery trip ( #12912 )
2018-02-14 17:06:21 +05:30
Prateeksha Singh
8e84fa9f9e
Merge pull request #12914 from achillesrasquinha/company-logo
...
Added Company Logo to DocType
2018-02-14 17:04:47 +05:30
Achilles Rasquinha
1c86d18837
Added Hub Company Logo
2018-02-14 16:05:32 +05:30
PrakashH
908af53fcd
Update stock-reconciliation-for-non-serialized-item.md ( #12908 )
2018-02-14 13:16:25 +05:30
PrakashH
0c4c2981c8
Update journal-entry.md ( #12909 )
2018-02-14 13:15:53 +05:30
