Commit Graph

23987 Commits

Author SHA1 Message Date
Faris Ansari
80e6cad7ac
Merge pull request #15360 from netchampfaris/marketplaces-fixes
fix(image): New Image component to consistently handle broken images
2018-09-10 12:29:50 +05:30
Zarrar
f42510eb54
Merge pull request #15372 from Zlash65/p-fix
[Minor] Patch Fix
2018-09-10 12:21:02 +05:30
Zlash65
4b0e3741b2 job card patch use orm 2018-09-10 12:18:51 +05:30
Prateeksha Singh
3b3c80e6b5
Merge pull request #15371 from pratu16x7/marketplace-fixes
[hub] add Item Manager permission to Hub Tracked Item
2018-09-10 11:40:42 +05:30
Prateeksha Singh
62f5cd2dee [hub] add Item Manager permission to Hub Tracked Item 2018-09-10 11:39:48 +05:30
Zarrar
68000c66fc check if Data Migration Plan exists before deleting (#15368) 2018-09-09 19:19:13 +05:30
Zarrar
8448d9014d [Fix] Patch fixes (#15350)
* fix typo in fieldname

* fallback for work_order/production_order in timesheet
2018-09-09 19:18:41 +05:30
Ameya Shenoy
8b7fea5a8a
Merge pull request #15349 from sagarvora/py3-fixes
[py3] print, StringIO import, and other fixes
2018-09-09 02:25:10 +05:30
Faris Ansari
9fb5e1c61b fix(image): New Image component to consistently handle broken images
- psuedo element hack didn't work cross browser
2018-09-07 23:17:29 +05:30
Aditya Hase
c7c87a9297 feature(coverage): Add test coverage to erpnext travis builds 2018-09-07 19:04:10 +05:30
Nabin Hait
73165ebd33 fix(patch): create healthcare patch only if domain activated 2018-09-07 18:44:14 +05:30
Sagar Vora
538100148f [py3] print, StringIO import, and other fixes 2018-09-07 17:59:59 +05:30
Pawan Mehta
2cc7eb1e94 fix default settings (#15345) 2018-09-07 17:59:10 +05:30
Nagarajan
8be8345b65 Stock Projected Qty Item Group Filter (#15340)
* Update stock_projected_qty.js

* Update stock_projected_qty.js

* Update stock_projected_qty.py

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

* tds computation logic added

* minor changes to commonify code

* tds payable monthly report added

* initial logic for monthly tds calculation added

* added field for supplier type and pan

* changes related to pan and entity type

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

* patch fix for shopify refactor

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

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

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

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

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

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

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

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

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

* add cashier closing link at pos menu

* add cashier closing link to accounts config file

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

* adding more features to cashier closing

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

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

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

* Add parent cost center in get payment entry

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

* Add tests for cost center wise account and party balance

* set parent cost center in taxes

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

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